summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-05-07 21:49:12 +0200
committerWerner Koch <wk@gnupg.org>2007-05-07 21:49:12 +0200
commitd5052fd22864ebb879e3b417ecfefd88e6c1800a (patch)
tree82f547df2e3ac98021fd713f470cc00610482c8e
parentUpdated to automake 1.10. (diff)
downloadgnupg2-d5052fd22864ebb879e3b417ecfefd88e6c1800a.tar.xz
gnupg2-d5052fd22864ebb879e3b417ecfefd88e6c1800a.zip
Upgraded gettext.
Fixed accidental dependency on libgcrypt 1.3.0.
-rw-r--r--ABOUT-NLS484
-rw-r--r--ChangeLog12
-rw-r--r--INSTALL103
-rw-r--r--TODO15
-rwxr-xr-xautogen.sh2
-rw-r--r--common/ChangeLog5
-rw-r--r--common/signal.c22
-rw-r--r--configure.ac11
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/openfile.c14
-rw-r--r--intl/ChangeLog4
-rw-r--r--intl/Makefile.in22
-rw-r--r--intl/VERSION2
-rw-r--r--intl/langprefs.c4
-rw-r--r--intl/libgnuintl.h.in2
-rw-r--r--intl/localcharset.c28
-rw-r--r--intl/localename.c4
-rw-r--r--intl/lock.c6
-rw-r--r--intl/lock.h34
-rw-r--r--intl/printf-args.c8
-rw-r--r--intl/printf-args.h10
-rw-r--r--intl/printf-parse.c21
-rw-r--r--intl/printf.c67
-rw-r--r--intl/relocatable.c6
-rw-r--r--intl/vasnprintf.c38
-rw-r--r--keyserver/ChangeLog4
-rw-r--r--keyserver/Makefile.am3
-rw-r--r--m4/ChangeLog17
-rw-r--r--m4/Makefile.am2
-rw-r--r--m4/codeset.m46
-rw-r--r--m4/gettext.m4346
-rw-r--r--m4/intl.m4259
-rw-r--r--m4/intldir.m419
-rw-r--r--m4/intmax.m47
-rw-r--r--m4/inttypes-pri.m412
-rw-r--r--m4/inttypes_h.m46
-rw-r--r--m4/lib-link.m424
-rw-r--r--m4/lock.m480
-rw-r--r--m4/longlong.m443
-rw-r--r--m4/size_max.m470
-rw-r--r--m4/stdint_h.m46
-rw-r--r--m4/ulonglong.m443
-rw-r--r--po/ChangeLog4
-rw-r--r--po/Makefile.in.in12
-rw-r--r--po/Makevars.template41
-rw-r--r--po/be.po680
-rw-r--r--po/ca.po684
-rw-r--r--po/cs.po680
-rw-r--r--po/da.po679
-rw-r--r--po/de.po688
-rw-r--r--po/el.po684
-rw-r--r--po/eo.po679
-rw-r--r--po/es.po684
-rw-r--r--po/et.po684
-rw-r--r--po/fi.po684
-rw-r--r--po/fr.po681
-rw-r--r--po/gl.po684
-rw-r--r--po/hu.po684
-rw-r--r--po/id.po684
-rw-r--r--po/it.po684
-rw-r--r--po/ja.po680
-rw-r--r--po/nb.po680
-rw-r--r--po/pl.po684
-rw-r--r--po/pt.po689
-rw-r--r--po/pt_BR.po683
-rw-r--r--po/ro.po684
-rw-r--r--po/ru.po684
-rw-r--r--po/sk.po684
-rw-r--r--po/sv.po684
-rw-r--r--po/tr.po685
-rw-r--r--po/zh_CN.po680
-rw-r--r--po/zh_TW.po680
-rwxr-xr-xscripts/compile154
-rwxr-xr-xscripts/config.guess593
-rwxr-xr-xscripts/config.sub124
-rwxr-xr-xscripts/depcomp188
-rwxr-xr-xscripts/install-sh649
-rwxr-xr-xscripts/mdate-sh84
-rwxr-xr-xscripts/missing197
-rwxr-xr-xscripts/mkinstalldirs92
-rw-r--r--sm/ChangeLog4
-rw-r--r--sm/certcheck.c11
82 files changed, 11912 insertions, 10556 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 3575535a8..ec20977e0 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -172,14 +172,14 @@ get started, please write to `translation@iro.umontreal.ca' to reach the
coordinator for all translator teams.
The English team is special. It works at improving and uniformizing
-the terminology in use. Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use. Proven linguistic skills are praised more than
+programming skills, here.
1.5 Available Packages
======================
Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of July
+matrix shows the current state of internationalization, as of October
2006. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
@@ -192,19 +192,19 @@ translation percentage of at least 50%.
ant-phone | () |
anubis | [] |
ap-utils | |
- aspell | [] [] [] [] |
+ aspell | [] [] [] [] [] |
bash | [] [] [] |
batchelor | [] |
bfd | |
bibshelf | [] |
binutils | [] |
bison | [] [] |
- bison-runtime | [] |
+ bison-runtime | |
bluez-pin | [] [] [] [] [] |
cflow | [] |
clisp | [] [] |
console-tools | [] [] |
- coreutils | [] [] [] [] |
+ coreutils | [] [] [] |
cpio | |
cpplib | [] [] [] |
cryptonit | [] |
@@ -242,7 +242,7 @@ translation percentage of at least 50%.
gnutls | |
gpe-aerial | [] [] |
gpe-beam | [] [] |
- gpe-calendar | [] [] |
+ gpe-calendar | |
gpe-clock | [] [] |
gpe-conf | [] [] |
gpe-contacts | |
@@ -270,19 +270,17 @@ translation percentage of at least 50%.
gst-plugins-base | [] [] [] |
gst-plugins-good | [] [] [] [] [] [] [] |
gstreamer | [] [] [] [] [] [] [] |
- gtick | [] () |
+ gtick | () |
gtkam | [] [] [] |
gtkorphan | [] [] |
gtkspell | [] [] [] [] |
gutenprint | [] |
- hello | [] [] [] [] [] |
+ hello | [] [] [] [] [] |
id-utils | [] [] |
impost | |
indent | [] [] [] |
iso_3166 | [] [] |
- iso_3166_1 | [] [] [] [] [] |
iso_3166_2 | |
- iso_3166_3 | [] |
iso_4217 | [] |
iso_639 | [] [] |
jpilot | [] |
@@ -315,7 +313,7 @@ translation percentage of at least 50%.
man-db | [] () [] [] |
minicom | [] [] [] |
mysecretdiary | [] [] |
- nano | [] [] () [] |
+ nano | [] [] [] |
nano_1_0 | [] () [] [] |
opcodes | [] |
parted | |
@@ -331,7 +329,7 @@ translation percentage of at least 50%.
scrollkeeper | [] [] [] [] [] [] [] [] |
sed | [] [] [] |
sh-utils | [] [] |
- shared-mime-info | [] [] [] |
+ shared-mime-info | [] [] [] [] |
sharutils | [] [] [] [] [] [] |
shishi | |
silky | |
@@ -355,12 +353,12 @@ translation percentage of at least 50%.
wastesedge | () |
wdiff | [] [] [] [] |
wget | [] [] |
- xchat | [] [] [] [] [] |
+ xchat | [] [] [] [] [] [] |
xkeyboard-config | |
xpad | [] [] |
+----------------------------------------------------+
af am ar az be bg bs ca cs cy da de el en en_GB eo
- 11 0 1 2 8 21 1 42 43 2 62 99 18 1 16 16
+ 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16
es et eu fa fi fr ga gl gu he hi hr hu id is it
+--------------------------------------------------+
@@ -379,7 +377,7 @@ translation percentage of at least 50%.
bison | [] [] [] [] [] [] |
bison-runtime | [] [] [] [] [] |
bluez-pin | [] [] [] [] [] |
- cflow | |
+ cflow | [] |
clisp | [] [] |
console-tools | |
coreutils | [] [] [] [] [] [] |
@@ -403,7 +401,7 @@ translation percentage of at least 50%.
gbiff | [] |
gcal | [] [] |
gcc | [] |
- gettext-examples | [] [] [] [] [] |
+ gettext-examples | [] [] [] [] [] [] |
gettext-runtime | [] [] [] [] [] [] |
gettext-tools | [] [] [] |
gimp-print | [] [] |
@@ -420,7 +418,7 @@ translation percentage of at least 50%.
gnutls | |
gpe-aerial | [] [] |
gpe-beam | [] [] |
- gpe-calendar | [] [] [] [] |
+ gpe-calendar | |
gpe-clock | [] [] [] [] |
gpe-conf | [] |
gpe-contacts | [] [] |
@@ -442,13 +440,13 @@ translation percentage of at least 50%.
gramadoir | [] [] |
grep | [] [] [] [] [] [] [] [] [] [] [] [] |
gretl | [] [] [] |
- gsasl | [] |
+ gsasl | [] [] |
gss | [] |
gst-plugins | [] [] [] |
gst-plugins-base | [] [] |
gst-plugins-good | [] [] [] |
gstreamer | [] [] [] |
- gtick | [] [] [] [] [] |
+ gtick | [] |
gtkam | [] [] [] [] |
gtkorphan | [] [] |
gtkspell | [] [] [] [] [] [] |
@@ -458,9 +456,7 @@ translation percentage of at least 50%.
impost | [] [] |
indent | [] [] [] [] [] [] [] [] [] [] |
iso_3166 | [] [] [] |
- iso_3166_1 | [] [] [] [] [] [] [] |
iso_3166_2 | [] |
- iso_3166_3 | [] |
iso_4217 | [] [] [] [] |
iso_639 | [] [] [] [] [] |
jpilot | [] [] |
@@ -481,7 +477,7 @@ translation percentage of at least 50%.
libgphoto2 | [] [] [] |
libgphoto2_port | [] [] |
libgsasl | [] [] |
- libiconv | [] |
+ libiconv | [] [] |
libidn | [] [] |
lifelines | () |
lilypond | [] |
@@ -493,7 +489,7 @@ translation percentage of at least 50%.
man-db | () |
minicom | [] [] [] [] |
mysecretdiary | [] [] [] |
- nano | [] () [] [] [] [] |
+ nano | [] [] [] [] [] [] |
nano_1_0 | [] [] [] [] [] |
opcodes | [] [] [] [] |
parted | [] [] [] [] |
@@ -501,7 +497,7 @@ translation percentage of at least 50%.
psmisc | [] [] [] |
pwdutils | |
python | |
- qof | |
+ qof | [] |
radius | [] [] |
recode | [] [] [] [] [] [] [] [] |
rpm | [] [] |
@@ -520,7 +516,7 @@ translation percentage of at least 50%.
sp | [] |
stardict | [] |
system-tools-ba... | [] [] [] [] [] [] [] [] |
- tar | [] [] [] [] [] [] |
+ tar | [] [] [] [] [] [] [] |
texinfo | [] [] |
textutils | [] [] [] [] [] |
tin | [] () |
@@ -538,185 +534,183 @@ translation percentage of at least 50%.
xpad | [] [] [] |
+--------------------------------------------------+
es et eu fa fi fr ga gl gu he hi hr hu id is it
- 89 21 16 2 41 119 61 14 1 8 1 6 61 30 0 53
+ 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52
- ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
- +--------------------------------------------------+
- GNUnet | |
- a2ps | () [] [] () |
- aegis | () |
- ant-phone | [] |
- anubis | [] [] [] |
- ap-utils | [] |
- aspell | [] [] |
- bash | [] |
- batchelor | [] [] |
- bfd | |
- bibshelf | [] |
- binutils | |
- bison | [] [] [] |
- bison-runtime | [] [] [] |
- bluez-pin | [] [] [] |
- cflow | |
- clisp | [] |
- console-tools | |
- coreutils | [] |
- cpio | |
- cpplib | [] |
- cryptonit | [] |
- darkstat | [] [] |
- dialog | [] [] |
- diffutils | [] [] [] |
- doodle | |
- e2fsprogs | [] |
- enscript | [] |
- error | [] |
- fetchmail | [] [] |
- fileutils | [] [] |
- findutils | [] |
- flex | [] [] |
- fslint | [] [] |
- gas | |
- gawk | [] [] |
- gbiff | [] |
- gcal | |
- gcc | |
- gettext-examples | [] [] |
- gettext-runtime | [] [] [] |
- gettext-tools | [] [] |
- gimp-print | [] [] |
- gip | [] [] |
- gliv | [] |
- glunarclock | [] [] |
- gmult | [] [] |
- gnubiff | |
- gnucash | () () |
- gnucash-glossary | [] |
- gnuedu | |
- gnulib | [] [] [] [] |
- gnunet-gtk | |
- gnutls | |
- gpe-aerial | [] |
- gpe-beam | [] |
- gpe-calendar | [] |
- gpe-clock | [] [] |
- gpe-conf | [] [] |
- gpe-contacts | [] |
- gpe-edit | [] [] |
- gpe-filemanager | [] |
- gpe-go | [] [] |
- gpe-login | [] [] |
- gpe-ownerinfo | [] |
- gpe-package | [] |
- gpe-sketchbook | [] [] |
- gpe-su | [] [] |
- gpe-taskmanager | [] [] [] |
- gpe-timesheet | [] |
- gpe-today | [] |
- gpe-todo | |
- gphoto2 | [] [] |
- gprof | |
- gpsdrive | () () () |
- gramadoir | () |
- grep | [] [] [] |
- gretl | |
- gsasl | [] |
- gss | |
- gst-plugins | [] |
- gst-plugins-base | |
- gst-plugins-good | [] |
- gstreamer | [] |
- gtick | [] |
- gtkam | [] |
- gtkorphan | [] |
- gtkspell | [] [] |
- gutenprint | |
- hello | [] [] [] [] [] [] [] [] |
- id-utils | [] |
- impost | |
- indent | [] [] |
- iso_3166 | [] |
- iso_3166_1 | [] [] |
- iso_3166_2 | [] |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] |
- iso_639 | [] [] |
- jpilot | () () () |
- jtag | |
- jwhois | [] |
- kbd | [] |
- keytouch | [] |
- keytouch-editor | |
- keytouch-keyboa... | |
- latrine | [] |
- ld | |
- leafpad | [] [] |
- libc | [] [] [] [] [] |
- libexif | |
- libextractor | |
- libgpewidget | [] |
- libgpg-error | |
- libgphoto2 | [] |
- libgphoto2_port | [] |
- libgsasl | [] |
- libiconv | |
- libidn | [] [] |
- lifelines | [] |
- lilypond | |
- lingoteach | [] |
- lynx | [] [] |
- m4 | [] [] |
- mailutils | |
- make | [] [] [] |
- man-db | () |
- minicom | [] |
- mysecretdiary | [] |
- nano | [] [] [] |
- nano_1_0 | [] [] [] |
- opcodes | [] |
- parted | [] [] |
- pilot-qof | |
- psmisc | [] [] [] |
- pwdutils | |
- python | |
- qof | |
- radius | |
- recode | [] |
- rpm | [] [] |
- screem | [] |
- scrollkeeper | [] [] [] [] |
- sed | [] [] |
- sh-utils | [] [] |
- shared-mime-info | [] [] [] [] [] |
- sharutils | [] [] |
- shishi | |
- silky | [] |
- skencil | |
- sketch | |
- solfege | |
- soundtracker | |
- sp | () |
- stardict | [] [] |
- system-tools-ba... | [] [] [] [] |
- tar | [] [] [] |
- texinfo | [] [] [] |
- textutils | [] [] [] |
- tin | |
- tp-robot | [] |
- tuxpaint | [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] |
- vorbis-tools | [] |
- wastesedge | [] |
- wdiff | [] [] |
- wget | [] [] |
- xchat | [] [] [] [] |
- xkeyboard-config | [] |
- xpad | [] [] [] |
- +--------------------------------------------------+
- ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
- 40 24 2 1 1 3 1 2 3 21 0 15 1 101 5 3
+ ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+ +-------------------------------------------------+
+ GNUnet | |
+ a2ps | () [] [] () |
+ aegis | () |
+ ant-phone | [] |
+ anubis | [] [] [] |
+ ap-utils | [] |
+ aspell | [] [] |
+ bash | [] |
+ batchelor | [] [] |
+ bfd | |
+ bibshelf | [] |
+ binutils | |
+ bison | [] [] [] |
+ bison-runtime | [] [] [] |
+ bluez-pin | [] [] [] |
+ cflow | |
+ clisp | [] |
+ console-tools | |
+ coreutils | [] |
+ cpio | |
+ cpplib | [] |
+ cryptonit | [] |
+ darkstat | [] [] |
+ dialog | [] [] |
+ diffutils | [] [] [] |
+ doodle | |
+ e2fsprogs | [] |
+ enscript | [] |
+ error | [] |
+ fetchmail | [] [] |
+ fileutils | [] [] |
+ findutils | [] |
+ flex | [] [] |
+ fslint | [] [] |
+ gas | |
+ gawk | [] [] |
+ gbiff | [] |
+ gcal | |
+ gcc | |
+ gettext-examples | [] [] |
+ gettext-runtime | [] [] [] |
+ gettext-tools | [] [] |
+ gimp-print | [] [] |
+ gip | [] [] |
+ gliv | [] |
+ glunarclock | [] [] |
+ gmult | [] [] |
+ gnubiff | |
+ gnucash | () () |
+ gnucash-glossary | [] |
+ gnuedu | |
+ gnulib | [] [] [] [] |
+ gnunet-gtk | |
+ gnutls | |
+ gpe-aerial | [] |
+ gpe-beam | [] |
+ gpe-calendar | [] |
+ gpe-clock | [] [] [] |
+ gpe-conf | [] [] |
+ gpe-contacts | [] |
+ gpe-edit | [] [] [] |
+ gpe-filemanager | [] [] |
+ gpe-go | [] [] [] |
+ gpe-login | [] [] [] |
+ gpe-ownerinfo | [] [] |
+ gpe-package | [] [] |
+ gpe-sketchbook | [] [] |
+ gpe-su | [] [] [] |
+ gpe-taskmanager | [] [] [] [] |
+ gpe-timesheet | [] |
+ gpe-today | [] [] |
+ gpe-todo | [] |
+ gphoto2 | [] [] |
+ gprof | |
+ gpsdrive | () () () |
+ gramadoir | () |
+ grep | [] [] [] [] |
+ gretl | |
+ gsasl | [] |
+ gss | |
+ gst-plugins | [] |
+ gst-plugins-base | |
+ gst-plugins-good | [] |
+ gstreamer | [] |
+ gtick | |
+ gtkam | [] |
+ gtkorphan | [] |
+ gtkspell | [] [] |
+ gutenprint | |
+ hello | [] [] [] [] [] [] |
+ id-utils | [] |
+ impost | |
+ indent | [] [] |
+ iso_3166 | [] |
+ iso_3166_2 | [] |
+ iso_4217 | [] [] [] |
+ iso_639 | [] [] |
+ jpilot | () () () |
+ jtag | |
+ jwhois | [] |
+ kbd | [] |
+ keytouch | [] |
+ keytouch-editor | |
+ keytouch-keyboa... | |
+ latrine | [] |
+ ld | |
+ leafpad | [] [] |
+ libc | [] [] [] [] [] |
+ libexif | |
+ libextractor | |
+ libgpewidget | [] |
+ libgpg-error | |
+ libgphoto2 | [] |
+ libgphoto2_port | [] |
+ libgsasl | [] |
+ libiconv | |
+ libidn | [] [] |
+ lifelines | [] |
+ lilypond | |
+ lingoteach | [] |
+ lynx | [] [] |
+ m4 | [] [] |
+ mailutils | |
+ make | [] [] [] |
+ man-db | () |
+ minicom | [] |
+ mysecretdiary | [] |
+ nano | [] [] [] |
+ nano_1_0 | [] [] [] |
+ opcodes | [] |
+ parted | [] [] |
+ pilot-qof | |
+ psmisc | [] [] [] |
+ pwdutils | |
+ python | |
+ qof | |
+ radius | |
+ recode | [] |
+ rpm | [] [] |
+ screem | [] |
+ scrollkeeper | [] [] [] [] |
+ sed | [] [] |
+ sh-utils | [] [] |
+ shared-mime-info | [] [] [] [] [] |
+ sharutils | [] [] |
+ shishi | |
+ silky | [] |
+ skencil | |
+ sketch | |
+ solfege | |
+ soundtracker | |
+ sp | () |
+ stardict | [] [] |
+ system-tools-ba... | [] [] [] [] |
+ tar | [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] [] |
+ tin | |
+ tp-robot | [] |
+ tuxpaint | [] |
+ unicode-han-tra... | |
+ unicode-transla... | |
+ util-linux | [] [] |
+ vorbis-tools | [] |
+ wastesedge | [] |
+ wdiff | [] [] |
+ wget | [] [] |
+ xchat | [] [] [] [] |
+ xkeyboard-config | [] |
+ xpad | [] [] [] |
+ +-------------------------------------------------+
+ ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+ 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1
nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
+------------------------------------------------------+
@@ -776,7 +770,7 @@ translation percentage of at least 50%.
gnutls | [] [] |
gpe-aerial | [] [] [] [] [] [] [] |
gpe-beam | [] [] [] [] [] [] [] |
- gpe-calendar | [] [] [] [] [] [] [] [] |
+ gpe-calendar | [] |
gpe-clock | [] [] [] [] [] [] [] [] |
gpe-conf | [] [] [] [] [] [] [] |
gpe-contacts | [] [] [] [] [] |
@@ -798,13 +792,13 @@ translation percentage of at least 50%.
gramadoir | [] [] |
grep | [] [] [] [] [] [] [] [] |
gretl | [] |
- gsasl | [] [] |
+ gsasl | [] [] [] |
gss | [] [] [] |
gst-plugins | [] [] [] [] |
gst-plugins-base | [] |
gst-plugins-good | [] [] [] [] |
gstreamer | [] [] [] |
- gtick | [] [] [] |
+ gtick | [] |
gtkam | [] [] [] [] |
gtkorphan | [] |
gtkspell | [] [] [] [] [] [] [] [] |
@@ -814,9 +808,7 @@ translation percentage of at least 50%.
impost | [] |
indent | [] [] [] [] [] [] |
iso_3166 | [] [] [] [] [] [] |
- iso_3166_1 | [] [] [] [] |
iso_3166_2 | |
- iso_3166_3 | [] [] [] [] |
iso_4217 | [] [] [] [] |
iso_639 | [] [] [] [] |
jpilot | |
@@ -837,7 +829,7 @@ translation percentage of at least 50%.
libgphoto2 | [] |
libgphoto2_port | [] [] [] |
libgsasl | [] [] [] [] |
- libiconv | |
+ libiconv | [] [] |
libidn | [] [] () |
lifelines | [] [] |
lilypond | |
@@ -849,7 +841,7 @@ translation percentage of at least 50%.
man-db | [] [] |
minicom | [] [] [] [] [] |
mysecretdiary | [] [] [] [] |
- nano | [] [] |
+ nano | [] [] [] |
nano_1_0 | [] [] [] [] |
opcodes | [] [] |
parted | [] |
@@ -857,7 +849,7 @@ translation percentage of at least 50%.
psmisc | [] [] |
pwdutils | [] [] |
python | |
- qof | [] |
+ qof | [] [] |
radius | [] [] |
recode | [] [] [] [] [] [] [] |
rpm | [] [] [] [] |
@@ -894,7 +886,7 @@ translation percentage of at least 50%.
xpad | [] [] [] |
+------------------------------------------------------+
nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
- 0 2 3 58 31 53 5 76 72 5 42 48 12 51 130 2
+ 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2
tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
+---------------------------------------------------+
@@ -904,19 +896,19 @@ translation percentage of at least 50%.
ant-phone | [] [] | 6
anubis | [] [] [] | 11
ap-utils | () [] | 4
- aspell | [] [] [] | 14
+ aspell | [] [] [] | 15
bash | [] | 11
batchelor | [] [] | 9
bfd | | 1
bibshelf | [] | 7
binutils | [] [] [] | 9
bison | [] [] [] | 19
- bison-runtime | [] [] [] | 16
+ bison-runtime | [] [] [] | 15
bluez-pin | [] [] [] [] [] [] | 28
- cflow | [] [] | 4
+ cflow | [] [] | 5
clisp | | 6
console-tools | [] [] | 5
- coreutils | [] [] | 17
+ coreutils | [] [] | 16
cpio | [] [] [] | 9
cpplib | [] [] [] [] | 11
cryptonit | | 5
@@ -937,7 +929,7 @@ translation percentage of at least 50%.
gbiff | [] | 5
gcal | [] | 5
gcc | [] [] [] | 6
- gettext-examples | [] [] [] [] [] [] | 26
+ gettext-examples | [] [] [] [] [] [] | 27
gettext-runtime | [] [] [] [] [] [] | 28
gettext-tools | [] [] [] [] [] | 19
gimp-print | [] [] | 12
@@ -954,47 +946,45 @@ translation percentage of at least 50%.
gnutls | | 2
gpe-aerial | [] [] | 14
gpe-beam | [] [] | 14
- gpe-calendar | [] [] [] [] | 19
- gpe-clock | [] [] [] [] | 20
+ gpe-calendar | [] | 3
+ gpe-clock | [] [] [] [] | 21
gpe-conf | [] [] | 14
gpe-contacts | [] [] | 10
- gpe-edit | [] [] [] [] | 19
- gpe-filemanager | [] | 5
- gpe-go | [] [] | 14
- gpe-login | [] [] [] [] [] | 20
- gpe-ownerinfo | [] [] [] [] | 20
- gpe-package | [] | 5
+ gpe-edit | [] [] [] [] | 20
+ gpe-filemanager | [] | 6
+ gpe-go | [] [] | 15
+ gpe-login | [] [] [] [] [] | 21
+ gpe-ownerinfo | [] [] [] [] | 21
+ gpe-package | [] | 6
gpe-sketchbook | [] [] | 16
- gpe-su | [] [] [] | 19
- gpe-taskmanager | [] [] [] | 19
+ gpe-su | [] [] [] | 20
+ gpe-taskmanager | [] [] [] | 20
gpe-timesheet | [] [] [] [] | 18
- gpe-today | [] [] [] [] [] | 20
- gpe-todo | [] | 6
+ gpe-today | [] [] [] [] [] | 21
+ gpe-todo | [] | 7
gphoto2 | [] [] [] [] | 20
gprof | [] [] | 11
gpsdrive | | 4
gramadoir | [] | 7
- grep | [] [] [] [] | 33
+ grep | [] [] [] [] | 34
gretl | | 4
- gsasl | [] [] | 6
+ gsasl | [] [] | 8
gss | [] | 5
gst-plugins | [] [] [] | 15
gst-plugins-base | [] [] [] | 9
- gst-plugins-good | [] [] [] | 18
+ gst-plugins-good | [] [] [] [] [] | 20
gstreamer | [] [] [] | 17
- gtick | [] | 11
+ gtick | [] | 3
gtkam | [] | 13
gtkorphan | [] | 7
gtkspell | [] [] [] [] [] [] | 26
gutenprint | | 3
- hello | [] [] [] [] [] | 39
+ hello | [] [] [] [] [] | 37
id-utils | [] [] | 14
impost | [] | 4
indent | [] [] [] [] | 25
- iso_3166 | [] [] [] | 15
- iso_3166_1 | [] [] | 20
+ iso_3166 | [] [] [] [] | 16
iso_3166_2 | | 2
- iso_3166_3 | [] [] | 9
iso_4217 | [] [] | 14
iso_639 | [] | 14
jpilot | [] [] [] [] | 7
@@ -1003,7 +993,7 @@ translation percentage of at least 50%.
kbd | [] [] | 12
keytouch | [] | 4
keytouch-editor | | 2
- keytouch-keyboa... | | 2
+ keytouch-keyboa... | [] | 3
latrine | [] [] | 8
ld | [] [] [] [] | 8
leafpad | [] [] [] [] | 23
@@ -1015,7 +1005,7 @@ translation percentage of at least 50%.
libgphoto2 | [] | 8
libgphoto2_port | [] [] [] | 11
libgsasl | [] | 8
- libiconv | [] | 4
+ libiconv | [] | 7
libidn | [] [] | 10
lifelines | | 4
lilypond | | 2
@@ -1027,7 +1017,7 @@ translation percentage of at least 50%.
man-db | [] | 6
minicom | [] | 14
mysecretdiary | [] [] | 12
- nano | [] [] | 15
+ nano | [] [] | 17
nano_1_0 | [] [] [] | 18
opcodes | [] [] | 10
parted | [] [] [] | 10
@@ -1035,7 +1025,7 @@ translation percentage of at least 50%.
psmisc | [] | 10
pwdutils | [] | 3
python | | 0
- qof | [] | 2
+ qof | [] | 4
radius | [] | 6
recode | [] [] [] | 25
rpm | [] [] [] [] | 14
@@ -1043,7 +1033,7 @@ translation percentage of at least 50%.
scrollkeeper | [] [] [] [] | 26
sed | [] [] [] | 22
sh-utils | [] | 15
- shared-mime-info | [] [] [] [] | 23
+ shared-mime-info | [] [] [] [] | 24
sharutils | [] [] [] | 23
shishi | | 1
silky | [] | 4
@@ -1054,7 +1044,7 @@ translation percentage of at least 50%.
sp | [] | 3
stardict | [] [] [] [] | 11
system-tools-ba... | [] [] [] [] [] [] [] | 37
- tar | [] [] [] [] | 19
+ tar | [] [] [] [] | 20
texinfo | [] [] [] | 15
textutils | [] [] [] | 17
tin | | 1
@@ -1067,12 +1057,12 @@ translation percentage of at least 50%.
wastesedge | | 1
wdiff | [] [] | 22
wget | [] [] [] | 19
- xchat | [] [] [] [] | 28
+ xchat | [] [] [] [] | 29
xkeyboard-config | [] [] [] [] | 11
xpad | [] [] [] | 14
+---------------------------------------------------+
77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
- 172 domains 0 1 1 78 39 0 135 13 1 50 3 54 0 2054
+ 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028
Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are
@@ -1085,7 +1075,7 @@ distributed as such by its maintainer. There might be an observable
lag between the mere existence a PO file and its wide availability in a
distribution.
- If July 2006 seems to be old, you may fetch a more recent copy of
+ If October 2006 seems to be old, you may fetch a more recent copy of
this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
diff --git a/ChangeLog b/ChangeLog
index 363f3d7a4..6ebd0b85b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-07 Werner Koch <wk@g10code.com>
+
+ * configure.ac: Require libgcrypt 1.2.2 to avoid compiler warnings.
+
+2007-05-07 gettextize <bug-gnu-gettext@gnu.org>
+
+ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.16.1.
+
+2007-05-07 Werner Koch <wk@g10code.com>
+
+ * configure.ac: Bail out if no C-89 compiler has been found.
+
2007-05-04 Werner Koch <wk@g10code.com>
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-mailto
diff --git a/INSTALL b/INSTALL
index 54caf7c19..5458714e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,19 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
- This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -20,9 +26,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -32,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,51 +70,49 @@ The simplest way to compile this package is:
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -122,7 +123,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,11 +138,11 @@ you can use the `configure' options `--x-includes=DIR' and
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -156,7 +157,7 @@ where SYSTEM can have one of these forms:
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -167,9 +168,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +179,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -186,14 +187,18 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
diff --git a/TODO b/TODO
index 8698c910f..33a7c89fd 100644
--- a/TODO
+++ b/TODO
@@ -24,8 +24,6 @@
** Implement --default-key
** support the anyPolicy semantic
** Check that we are really following the verification procedures in rfc3280.
-** Implement a --card-status command.
- This is useful to check whether a card is supported at all.
* sm/keydb.c
@@ -42,7 +40,6 @@
** Make sure that secure memory is used where appropriate
* agent/pkdecrypt.c, agent/pksign.c
-** Don't use stdio to return results.
** Support DSA
* Move pkcs-1 encoding into libgcrypt.
@@ -105,19 +102,18 @@
versions of libgcrypt.
** GCRY_MD_USER
Remove these definitions.
+** MY_GCRY_PK_ECDSA
+ Removed this.
* Extend selinux support to other modules
* Remove -sat PGP2 compatibility hack
-* gnupg14/mpi: rsa_verify
- Is this is optimized for a 160 bit hash?
-
* Cleanup m4/ on next gettext update
There is at least one couple of duplicate files: inttype[_-]h.m4.
* UTF-8
- UTF-8 specific TODO.
+ (UTF-8 specific TODO0
* Pinpad Reader
We do not yet support P15 applications. The trivial thing using
@@ -129,7 +125,6 @@
scdaemon stays as a zombie and gpg-agent does not perform any more
commands.
-* configure check
-** Update autoconf and use AC_PROG_CC_C89
- to make sure that a compiant compiler is used
+
+
diff --git a/autogen.sh b/autogen.sh
index c9bf2d58a..5cd909beb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -163,7 +163,7 @@ q
automake_vers_num=`echo "$automake_vers" | cvtver`
gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
-s/^.*(\(.*\))/\1/p
+s/^.*\[\(.*\)])/\1/p
q
}' ${configure_ac}`
gettext_vers_num=`echo "$gettext_vers" | cvtver`
diff --git a/common/ChangeLog b/common/ChangeLog
index b458bdd5c..797f11962 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-07 Werner Koch <wk@g10code.com>
+
+ * signal.c (got_fatal_signal): Protect SIG from being clobbered by
+ a faulty signal implementaion. Suggested by James Juran.
+
2007-04-25 Werner Koch <wk@g10code.com>
* i18n.h (ngettext): New.
diff --git a/common/signal.c b/common/signal.c
index 0c79214b2..1c82014e0 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -92,9 +92,9 @@ got_fatal_signal (int sig)
const char *s;
if (caught_fatal_sig)
- raise (sig);
+ raise (sig);
caught_fatal_sig = 1;
-
+
if (cleanup_fnc)
cleanup_fnc ();
/* Better don't translate these messages. */
@@ -109,21 +109,25 @@ got_fatal_signal (int sig)
else
{
/* We are in a signal handler so we can't use any kind of printf
- even not sprintf. USe a straightforward algorithm. */
+ even not sprintf. So we use a straightforward algorithm. We
+ got a report that on one particular system, raising a signal
+ while in this handler, the parameter SIG get sclobbered and
+ things are messed up because we modify its value. Although
+ this is a bug in that system, we will protect against it. */
if (sig < 0 || sig >= 100000)
write (2, "?", 1);
else
{
- int i, any=0;
+ int i, value, any=0;
- for (i=10000; i; i /= 10)
+ for (value=sig,i=10000; i; i /= 10)
{
- if (sig >= i || ((any || i==1) && !(sig/i)))
+ if (value >= i || ((any || i==1) && !(value/i)))
{
- write (2, "0123456789"+(sig/i), 1);
- if ((sig/i))
+ write (2, "0123456789"+(value/i), 1);
+ if ((value/i))
any = 1;
- sig %= i;
+ value %= i;
}
}
}
diff --git a/configure.ac b/configure.ac
index c3c7d743a..ad6d3d280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# configure.ac - for GnuPG 1.9
+# configure.ac - for GnuPG 2.0
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007 Free Software Foundation, Inc.
#
@@ -20,7 +20,7 @@
# USA.
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.60)
+AC_PREREQ(2.61)
min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
@@ -42,7 +42,7 @@ development_version=no
NEED_GPG_ERROR_VERSION=1.4
NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.2.0
+NEED_LIBGCRYPT_VERSION=1.2.2
NEED_LIBASSUAN_API=1
NEED_LIBASSUAN_VERSION=0.9.3
@@ -446,6 +446,9 @@ AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AM_PROG_CC_C_O
+if test "x$ac_cv_prog_cc_c89" = "xno" ; then
+ AC_MSG_ERROR([[No C-89 compiler found]])
+fi
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
@@ -855,7 +858,7 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
#
# Check for gettext
#
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.16.1])
if test "$try_gettext" = yes; then
AM_GNU_GETTEXT(,[need-ngettext])
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7e04eb540..abd95a54a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 Werner Koch <wk@g10code.com>
+
+ * openfile.c (open_outfile, overwrite_filep) [W32]: Use "/dev/nul".
+
2007-05-02 David Shaw <dshaw@jabberwocky.com>
* packet.h, mainproc.c (reset_literals_seen): New function to
diff --git a/g10/openfile.c b/g10/openfile.c
index 381f93bd2..d0be66157 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -77,6 +77,10 @@ overwrite_filep( const char *fname )
if ( !strcmp ( fname, "/dev/null" ) )
return 1; /* does not do any harm */
#endif
+#ifdef HAVE_W32_SYSTEM
+ if ( !strcmp ( fname, "/dev/nul" ) )
+ return 1;
+#endif
/* fixme: add some backup stuff in case of overwrite */
if( opt.answer_yes )
@@ -196,8 +200,14 @@ open_outfile( const char *iname, int mode, IOBUF *a )
char *buf = NULL;
const char *name;
- if( opt.dry_run )
- name = "/dev/null";
+ if ( opt.dry_run )
+ {
+#ifdef HAVE_W32_SYSTEM
+ name = "/dev/nul";
+#else
+ name = "/dev/null";
+#endif
+ }
else if( opt.outfile )
name = opt.outfile;
else {
diff --git a/intl/ChangeLog b/intl/ChangeLog
index fd4940c52..a1e3707ed 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,4 +1,4 @@
-2006-07-21 GNU <bug-gnu-gettext@gnu.org>
+2006-11-27 GNU <bug-gnu-gettext@gnu.org>
- * Version 0.15 released.
+ * Version 0.16.1 released.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index c1d5fbde5..525922e11 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -51,7 +51,17 @@ subdir = intl
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-mkinstalldirs = @install_sh@ -d
+
+# 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@
@@ -159,11 +169,11 @@ 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 \
-libgnuintl.h_vms Makefile.vms \
-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
+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
+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
@@ -190,7 +200,7 @@ libintl.la libgnuintl.la: $(OBJECTS)
# Maintainers of other packages that include the intl directory must *not*
# change these values.
LTV_CURRENT=8
-LTV_REVISION=0
+LTV_REVISION=1
LTV_AGE=0
.SUFFIXES:
diff --git a/intl/VERSION b/intl/VERSION
index fb7452c29..2525c4ea8 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.15
+GNU gettext library from gettext-0.16.1
diff --git a/intl/langprefs.c b/intl/langprefs.c
index 5436040f9..59c8def21 100644
--- a/intl/langprefs.c
+++ b/intl/langprefs.c
@@ -1,5 +1,5 @@
/* Determine the user's language preferences.
- Copyright (C) 2004-2005 Free Software Foundation, Inc.
+ 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
@@ -35,7 +35,7 @@ extern void _nl_locale_name_canonicalize (char *name);
/* Determine the user's language preferences, as a colon separated list of
locale names in XPG syntax
- language[_territory[.codeset]][@modifier]
+ 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. */
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
index 1a053f3af..5e1ccd676 100644
--- a/intl/libgnuintl.h.in
+++ b/intl/libgnuintl.h.in
@@ -53,7 +53,7 @@ extern "C" {
/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x000F00
+#define LIBINTL_VERSION 0x001000
extern int libintl_version;
diff --git a/intl/localcharset.c b/intl/localcharset.c
index e8505bfa9..e796ae71c 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -19,26 +19,15 @@
/* Written by Bruno Haible <bruno@clisp.org>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "localcharset.h"
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
+#include <stddef.h>
#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
#if defined _WIN32 || defined __WIN32__
# define WIN32_NATIVE
@@ -53,7 +42,7 @@
# if HAVE_LANGINFO_CODESET
# include <langinfo.h>
# else
-# if HAVE_SETLOCALE
+# if 0 /* see comment below */
# include <locale.h>
# endif
# endif
@@ -76,6 +65,11 @@
# 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) == '\\')
@@ -358,7 +352,7 @@ locale_charset (void)
(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 HAVE_SETLOCALE && 0
+# if 0
locale = setlocale (LC_CTYPE, NULL);
# endif
if (locale == NULL || locale[0] == '\0')
diff --git a/intl/localename.c b/intl/localename.c
index 1b8b99a1a..e1b4615a0 100644
--- a/intl/localename.c
+++ b/intl/localename.c
@@ -973,12 +973,12 @@ _nl_locale_name_canonicalize (char *name)
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 __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+#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]
+ 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. */
diff --git a/intl/lock.c b/intl/lock.c
index a860459d1..f60a8d9be 100644
--- a/intl/lock.c
+++ b/intl/lock.c
@@ -1,5 +1,5 @@
/* Locking in multithreaded situations.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ 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
@@ -20,9 +20,7 @@
Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
gthr-win32.h. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "lock.h"
diff --git a/intl/lock.h b/intl/lock.h
index be99139dc..04d136922 100644
--- a/intl/lock.h
+++ b/intl/lock.h
@@ -1,5 +1,5 @@
/* Locking in multithreaded situations.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ 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
@@ -71,6 +71,10 @@
# 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. */
@@ -356,6 +360,10 @@ typedef pthread_once_t gl_once_t;
while (0)
extern int glthread_once_singlethreaded (pthread_once_t *once_control);
+# ifdef __cplusplus
+}
+# endif
+
#endif
/* ========================================================================= */
@@ -367,6 +375,10 @@ extern int glthread_once_singlethreaded (pthread_once_t *once_control);
# 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. */
@@ -469,6 +481,10 @@ typedef pth_once_t gl_once_t;
extern void glthread_once_call (void *arg);
extern int glthread_once_singlethreaded (pth_once_t *once_control);
+# ifdef __cplusplus
+}
+# endif
+
#endif
/* ========================================================================= */
@@ -481,6 +497,10 @@ extern int glthread_once_singlethreaded (pth_once_t *once_control);
# 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. */
@@ -601,6 +621,10 @@ typedef struct
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
/* ========================================================================= */
@@ -609,6 +633,10 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control);
# 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),
@@ -742,6 +770,10 @@ typedef struct
glthread_once (&NAME, INITFUNCTION)
extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void));
+# ifdef __cplusplus
+}
+# endif
+
#endif
/* ========================================================================= */
diff --git a/intl/printf-args.c b/intl/printf-args.c
index 47b73d2c1..ee0faba16 100644
--- a/intl/printf-args.c
+++ b/intl/printf-args.c
@@ -16,9 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "printf-args.h"
@@ -59,7 +57,7 @@ printf_fetchargs (va_list args, arguments *a)
case TYPE_ULONGINT:
ap->a.a_ulongint = va_arg (args, unsigned long int);
break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
case TYPE_LONGLONGINT:
ap->a.a_longlongint = va_arg (args, long long int);
break;
@@ -131,7 +129,7 @@ printf_fetchargs (va_list args, arguments *a)
case TYPE_COUNT_LONGINT_POINTER:
ap->a.a_count_longint_pointer = va_arg (args, long int *);
break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
case TYPE_COUNT_LONGLONGINT_POINTER:
ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
break;
diff --git a/intl/printf-args.h b/intl/printf-args.h
index 625b8036a..886febe66 100644
--- a/intl/printf-args.h
+++ b/intl/printf-args.h
@@ -1,5 +1,5 @@
/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+ 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
@@ -48,7 +48,7 @@ typedef enum
TYPE_UINT,
TYPE_LONGINT,
TYPE_ULONGINT,
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
TYPE_LONGLONGINT,
TYPE_ULONGLONGINT,
#endif
@@ -69,7 +69,7 @@ typedef enum
TYPE_COUNT_SHORT_POINTER,
TYPE_COUNT_INT_POINTER,
TYPE_COUNT_LONGINT_POINTER
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
, TYPE_COUNT_LONGLONGINT_POINTER
#endif
} arg_type;
@@ -88,7 +88,7 @@ typedef struct
unsigned int a_uint;
long int a_longint;
unsigned long int a_ulongint;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
long long int a_longlongint;
unsigned long long int a_ulonglongint;
#endif
@@ -110,7 +110,7 @@ typedef struct
short * a_count_short_pointer;
int * a_count_int_pointer;
long int * a_count_longint_pointer;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
long long int * a_count_longlongint_pointer;
#endif
}
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
index 20240e379..1a06b1a90 100644
--- a/intl/printf-parse.c
+++ b/intl/printf-parse.c
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+ 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
@@ -16,9 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#if WIDE_CHAR_VERSION
@@ -385,11 +383,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
switch (c)
{
case 'd': case 'i':
-#ifdef HAVE_LONG_LONG
+#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)
@@ -400,11 +401,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
type = TYPE_INT;
break;
case 'o': case 'u': case 'x': case 'X':
-#ifdef HAVE_LONG_LONG
+#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)
@@ -459,11 +463,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
type = TYPE_POINTER;
break;
case 'n':
-#ifdef HAVE_LONG_LONG
+#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)
diff --git a/intl/printf.c b/intl/printf.c
index 275968b37..004c66f78 100644
--- a/intl/printf.c
+++ b/intl/printf.c
@@ -47,9 +47,16 @@ char *alloca ();
#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. */
@@ -96,9 +103,15 @@ libintl_vfprintf (FILE *stream, const char *format, va_list args)
int retval = -1;
if (result != NULL)
{
- if (fwrite (result, 1, length, stream) == length)
- retval = length;
+ size_t written = fwrite (result, 1, length, stream);
free (result);
+ if (written == length)
+ {
+ if (length > INT_MAX)
+ errno = EOVERFLOW;
+ else
+ retval = length;
+ }
}
return retval;
}
@@ -152,6 +165,11 @@ libintl_vsprintf (char *resultbuf, const char *format, va_list args)
free (result);
return -1;
}
+ if (length > INT_MAX)
+ {
+ errno = EOVERFLOW;
+ return -1;
+ }
else
return length;
}
@@ -194,12 +212,16 @@ libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list a
{
if (maxlength > 0)
{
- if (length < maxlength)
- abort ();
- memcpy (resultbuf, result, maxlength - 1);
- resultbuf[maxlength - 1] = '\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
@@ -232,6 +254,12 @@ libintl_vasprintf (char **resultp, const char *format, va_list args)
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;
}
@@ -293,9 +321,14 @@ libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
for (i = 0; i < length; i++)
if (fputwc (result[i], stream) == WEOF)
break;
- if (i == length)
- retval = length;
free (result);
+ if (i == length)
+ {
+ if (length > INT_MAX)
+ errno = EOVERFLOW;
+ else
+ retval = length;
+ }
}
return retval;
}
@@ -348,12 +381,22 @@ libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_
{
if (maxlength > 0)
{
- if (length < maxlength)
- abort ();
- memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
- resultbuf[maxlength - 1] = 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
diff --git a/intl/relocatable.c b/intl/relocatable.c
index 7cc8daf77..5e1dde6c8 100644
--- a/intl/relocatable.c
+++ b/intl/relocatable.c
@@ -1,5 +1,5 @@
/* Provide relocatable packages.
- Copyright (C) 2003-2005 Free Software Foundation, Inc.
+ Copyright (C) 2003-2006 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
This program is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
# define _GNU_SOURCE 1
#endif
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
#include "relocatable.h"
diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
index cef29a756..8b073103b 100644
--- a/intl/vasnprintf.c
+++ b/intl/vasnprintf.c
@@ -23,9 +23,7 @@
# define _GNU_SOURCE 1
#endif
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#ifndef IN_LIBINTL
# include <alloca.h>
#endif
@@ -41,7 +39,7 @@
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <errno.h> /* errno */
-#include <limits.h> /* CHAR_BIT, INT_MAX */
+#include <limits.h> /* CHAR_BIT */
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
#if WIDE_CHAR_VERSION
# include "wprintf-parse.h"
@@ -52,11 +50,6 @@
/* Checked size_t computations. */
#include "xsize.h"
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
#ifdef HAVE_WCHAR_T
# ifdef HAVE_WCSLEN
# define local_wcslen wcslen
@@ -256,7 +249,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
case TYPE_COUNT_LONGINT_POINTER:
*a.arg[dp->arg_index].a.a_count_longint_pointer = length;
break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
case TYPE_COUNT_LONGLONGINT_POINTER:
*a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
break;
@@ -330,7 +323,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
{
case 'd': case 'i': case 'u':
-# ifdef HAVE_LONG_LONG
+# ifdef HAVE_LONG_LONG_INT
if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
tmp_length =
(unsigned int) (sizeof (unsigned long long) * CHAR_BIT
@@ -360,7 +353,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
break;
case 'o':
-# ifdef HAVE_LONG_LONG
+# ifdef HAVE_LONG_LONG_INT
if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
tmp_length =
(unsigned int) (sizeof (unsigned long long) * CHAR_BIT
@@ -388,7 +381,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
break;
case 'x': case 'X':
-# ifdef HAVE_LONG_LONG
+# ifdef HAVE_LONG_LONG_INT
if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
tmp_length =
(unsigned int) (sizeof (unsigned long long) * CHAR_BIT
@@ -535,7 +528,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
switch (type)
{
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
case TYPE_LONGLONGINT:
case TYPE_ULONGLONGINT:
*p++ = 'l';
@@ -689,7 +682,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
SNPRINTF_BUF (arg);
}
break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
case TYPE_LONGLONGINT:
{
long long int arg = a.arg[dp->arg_index].a.a_longlongint;
@@ -870,19 +863,12 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
free (buf_malloced);
CLEANUP ();
*lengthp = length;
- if (length > INT_MAX)
- goto length_overflow;
+ /* 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;
- length_overflow:
- /* We could produce such a big string, but its length doesn't fit into
- an 'int'. POSIX says that snprintf() fails with errno = EOVERFLOW in
- this case. */
- if (result != resultbuf)
- free (result);
- errno = EOVERFLOW;
- return NULL;
-
out_of_memory:
if (!(result == resultbuf || result == NULL))
free (result);
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 2120ee95c..65e8f6213 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (gpg2keys_ldap_LDADD): Add GPG_ERROR_LIBS.
+
2007-05-04 Werner Koch <wk@g10code.com>
* gpgkeys_test.in: Rename to ..
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index f6a287030..23f2befc6 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -41,7 +41,8 @@ other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
-gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(NETLIBS) $(other_libs)
+gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(GPG_ERROR_LIBS) \
+ $(NETLIBS) $(other_libs)
gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c
gpg2keys_finger_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/m4/ChangeLog b/m4/ChangeLog
index bd779a990..b9c3688ee 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,20 @@
+2007-05-07 gettextize <bug-gnu-gettext@gnu.org>
+
+ * gettext.m4: Upgrade to gettext-0.16.1.
+ * lib-link.m4: Upgrade to gettext-0.16.1.
+ * codeset.m4: Upgrade to gettext-0.16.1.
+ * intl.m4: New file, from gettext-0.16.1.
+ * intldir.m4: New file, from gettext-0.16.1.
+ * intmax.m4: Upgrade to gettext-0.16.1.
+ * inttypes_h.m4: Upgrade to gettext-0.16.1.
+ * inttypes-pri.m4: Upgrade to gettext-0.16.1.
+ * lock.m4: Upgrade to gettext-0.16.1.
+ * longlong.m4: Upgrade to gettext-0.16.1.
+ * size_max.m4: Upgrade to gettext-0.16.1.
+ * stdint_h.m4: Upgrade to gettext-0.16.1.
+ * ulonglong.m4: Upgrade to gettext-0.16.1.
+ * Makefile.am (EXTRA_DIST): Add the new files.
+
2006-11-21 Werner Koch <wk@g10code.com>
* gnupg-pth.m4 (GNUPG_PTH_VERSION_CHECK): Use --all with
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 554e3256f..c8b74aea1 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = glibc2.m4 inttypes-h.m4 lock.m4 visibility.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = intl.m4 intldir.m4 glibc2.m4 inttypes-h.m4 lock.m4 visibility.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 tar-ustar.m4 readline.m4
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index a6e67ec49..223955b45 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,5 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
[
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
[AC_TRY_LINK([#include <langinfo.h>],
- [char* cs = nl_langinfo(CODESET);],
+ [char* cs = nl_langinfo(CODESET); return !cs;],
am_cv_langinfo_codeset=yes,
am_cv_langinfo_codeset=no)
])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index dae3d81e7..91c345e99 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 53 (gettext-0.15)
+# gettext.m4 serial 59 (gettext-0.16.1)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2005.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
dnl Macro to add for using GNU gettext.
@@ -63,8 +63,13 @@ AC_DEFUN([AM_GNU_GETTEXT],
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])])
- define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+ define([gt_included_intl],
+ ifelse([$1], [external],
+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+ [yes]))
define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+ gt_NEEDS_INIT
+ AM_GNU_GETTEXT_NEED([$2])
AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [
@@ -78,7 +83,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl Sometimes libintl requires libiconv, so first search for libiconv.
dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then
- dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
dnl the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions:
@@ -104,6 +109,15 @@ AC_DEFUN([AM_GNU_GETTEXT],
LTLIBINTL=
POSUB=
+ dnl Add a version number to the cache macros.
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
gt_use_preinstalled_gnugettext=no
@@ -122,26 +136,35 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl to use. If GNU gettext is available we use this. Else we have
dnl to fall back to GNU NLS library.
- dnl Add a version number to the cache macros.
- define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
- define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
- define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
- AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
- [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
+changequote(,)dnl
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-]], [])[extern int _nl_msg_cat_cntr;
+changequote([,])dnl
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+ [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],
[bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
- gt_cv_func_gnugettext_libc=yes,
- gt_cv_func_gnugettext_libc=no)])
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+ [eval "$gt_func_gnugettext_libc=yes"],
+ [eval "$gt_func_gnugettext_libc=no"])])
- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
dnl Sometimes libintl requires libiconv, so first search for libiconv.
ifelse(gt_included_intl, yes, , [
AM_ICONV_LINK
@@ -152,48 +175,40 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
dnl even if libiconv doesn't exist.
AC_LIB_LINKFLAGS_BODY([intl])
AC_CACHE_CHECK([for GNU gettext in libintl],
- gt_cv_func_gnugettext_libintl,
+ [$gt_func_gnugettext_libintl],
[gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on libiconv.
AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-]], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
- gt_cv_func_gnugettext_libintl=yes,
- gt_cv_func_gnugettext_libintl=no)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+ [eval "$gt_func_gnugettext_libintl=yes"],
+ [eval "$gt_func_gnugettext_libintl=no"])
dnl Now see whether libintl exists and depends on libiconv.
- if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-]], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
-return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- gt_cv_func_gnugettext_libintl=yes
+ eval "$gt_func_gnugettext_libintl=yes"
])
fi
CPPFLAGS="$gt_save_CPPFLAGS"
@@ -204,8 +219,8 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
dnl use it. But if this macro is used in GNU gettext, and GNU
dnl gettext is already preinstalled in libintl, we update this
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- if test "$gt_cv_func_gnugettext_libc" = "yes" \
- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
&& test "$PACKAGE" != gettext-runtime \
&& test "$PACKAGE" != gettext-tools; }; then
gt_use_preinstalled_gnugettext=yes
@@ -265,7 +280,7 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
if test "$USE_NLS" = "yes"; then
AC_MSG_CHECKING([where the gettext function comes from])
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
gt_source="external libintl"
else
gt_source="libc"
@@ -279,7 +294,7 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
AC_MSG_CHECKING([how to link with libintl])
AC_MSG_RESULT([$LIBINTL])
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
@@ -347,228 +362,6 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)],
])
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([gt_GLIBC2])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([gl_VISIBILITY])dnl
- AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
- AC_REQUIRE([bh_C_SIGNED])dnl
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
- AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
- AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
- AC_REQUIRE([gt_TYPE_WINT_T])dnl
- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([gt_TYPE_INTMAX_T])
- AC_REQUIRE([gt_PRINTF_POSIX])
- AC_REQUIRE([gl_GLIBC21])dnl
- AC_REQUIRE([gl_XSIZE])dnl
- AC_REQUIRE([gt_INTL_MACOSX])dnl
-
- AC_CHECK_TYPE([ptrdiff_t], ,
- [AC_DEFINE([ptrdiff_t], [long],
- [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
- ])
- AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
- AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
-
- dnl Use the _snprintf function only if it is declared (because on NetBSD it
- dnl is defined as a weak alias of snprintf; we prefer to use the latter).
- gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
- gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
- dnl Use the *_unlocked functions only if they are declared.
- dnl (because some of them were defined without being declared in Solaris
- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
- dnl on Solaris 2.5.1 to run on Solaris 2.6).
- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
- gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
- case $gt_cv_func_printf_posix in
- *yes) HAVE_POSIX_PRINTF=1 ;;
- *) HAVE_POSIX_PRINTF=0 ;;
- esac
- AC_SUBST([HAVE_POSIX_PRINTF])
- if test "$ac_cv_func_asprintf" = yes; then
- HAVE_ASPRINTF=1
- else
- HAVE_ASPRINTF=0
- fi
- AC_SUBST([HAVE_ASPRINTF])
- if test "$ac_cv_func_snprintf" = yes; then
- HAVE_SNPRINTF=1
- else
- HAVE_SNPRINTF=0
- fi
- AC_SUBST([HAVE_SNPRINTF])
- if test "$ac_cv_func_wprintf" = yes; then
- HAVE_WPRINTF=1
- else
- HAVE_WPRINTF=0
- fi
- AC_SUBST([HAVE_WPRINTF])
-
- AM_LANGINFO_CODESET
- gt_LC_MESSAGES
-
- dnl Compilation on mingw and Cygwin needs special Makefile rules, because
- dnl 1. when we install a shared library, we must arrange to export
- dnl auxiliary pointer variables for every exported variable,
- dnl 2. when we install a shared library and a static library simultaneously,
- dnl the include file specifies __declspec(dllimport) and therefore we
- dnl must arrange to define the auxiliary pointer variables for the
- dnl exported variables _also_ in the static library.
- if test "$enable_shared" = yes; then
- case "$host_os" in
- cygwin*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
- is_woe32dll=no
- fi
- WOE32DLL=$is_woe32dll
- AC_SUBST([WOE32DLL])
-
- dnl Rename some macros and functions used for locking.
- AH_BOTTOM([
-#define __libc_lock_t gl_lock_t
-#define __libc_lock_define gl_lock_define
-#define __libc_lock_define_initialized gl_lock_define_initialized
-#define __libc_lock_init gl_lock_init
-#define __libc_lock_lock gl_lock_lock
-#define __libc_lock_unlock gl_lock_unlock
-#define __libc_lock_recursive_t gl_recursive_lock_t
-#define __libc_lock_define_recursive gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive gl_recursive_lock_init
-#define __libc_lock_lock_recursive gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
-#define glthread_in_use libintl_thread_in_use
-#define glthread_lock_init libintl_lock_init
-#define glthread_lock_lock libintl_lock_lock
-#define glthread_lock_unlock libintl_lock_unlock
-#define glthread_lock_destroy libintl_lock_destroy
-#define glthread_rwlock_init libintl_rwlock_init
-#define glthread_rwlock_rdlock libintl_rwlock_rdlock
-#define glthread_rwlock_wrlock libintl_rwlock_wrlock
-#define glthread_rwlock_unlock libintl_rwlock_unlock
-#define glthread_rwlock_destroy libintl_rwlock_destroy
-#define glthread_recursive_lock_init libintl_recursive_lock_init
-#define glthread_recursive_lock_lock libintl_recursive_lock_lock
-#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
-#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
-#define glthread_once libintl_once
-#define glthread_once_call libintl_once_call
-#define glthread_once_singlethreaded libintl_once_singlethreaded
-])
-])
-
-
-dnl Checks for the core files of the intl subdirectory:
-dnl dcigettext.c
-dnl eval-plural.h
-dnl explodename.c
-dnl finddomain.c
-dnl gettextP.h
-dnl gmo.h
-dnl hash-string.h hash-string.c
-dnl l10nflist.c
-dnl libgnuintl.h.in (except the *printf stuff)
-dnl loadinfo.h
-dnl loadmsgcat.c
-dnl localealias.c
-dnl log.c
-dnl plural-exp.h plural-exp.c
-dnl plural.y
-dnl Used by libglocale.
-AC_DEFUN([gt_INTL_SUBDIR_CORE],
-[
- AC_REQUIRE([AC_C_INLINE])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([gt_INTDIV0])dnl
- AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
- AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl
- AC_REQUIRE([gt_INTTYPES_PRI])dnl
- AC_REQUIRE([gl_LOCK])dnl
-
- AC_TRY_LINK(
- [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
- [],
- [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
- [Define to 1 if the compiler understands __builtin_expect.])])
-
- AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h])
- AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
- stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
- argz_next __fsetlocking])
-
- dnl Use the *_unlocked functions only if they are declared.
- dnl (because some of them were defined without being declared in Solaris
- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
- dnl on Solaris 2.5.1 to run on Solaris 2.6).
- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
- gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
- gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-
- AM_ICONV
-
- dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
- dnl and a _NL_LOCALE_NAME macro always.
- AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
- [AC_TRY_LINK([#include <langinfo.h>
-#include <locale.h>],
- [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
- gt_cv_nl_locale_name=yes,
- gt_cv_nl_locale_name=no)
- ])
- if test $gt_cv_nl_locale_name = yes; then
- AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
- [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
- fi
-
- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
- dnl because plural.y uses bison specific features. It requires at least
- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
- dnl compile.
- dnl bison is only needed for the maintainer (who touches plural.y). But in
- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
- dnl the rule in general Makefile. Now, some people carelessly touch the
- dnl files or have a broken "make" program, hence the plural.c rule will
- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
- dnl present or too old.
- AC_CHECK_PROGS([INTLBISON], [bison])
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
- dnl Found it, now check the version.
- AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
- AC_MSG_RESULT([$ac_prog_version])
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- fi
-])
-
-
dnl Checks for special options needed on MacOS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
@@ -607,23 +400,18 @@ AC_DEFUN([gt_INTL_MACOSX],
])
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
[
- AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
- [AC_TRY_COMPILE([$2], [
-#ifndef $1
- char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
- if test $ac_cv_have_decl_$1 = yes; then
- gt_value=1
- else
- gt_value=0
- fi
- AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
- [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+ m4_divert_text([DEFAULTS], [gt_needs=])
+ m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
])
diff --git a/m4/intl.m4 b/m4/intl.m4
new file mode 100644
index 000000000..dcefb118c
--- /dev/null
+++ b/m4/intl.m4
@@ -0,0 +1,259 @@
+# intl.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
+
+AC_PREREQ(2.52)
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([gt_GLIBC2])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([gl_VISIBILITY])dnl
+ AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+ AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+ AC_REQUIRE([gt_TYPE_WINT_T])dnl
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gt_TYPE_INTMAX_T])
+ AC_REQUIRE([gt_PRINTF_POSIX])
+ AC_REQUIRE([gl_GLIBC21])dnl
+ AC_REQUIRE([gl_XSIZE])dnl
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+ AC_CHECK_TYPE([ptrdiff_t], ,
+ [AC_DEFINE([ptrdiff_t], [long],
+ [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+ ])
+ AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+ AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
+
+ dnl Use the _snprintf function only if it is declared (because on NetBSD it
+ dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+ gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+ gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+ dnl Use the *_unlocked functions only if they are declared.
+ dnl (because some of them were defined without being declared in Solaris
+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+ gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+ case $gt_cv_func_printf_posix in
+ *yes) HAVE_POSIX_PRINTF=1 ;;
+ *) HAVE_POSIX_PRINTF=0 ;;
+ esac
+ AC_SUBST([HAVE_POSIX_PRINTF])
+ if test "$ac_cv_func_asprintf" = yes; then
+ HAVE_ASPRINTF=1
+ else
+ HAVE_ASPRINTF=0
+ fi
+ AC_SUBST([HAVE_ASPRINTF])
+ if test "$ac_cv_func_snprintf" = yes; then
+ HAVE_SNPRINTF=1
+ else
+ HAVE_SNPRINTF=0
+ fi
+ AC_SUBST([HAVE_SNPRINTF])
+ if test "$ac_cv_func_wprintf" = yes; then
+ HAVE_WPRINTF=1
+ else
+ HAVE_WPRINTF=0
+ fi
+ AC_SUBST([HAVE_WPRINTF])
+
+ AM_LANGINFO_CODESET
+ gt_LC_MESSAGES
+
+ dnl Compilation on mingw and Cygwin needs special Makefile rules, because
+ dnl 1. when we install a shared library, we must arrange to export
+ dnl auxiliary pointer variables for every exported variable,
+ dnl 2. when we install a shared library and a static library simultaneously,
+ dnl the include file specifies __declspec(dllimport) and therefore we
+ dnl must arrange to define the auxiliary pointer variables for the
+ dnl exported variables _also_ in the static library.
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+ cygwin*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+ is_woe32dll=no
+ fi
+ WOE32DLL=$is_woe32dll
+ AC_SUBST([WOE32DLL])
+
+ dnl Rename some macros and functions used for locking.
+ AH_BOTTOM([
+#define __libc_lock_t gl_lock_t
+#define __libc_lock_define gl_lock_define
+#define __libc_lock_define_initialized gl_lock_define_initialized
+#define __libc_lock_init gl_lock_init
+#define __libc_lock_lock gl_lock_lock
+#define __libc_lock_unlock gl_lock_unlock
+#define __libc_lock_recursive_t gl_recursive_lock_t
+#define __libc_lock_define_recursive gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive gl_recursive_lock_init
+#define __libc_lock_lock_recursive gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
+#define glthread_in_use libintl_thread_in_use
+#define glthread_lock_init libintl_lock_init
+#define glthread_lock_lock libintl_lock_lock
+#define glthread_lock_unlock libintl_lock_unlock
+#define glthread_lock_destroy libintl_lock_destroy
+#define glthread_rwlock_init libintl_rwlock_init
+#define glthread_rwlock_rdlock libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock libintl_rwlock_wrlock
+#define glthread_rwlock_unlock libintl_rwlock_unlock
+#define glthread_rwlock_destroy libintl_rwlock_destroy
+#define glthread_recursive_lock_init libintl_recursive_lock_init
+#define glthread_recursive_lock_lock libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
+#define glthread_once libintl_once
+#define glthread_once_call libintl_once_call
+#define glthread_once_singlethreaded libintl_once_singlethreaded
+])
+])
+
+
+dnl Checks for the core files of the intl subdirectory:
+dnl dcigettext.c
+dnl eval-plural.h
+dnl explodename.c
+dnl finddomain.c
+dnl gettextP.h
+dnl gmo.h
+dnl hash-string.h hash-string.c
+dnl l10nflist.c
+dnl libgnuintl.h.in (except the *printf stuff)
+dnl loadinfo.h
+dnl loadmsgcat.c
+dnl localealias.c
+dnl log.c
+dnl plural-exp.h plural-exp.c
+dnl plural.y
+dnl Used by libglocale.
+AC_DEFUN([gt_INTL_SUBDIR_CORE],
+[
+ AC_REQUIRE([AC_C_INLINE])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
+ AC_REQUIRE([gt_INTDIV0])dnl
+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
+ AC_REQUIRE([gl_LOCK])dnl
+
+ AC_TRY_LINK(
+ [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
+ [],
+ [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
+ [Define to 1 if the compiler understands __builtin_expect.])])
+
+ AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+ AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
+ stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+ argz_next __fsetlocking])
+
+ dnl Use the *_unlocked functions only if they are declared.
+ dnl (because some of them were defined without being declared in Solaris
+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+ gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+ gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+
+ AM_ICONV
+
+ dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
+ dnl and a _NL_LOCALE_NAME macro always.
+ AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
+ [AC_TRY_LINK([#include <langinfo.h>
+#include <locale.h>],
+ [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
+ gt_cv_nl_locale_name=yes,
+ gt_cv_nl_locale_name=no)
+ ])
+ if test $gt_cv_nl_locale_name = yes; then
+ AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
+ [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
+ fi
+
+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+ dnl because plural.y uses bison specific features. It requires at least
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+ dnl compile.
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+ dnl the rule in general Makefile. Now, some people carelessly touch the
+ dnl files or have a broken "make" program, hence the plural.c rule will
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+ dnl present or too old.
+ AC_CHECK_PROGS([INTLBISON], [bison])
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
+ else
+ dnl Found it, now check the version.
+ AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ AC_MSG_RESULT([$ac_prog_version])
+ fi
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
+ fi
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+ [AC_TRY_COMPILE([$2], [
+#ifndef $1
+ char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+ if test $ac_cv_have_decl_$1 = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
new file mode 100644
index 000000000..7a28843f6
--- /dev/null
+++ b/m4/intldir.m4
@@ -0,0 +1,19 @@
+# intldir.m4 serial 1 (gettext-0.16)
+dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+AC_PREREQ(2.52)
+
+dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index d99c999fd..ce7a8a49d 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,4 +1,4 @@
-# intmax.m4 serial 2 (gettext-0.14.2)
+# intmax.m4 serial 3 (gettext-0.16)
dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -22,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
#if HAVE_INTTYPES_H_WITH_UINTMAX
#include <inttypes.h>
#endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+], [intmax_t x = -1;
+ return !x;],
+ gt_cv_c_intmax_t=yes,
+ gt_cv_c_intmax_t=no)])
if test $gt_cv_c_intmax_t = yes; then
AC_DEFINE(HAVE_INTMAX_T, 1,
[Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index ef00da742..7c7f89401 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,4 +1,4 @@
-# inttypes-pri.m4 serial 2 (gettext-0.15)
+# inttypes-pri.m4 serial 4 (gettext-0.16)
dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,13 +6,15 @@ dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
+AC_PREREQ(2.52)
+
# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
# macros to non-string values. This is the case on AIX 4.3.3.
AC_DEFUN([gt_INTTYPES_PRI],
[
- AC_REQUIRE([gl_HEADER_INTTYPES_H])
- if test $gl_cv_header_inttypes_h = yes; then
+ AC_CHECK_HEADERS([inttypes.h])
+ if test $ac_cv_header_inttypes_h = yes; then
AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
gt_cv_inttypes_pri_broken,
[
@@ -26,5 +28,9 @@ char *p = PRId32;
if test "$gt_cv_inttypes_pri_broken" = yes; then
AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
[Define if <inttypes.h> exists and defines unusable PRI* macros.])
+ PRI_MACROS_BROKEN=1
+ else
+ PRI_MACROS_BROKEN=0
fi
+ AC_SUBST([PRI_MACROS_BROKEN])
])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index a5d075d96..edc8ecb2d 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
-# inttypes_h.m4 serial 6
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
[AC_TRY_COMPILE(
[#include <sys/types.h>
#include <inttypes.h>],
- [uintmax_t i = (uintmax_t) -1;],
+ [uintmax_t i = (uintmax_t) -1; return !i;],
gl_cv_header_inttypes_h=yes,
gl_cv_header_inttypes_h=no)])
if test $gl_cv_header_inttypes_h = yes; then
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 92929193f..f95b7ba88 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 8 (gettext-0.15)
+# lib-link.m4 serial 9 (gettext-0.16)
dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -198,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_so="$additional_libdir/lib$name.$shlibext"
+ else
+ found_so="$additional_libdir/lib$name.dll.a"
+ fi
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -220,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.$shlibext"; then
+ found_so="$dir/lib$name.$shlibext"
+ else
+ found_so="$dir/lib$name.dll.a"
+ fi
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
fi
diff --git a/m4/lock.m4 b/m4/lock.m4
index d1ea1ca83..0224f2ff8 100644
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,5 +1,5 @@
-# lock.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# lock.m4 serial 6 (gettext-0.16)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -19,14 +19,14 @@ dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
dnl multithread-safe programs.
-AC_DEFUN([gl_LOCK],
+AC_DEFUN([gl_LOCK_EARLY],
[
- AC_REQUIRE([gl_LOCK_BODY])
+ AC_REQUIRE([gl_LOCK_EARLY_BODY])
])
-dnl The guts of gl_LOCK. Needs to be expanded only once.
+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
-AC_DEFUN([gl_LOCK_BODY],
+AC_DEFUN([gl_LOCK_EARLY_BODY],
[
dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
dnl influences the result of the autoconf tests that test for *_unlocked
@@ -40,7 +40,43 @@ AC_DEFUN([gl_LOCK_BODY],
AC_ARG_ENABLE(threads,
AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
AC_HELP_STRING([--disable-threads], [build without multithread safety]),
- gl_use_threads=$enableval, gl_use_threads=yes)
+ [gl_use_threads=$enableval],
+ [case "$host_os" in
+ dnl Disable multithreading by default on OSF/1, because it interferes
+ dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
+ dnl process gets an endless segmentation fault inside execvp().
+ osf*) gl_use_threads=no ;;
+ *) gl_use_threads=yes ;;
+ esac
+ ])
+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+ # For using <pthread.h>:
+ case "$host_os" in
+ osf*)
+ # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+ # groks <pthread.h>. cc also understands the flag -pthread, but
+ # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+ # 2. putting a flag into CPPFLAGS that has an effect on the linker
+ # causes the AC_TRY_LINK test below to succeed unexpectedly,
+ # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+ CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ ;;
+ esac
+ # Some systems optimize for single-threaded programs by default, and
+ # need special flags to disable these optimizations. For example, the
+ # definition of 'errno' in <errno.h>.
+ case "$host_os" in
+ aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+ solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+ esac
+ fi
+])
+
+dnl The guts of gl_LOCK. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_BODY],
+[
+ AC_REQUIRE([gl_LOCK_EARLY_BODY])
gl_threads_api=none
LIBTHREAD=
LTLIBTHREAD=
@@ -55,26 +91,12 @@ AC_HELP_STRING([--disable-threads], [build without multithread safety]),
AC_MSG_RESULT([$gl_have_weak])
if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
# On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
- # it groks <pthread.h>.
- gl_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no)
- CPPFLAGS="$gl_save_CPPFLAGS"
if test "$gl_have_pthread_h" = yes; then
# Other possible tests:
# -lpthreads (FSU threads, PCthreads)
# -lgthreads
- case "$host_os" in
- osf*)
- # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
- # groks <pthread.h>. cc also understands the flag -pthread, but
- # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
- # 2. putting a flag into CPPFLAGS that has an effect on the linker
- # causes the AC_TRY_LINK test below to succeed unexpectedly,
- # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- ;;
- esac
gl_have_pthread=
# Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
# in libc. IRIX 6.5 has the first one in both libc and libpthread, but
@@ -139,16 +161,10 @@ AC_HELP_STRING([--disable-threads], [build without multithread safety]),
error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
#else
int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
#endif],
[AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
[Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
- # Some systems optimize for single-threaded programs by default, and
- # need special flags to disable these optimizations. For example, the
- # definition of 'errno' in <errno.h>.
- case "$host_os" in
- aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
- solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
- esac
fi
fi
fi
@@ -227,6 +243,12 @@ int x = (int)PTHREAD_MUTEX_RECURSIVE;
AC_SUBST(LTLIBTHREAD)
AC_SUBST(LIBMULTITHREAD)
AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+ AC_REQUIRE([gl_LOCK_EARLY])
+ AC_REQUIRE([gl_LOCK_BODY])
gl_PREREQ_LOCK
])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 7b399e012..3716c09f6 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,21 +1,46 @@
-# longlong.m4 serial 5
-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+# longlong.m4 serial 8
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
-# Define HAVE_LONG_LONG if 'long long' works.
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+ AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[long long int ll = 9223372036854775807ll;
+ long long int nll = -9223372036854775807LL;
+ typedef int a[((-9223372036854775807LL < 0
+ && 0 < 9223372036854775807ll)
+ ? 1 : -1)];
+ int i = 63;]],
+ [[long long int llmax = 9223372036854775807ll;
+ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+ | (llmax / ll) | (llmax % ll));]])],
+ [ac_cv_type_long_long_int=yes],
+ [ac_cv_type_long_long_int=no])])
+ if test $ac_cv_type_long_long_int = yes; then
+ AC_DEFINE([HAVE_LONG_LONG_INT], 1,
+ [Define to 1 if the system has the type `long long int'.])
+ fi
+])
+
+# This macro is obsolescent and should go away soon.
AC_DEFUN([gl_AC_TYPE_LONG_LONG],
[
- AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
- [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
- [long long llmax = (long long) -1;
- return ll << i | ll >> i | llmax / ll | llmax % ll;],
- ac_cv_type_long_long=yes,
- ac_cv_type_long_long=no)])
+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+ ac_cv_type_long_long=$ac_cv_type_long_long_int
if test $ac_cv_type_long_long = yes; then
AC_DEFINE(HAVE_LONG_LONG, 1,
[Define if you have the 'long long' type.])
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 029e47195..bfba811eb 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,4 +1,4 @@
-# size_max.m4 serial 4
+# size_max.m4 serial 5
dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -11,8 +11,9 @@ AC_DEFUN([gl_SIZE_MAX],
AC_CHECK_HEADERS(stdint.h)
dnl First test whether the system already has SIZE_MAX.
AC_MSG_CHECKING([for SIZE_MAX])
- result=
- AC_EGREP_CPP([Found it], [
+ AC_CACHE_VAL([gl_cv_size_max], [
+ gl_cv_size_max=
+ AC_EGREP_CPP([Found it], [
#include <limits.h>
#if HAVE_STDINT_H
#include <stdint.h>
@@ -20,41 +21,42 @@ AC_DEFUN([gl_SIZE_MAX],
#ifdef SIZE_MAX
Found it
#endif
-], result=yes)
- if test -z "$result"; then
- dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
- dnl than the type 'unsigned long'. Try hard to find a definition that can
- dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
- _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
- [#include <stddef.h>
+], gl_cv_size_max=yes)
+ if test -z "$gl_cv_size_max"; then
+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+ dnl than the type 'unsigned long'. Try hard to find a definition that can
+ dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
+ _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
+ [#include <stddef.h>
#include <limits.h>], size_t_bits_minus_1=)
- _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
- [#include <stddef.h>], fits_in_uint=)
- if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
- if test $fits_in_uint = 1; then
- dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
- dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
- AC_TRY_COMPILE([#include <stddef.h>
- extern size_t foo;
- extern unsigned long foo;
- ], [], fits_in_uint=0)
- fi
- dnl We cannot use 'expr' to simplify this expression, because 'expr'
- dnl works only with 'long' integers in the host environment, while we
- dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
- if test $fits_in_uint = 1; then
- result="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+ _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+ [#include <stddef.h>], fits_in_uint=)
+ if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
+ if test $fits_in_uint = 1; then
+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+ AC_TRY_COMPILE([#include <stddef.h>
+ extern size_t foo;
+ extern unsigned long foo;
+ ], [], fits_in_uint=0)
+ fi
+ dnl We cannot use 'expr' to simplify this expression, because 'expr'
+ dnl works only with 'long' integers in the host environment, while we
+ dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
+ if test $fits_in_uint = 1; then
+ gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+ else
+ gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+ fi
else
- result="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+ dnl Shouldn't happen, but who knows...
+ gl_cv_size_max='((size_t)~(size_t)0)'
fi
- else
- dnl Shouldn't happen, but who knows...
- result='((size_t)~(size_t)0)'
fi
- fi
- AC_MSG_RESULT([$result])
- if test "$result" != yes; then
- AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+ ])
+ AC_MSG_RESULT([$gl_cv_size_max])
+ if test "$gl_cv_size_max" != yes; then
+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
[Define as the maximum value of type 'size_t', if the system doesn't define it.])
fi
])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 3355f35aa..db9a8ac4c 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
-# stdint_h.m4 serial 5
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# stdint_h.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_STDINT_H],
[AC_TRY_COMPILE(
[#include <sys/types.h>
#include <stdint.h>],
- [uintmax_t i = (uintmax_t) -1;],
+ [uintmax_t i = (uintmax_t) -1; return !i;],
gl_cv_header_stdint_h=yes,
gl_cv_header_stdint_h=no)])
if test $gl_cv_header_stdint_h = yes; then
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index dee10ccc3..9fae98e3a 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,21 +1,46 @@
-# ulonglong.m4 serial 4
-dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+# ulonglong.m4 serial 6
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+ AC_CACHE_CHECK([for unsigned long long int],
+ [ac_cv_type_unsigned_long_long_int],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[unsigned long long int ull = 18446744073709551615ULL;
+ typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
+ ? 1 : -1)];
+ int i = 63;]],
+ [[unsigned long long int ullmax = 18446744073709551615ull;
+ return (ull << 63 | ull >> 63 | ull << i | ull >> i
+ | ullmax / ull | ullmax % ull);]])],
+ [ac_cv_type_unsigned_long_long_int=yes],
+ [ac_cv_type_unsigned_long_long_int=no])])
+ if test $ac_cv_type_unsigned_long_long_int = yes; then
+ AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
+ [Define to 1 if the system has the type `unsigned long long int'.])
+ fi
+])
+
+# This macro is obsolescent and should go away soon.
AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
[
- AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
- [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
- [unsigned long long ullmax = (unsigned long long) -1;
- return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
- ac_cv_type_unsigned_long_long=yes,
- ac_cv_type_unsigned_long_long=no)])
+ AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+ ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
if test $ac_cv_type_unsigned_long_long = yes; then
AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
[Define if you have the 'unsigned long long' type.])
diff --git a/po/ChangeLog b/po/ChangeLog
index d72c927b7..3ec5cca53 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 gettextize <bug-gnu-gettext@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.16.1.
+
2007-02-26 Werner Koch <wk@g10code.com>
* sv.po: Update from Daniel.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 2ed49e62d..5022b8b18 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -8,7 +8,7 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.15
+# Origin: gettext-0.16
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -30,7 +30,17 @@ gettextsrcdir = $(datadir)/gettext/po
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@
GMSGFMT_ = @GMSGFMT@
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644
index 000000000..32692ab4b
--- /dev/null
+++ b/po/Makevars.template
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/be.po b/po/be.po
index 72c2d5cbc..662e81683 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -88,8 +88,8 @@ msgstr ""
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
@@ -188,13 +188,13 @@ msgstr ""
"УвÑдзіце новы пароль Ð´Ð»Ñ Ð³Ñтага ÑакрÑтнага ключа.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "УвÑдзіце пароль\n"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "Паўтарыце пароль\n"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -223,13 +223,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "шматÑлоўнаÑьць"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "працаваць менш шматÑлоўна"
@@ -241,7 +241,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr ""
@@ -253,8 +253,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr ""
@@ -308,9 +308,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Калі лаÑка, паведамлÑйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
@@ -326,137 +326,126 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: Ñ‚Ñчка Ñтворана\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, c-format
msgid "%s %s stopped\n"
msgstr ""
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr ""
@@ -472,48 +461,48 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "ВыкарыÑтаньне: gpg [выбары] [файлы] (-h Ð´Ð»Ñ Ð´Ð°Ð²ÐµÐ´ÐºÑ–)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "дрÑнны пароль"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr ""
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "ÑкаÑавана карыÑтальнікам\n"
@@ -553,7 +542,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -566,7 +555,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -576,7 +565,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -588,19 +577,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "yes [так]"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -644,12 +633,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n"
@@ -741,6 +730,16 @@ msgstr ""
msgid "cC"
msgstr ""
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1159,13 +1158,13 @@ msgstr ""
msgid "can't open `%s'\n"
msgstr "немагчыма адкрыць \"%s\"\n"
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1430,22 +1429,22 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: g10/getkey.c:2668
+#: g10/getkey.c:2671
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr ""
-#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1461,27 +1460,27 @@ msgstr "|[файл]|зрабіць подпіÑ"
msgid "|[file]|make a clear text signature"
msgstr "|[файл]|зрабіць чыÑÑ‚Ñ‹ Ñ‚ÑкÑтавы подпіÑ"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "зрабіць адчÑплены подпіÑ"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "зашыфраваць даньні"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "шыфраваньне толькі ÑымÑтрычнымі шыфрамі"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "разшыфраваць даньні (дапомна)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "праверыць подпіÑ"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž"
@@ -1494,11 +1493,11 @@ msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў"
msgid "list and check key signatures"
msgstr "праверыць подпіÑÑ‹ ключа"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "паказаць ÑакрÑÑ‚Ð½Ñ‹Ñ ÐºÐ»ÑŽÑ‡Ñ‹"
@@ -1534,11 +1533,11 @@ msgstr ""
msgid "export keys"
msgstr "ÑкÑпарт ключоў"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "ÑкÑпартаваць ключы на паÑлужнік ключоў"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "імпартаваць ключы з паÑлужніка ключоў"
@@ -1574,12 +1573,12 @@ msgstr ""
msgid "|algo [files]|print message digests"
msgstr ""
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1589,31 +1588,31 @@ msgstr ""
"Выбары:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr ""
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|ІМЯ| зашыфраваць Ð´Ð»Ñ Ð²Ñ‹Ð»ÑƒÑ‡Ð°Ð½Ð°Ð¹ аÑобы"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr ""
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr ""
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr ""
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "выкарыÑтоўваць у ÑкаÑьці файла вываду"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "не рабіць ніÑкіх зьменаў"
@@ -1629,7 +1628,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1637,7 +1636,7 @@ msgstr ""
"@\n"
"(ГлÑдзіце man Ñтаронку, Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ поўнага апіÑÐ°Ð½ÑŒÐ½Ñ ÑžÑÑ–Ñ… загадаў Ñ– выбараў)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1675,7 +1674,7 @@ msgstr ""
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеÑньне залежыць ад уваходных даньнÑÑž\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1703,7 +1702,7 @@ msgstr ""
msgid "usage: gpg [options] "
msgstr "ВыкарыÑтаньне: gpg [выбары] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n"
@@ -1823,6 +1822,11 @@ msgstr ""
msgid "show expiration dates during signature listings"
msgstr ""
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1961,7 +1965,7 @@ msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаванÑ
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr ""
@@ -2001,11 +2005,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr ""
@@ -2236,7 +2240,7 @@ msgstr "выдаліць ключы Ñа зьвÑзку грамадÑкіх кÐ
msgid "make timestamp conflicts only a warning"
msgstr ""
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr ""
@@ -3626,7 +3630,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°"
@@ -3643,7 +3647,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr "збой падпіÑаньнÑ: %s\n"
@@ -3677,12 +3681,12 @@ msgid ""
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr ""
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr ""
@@ -4494,180 +4498,180 @@ msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў"
msgid "%s: keyring created\n"
msgstr "%s: Ñтвораны зьвÑзак ключоў\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr ""
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "ÑкÑпартаваць ключы на паÑлужнік ключоў"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "імпартаваць ключы з паÑлужніка ключоў"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr ""
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "імпартаваць ключы з паÑлужніка ключоў"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr ""
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr ""
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "Ð°Ð³ÑƒÐ»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr ""
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr ""
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -5014,16 +5018,16 @@ msgstr ""
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr ""
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -5596,7 +5600,7 @@ msgstr ""
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6137,7 +6141,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
@@ -6361,7 +6365,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
msgid "read options from file"
msgstr ""
@@ -6403,21 +6407,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr ""
@@ -6440,178 +6444,184 @@ msgstr ""
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr ""
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "ÑакрÑтны ключ недаÑтупны"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
msgid "certificate has been revoked"
msgstr ""
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "дрÑнны ÑÑртыфікат"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Даведка адÑутнічае"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
msgid "no issuer found in certificate"
msgstr ""
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "ГÑÑ‚Ñ‹ ключ згубіў ÑаÑтарÑÑž!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "праверыць подпіÑ"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA патрабуе выкарыÑÑ‚Ð°Ð½ÑŒÐ½Ñ 160-Ñ– бітавага Ñ…Ñш-альгарытму\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no [не]"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6626,7 +6636,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
@@ -6713,7 +6723,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
@@ -6737,196 +6747,196 @@ msgstr "збой падпіÑаньнÑ: %s\n"
msgid "no valid recipients given\n"
msgstr ""
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[файл]|зрабіць подпіÑ"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[файл]|зрабіць чыÑÑ‚Ñ‹ Ñ‚ÑкÑтавы подпіÑ"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "паказаць ÑакрÑÑ‚Ð½Ñ‹Ñ ÐºÐ»ÑŽÑ‡Ñ‹"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "дрÑнны ÑÑртыфікат"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "выдаліць ключы Ñа зьвÑзку грамадÑкіх ключоў"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "дрÑнны ÑÑртыфікат"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "дрÑнны ÑÑртыфікат"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "дрÑнны пароль"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
msgid "create base-64 encoded output"
msgstr ""
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
#, fuzzy
msgid "|NAME|use NAME as default recipient"
msgstr "|ÐÐЗВÐ| задаць назву дапомнага ÑакрÑтнага ключа"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr ""
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "праверыць подпіÑÑ‹ ключа"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "заўÑёдвы выкарыÑтоўваць MDC Ð´Ð»Ñ ÑˆÑ‹Ñ„Ñ€Ð°Ð²Ð°Ð½ÑŒÐ½Ñ"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "выдаліць ключы Ñа зьвÑзку грамадÑкіх ключоў"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr ""
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|ÐÐЗВÐ| задаць назву дапомнага ÑакрÑтнага ключа"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ВУЗЕЛ| выкарыÑтоўваць гÑÑ‚Ñ‹ паÑлужнік Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ ключоў"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|ÐÐЗВÐ| уÑталÑваць мноÑтва знакаў Ñ‚Ñрмінала"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ІМЯ| зашыфраваць Ð´Ð»Ñ Ð²Ñ‹Ð»ÑƒÑ‡Ð°Ð½Ð°Ð¹ аÑобы"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "невÑдомы альгарытм ÑьціÑканьнÑ"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "ВыкарыÑтаньне: gpg [выбары] [файлы] (-h Ð´Ð»Ñ Ð´Ð°Ð²ÐµÐ´ÐºÑ–)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -6937,44 +6947,39 @@ msgstr ""
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеÑньне залежыць ад уваходных даньнÑÑž\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "ВыкарыÑтаньне: gpg [выбары] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
msgid "key generation is not available from the commandline\n"
msgstr ""
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n"
@@ -6984,20 +6989,20 @@ msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам пÐ
msgid "total number processed: %lu\n"
msgstr ""
-#: sm/import.c:227
+#: sm/import.c:228
msgid "error storing certificate\n"
msgstr ""
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7016,12 +7021,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "%s: Ñ‚Ñчка Ñтворана\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n"
@@ -7041,17 +7046,17 @@ msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
msgid "error storing certificate: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
@@ -7123,103 +7128,107 @@ msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n"
msgid " aka"
msgstr ""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit [выйÑьці]"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "ВыкарыÑтаньне: gpg [выбары] [файлы] (-h Ð´Ð»Ñ Ð´Ð°Ð²ÐµÐ´ÐºÑ–)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "пароль занадта доўгі\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7247,31 +7256,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7335,7 +7348,7 @@ msgstr "ÑакрÑтны ключ недаÑтупны"
msgid "error allocating enough memory: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7345,164 +7358,167 @@ msgstr ""
"@Загады:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
msgid "decryption modus"
msgstr ""
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "зашыфраваць даньні"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [назва_файла]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "ВыкарыÑтаньне: gpg [выбары] [файлы] (-h Ð´Ð»Ñ Ð´Ð°Ð²ÐµÐ´ÐºÑ–)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s не дазвалÑецца разам з %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr ""
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "збой падпіÑаньнÑ: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "непадтрымліваецца"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA патрабуе выкарыÑÑ‚Ð°Ð½ÑŒÐ½Ñ 160-Ñ– бітавага Ñ…Ñш-альгарытму\n"
+
#~ msgid "Enter passphrase: "
#~ msgstr "УвÑдзіце пароль: "
diff --git a/po/ca.po b/po/ca.po
index c7cd2a3fc..0eb7bc7a1 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -110,8 +110,8 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -213,13 +213,13 @@ msgstr ""
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "canvia la contrasenya"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "canvia la contrasenya"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -249,13 +249,13 @@ msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detall"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
@@ -267,7 +267,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
@@ -280,8 +280,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca claus en un servidor de claus"
@@ -338,9 +338,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
@@ -356,138 +356,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "error en crear «%s»: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "no es pot crear el directori «%s»: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: s'ha creat el directori\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, 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:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, 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"
@@ -503,51 +492,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "la contrasenya és errònia"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Cancel·la"
@@ -588,7 +577,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -601,7 +590,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -611,7 +600,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -623,19 +612,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "sí|si"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -679,12 +668,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "error en crear «%s»: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: no s'ha trobat l'usuari\n"
@@ -781,6 +770,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1218,13 +1217,13 @@ msgstr "--output no funciona per a aquesta ordre\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1518,23 +1517,23 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1550,27 +1549,27 @@ msgstr "|[fitxer]|crea una signatura"
msgid "|[file]|make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "crea una signatura separada"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "xifra dades"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verifica una signatura"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "llista claus"
@@ -1585,11 +1584,11 @@ msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "llista claus secretes"
@@ -1625,11 +1624,11 @@ msgstr "genera un certificat de revocació"
msgid "export keys"
msgstr "exporta claus"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exporta claus a un servidor de claus"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importa claus d'un servidor de claus"
@@ -1665,12 +1664,12 @@ msgstr "actualitza la base de dades de confiança"
msgid "|algo [files]|print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1680,31 +1679,31 @@ msgstr ""
"Opcions:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|xifra per a NOM"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "fitxer d'eixida"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "no fa cap canvi"
@@ -1720,7 +1719,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1731,7 +1730,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1774,7 +1773,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1802,7 +1801,7 @@ msgstr "Compressió: "
msgid "usage: gpg [options] "
msgstr "forma d'ús: gpg [opcions] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
@@ -1929,6 +1928,11 @@ msgstr "mostra en quin anell de claus està una clau llistada"
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2070,7 +2074,7 @@ msgstr "%s:%d opcions d'exportació no vàlides\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "AVÃS: el programa podria crear un fitxer core!\n"
@@ -2115,11 +2119,11 @@ msgstr ""
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
@@ -2355,7 +2359,7 @@ msgstr "pren les claus d'aquest anell"
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:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informació d'estat en aquest FD"
@@ -3957,7 +3961,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "no s'ha pogut creat %s: %s\n"
@@ -3974,7 +3978,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
@@ -4010,13 +4014,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4915,186 +4919,186 @@ msgstr "s'han comprovat %lu claus (%lu signatures)\n"
msgid "%s: keyring created\n"
msgstr "%s: s'ha creat l'anell\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, 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:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, 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:1388
+#: g10/keyserver.c:1395
#, 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:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "error de servidor de claus"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
# «del servidor», «en el servidor»? ivb
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "error de servidor de claus"
# «del servidor», «en el servidor»? ivb
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "error de servidor de claus"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: no és un ID vàlid\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, 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"
@@ -5455,17 +5459,17 @@ 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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, 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"
@@ -6100,7 +6104,7 @@ 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
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6696,7 +6700,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "no es pot obrir el fitxer: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -6921,7 +6925,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "s'estan llegint opcions de «%s»\n"
@@ -6965,21 +6969,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
@@ -7003,184 +7007,190 @@ msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, 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:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTA: aquesta clau ha estat revocada!"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Certificat correcte"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "La clau és disponible en: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Certificat correcte"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problema en la lectura del certificat: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
#, fuzzy
msgid "certificate not yet valid"
msgstr "Certificat de revocació vàlid"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "problema en la lectura del certificat: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
"No s'han trobat certificats amb confiança no definida.\n"
"\n"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Empremta digital:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
#, 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:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Certificat de revocació vàlid"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
#, fuzzy
msgid "issuer certificate not found"
msgstr "Certificat de revocació vàlid"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifica una signatura"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[no establert]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "error: l'empremta digital és invàlida\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "error: l'empremta digital és invàlida\n"
@@ -7196,7 +7206,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:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7211,7 +7221,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, 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"
@@ -7298,7 +7308,7 @@ msgstr ""
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:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -7323,192 +7333,192 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
msgid "no valid recipients given\n"
msgstr "(No es va donar una descripció)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, 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:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[fitxer]|crea una signatura"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "llista claus secretes"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "Certificat de revocació vàlid"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "elimina claus de l'anell públic"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Certificat correcte"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Certificat correcte"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea eixida amb armadura ascii"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOM|usa NOM com a destinatari predeterminat"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "usa la clau predeterminada com a destinatari predeterminat"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "no usa el terminal en absolut"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "força signatures v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "sempre utilitza un MDC per a xifrar"
# Mode desatès (SC) ivb
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "mode desatès: no pregunta mai"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "suposa «sí» en la majoria de les preguntes"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "suposa «no» en la majoria de les preguntes"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "afegeix aquest anell a la llista"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "afegeix aquest anell secret a la llista"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|usa aquest servidor per a cercar claus"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOM|el joc de caràcters serà NOM"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|usa l'algoritme de xifratge NOM"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|usa l'algoritme de compressió N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, 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:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7519,46 +7529,41 @@ msgstr ""
"signa, comprova, xifra o desxifra\n"
"l'operació predeterminada depén de les dades introduïdes\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "forma d'ús: gpg [opcions] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
# No em passe! ;) ivb
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
@@ -7568,21 +7573,21 @@ msgstr "Seleccioneu quin tipus de clau voleu:\n"
msgid "total number processed: %lu\n"
msgstr "Nombre total processat: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Certificat correcte"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@ -7601,12 +7606,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "s'ha creat l'anell «%s»\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@ -7626,17 +7631,17 @@ msgstr "error en la creació de la contrasenya: %s\n"
msgid "error storing certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, 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:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "error en crear «%s»: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@ -7709,103 +7714,107 @@ msgstr "Signatura correcta de \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "ix"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "la línia és massa llarga\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, 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:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7833,31 +7842,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, 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:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7920,7 +7934,7 @@ msgstr ""
msgid "error allocating enough memory: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7930,167 +7944,170 @@ msgstr ""
"@Ordres:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "desxifratge correcte\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "desxifratge correcte\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nom_del_fitxer]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s no és permés amb %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, 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:346
+#: tools/symcryptrun.c:327
#, 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:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, 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:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "no hi ha suport per a l'execució remota de programes\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: no s'ha trobat l'usuari: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "%s: no s'ha creat l'anell: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8556,9 +8573,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
#~ msgstr ""
#~ "|NOM|usa l'algoritme de resum de missatges NOM per a les contrasenyes"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
-
# elimina o descarta? jm
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "descarta el camp keyid dels paquets xifrats"
diff --git a/po/cs.po b/po/cs.po
index de4553183..7a0183559 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <rp@tns.cz>\n"
"Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -90,8 +90,8 @@ msgstr "nemohu vytvoøit `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemohu otevøít `%s': %s\n"
@@ -190,13 +190,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "zmìnit heslo"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "zmìnit heslo"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -225,13 +225,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "s dodateènými informacemi"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "být o trochu víc tichý"
@@ -243,7 +243,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "ètu mo¾nosti z `%s'\n"
@@ -256,8 +256,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "vyhledat klíèe na serveru klíèù"
@@ -313,9 +313,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
@@ -333,138 +333,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s mo¾nostmi `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "ètu mo¾nosti z `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "chyba pøi vytváøení `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nemohu vytvoøit adresáø `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nemohu vytvoøit `%s': %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, 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:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisuji tajný klíè do `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "adresáø `%s' vytvoøen\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) selhal v %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "nemohu vytvoøit adresáø `%s': %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualizace tajného klíèe selhala: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: pøeskoèeno: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent není v tomto sezení dostupný\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "¹patný formát promìnné prostøedí GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protokol verze %d není podporován\n"
@@ -480,51 +469,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "¹patné heslo"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "zru¹eno"
@@ -564,7 +553,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "chyba pøi ètení `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -577,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -587,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -599,19 +588,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "ano"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -655,12 +644,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "chyba pøi ètení `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "chyba pøi vytváøení `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[ID u¾ivatele nenalezeno]"
@@ -753,6 +742,16 @@ msgstr "oO"
msgid "cC"
msgstr "zZ"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1157,13 +1156,13 @@ msgstr "--output pro tento pøíkaz není platný\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1437,22 +1436,22 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1468,27 +1467,27 @@ msgstr "|[soubor]|vytvoøit podpis"
msgid "|[file]|make a clear text signature"
msgstr "|[soubor]|vytvoøit podpis v èitelném dokumentu"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "vytvoøit podpis oddìlený od dokumentu"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "¹ifrovat data"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "¹ifrování pouze se symetrickou ¹ifrou"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "de¹ifrovat data (implicitnì)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verifikovat podpis"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "vypsat seznam klíèù"
@@ -1500,11 +1499,11 @@ msgstr "vypsat seznam klíèù a podpisù"
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíèù"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíèù a fingerprintù"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "vypsat seznam tajných klíèù"
@@ -1540,11 +1539,11 @@ msgstr "vytvoøit revokaèní certifikát"
msgid "export keys"
msgstr "exportovat klíèe"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportovat klíèe na server klíèù"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importovat klíèe ze serveru klíèù"
@@ -1580,12 +1579,12 @@ msgstr "aktualizovat databázi dùvìry"
msgid "|algo [files]|print message digests"
msgstr "|algo [soubory] vypi¹ hash"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1595,35 +1594,35 @@ msgstr ""
"Mo¾nosti:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "vytvoø výstup zakódovaný pomocí ASCII"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|JMÉNO|¹ifrovat pro JMÉNO"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "pou¾ít kanonický textový mód"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "pou¾ít jako výstupní soubor"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "neprovádìt ¾ádné zmìny"
@@ -1639,7 +1638,7 @@ msgstr "pou¾ít chování striktnì podle OpenPGP"
msgid "generate PGP 2.x compatible messages"
msgstr "generovat zprávu komplatibilní s PGP 2.x"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1647,7 +1646,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1685,7 +1684,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1713,7 +1712,7 @@ msgstr "Komprese: "
msgid "usage: gpg [options] "
msgstr "u¾ití: gpg [mo¾nosti]"
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "konfliktní pøíkazy\n"
@@ -1856,6 +1855,11 @@ msgstr "pøepnout mezi vypisem seznamu tajných a veøejných klíèù"
msgid "show expiration dates during signature listings"
msgstr "V souboru tajných klíèù chybí odpovídající podpis\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1994,7 +1998,7 @@ msgstr "%s:%d: neplatný parametr pro ovìøení\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n"
@@ -2036,11 +2040,11 @@ msgstr "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný ¹ifrovací algoritmus je neplatný\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
@@ -2273,7 +2277,7 @@ msgstr "ber klíèe z této klíèenky (keyringu)"
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:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
@@ -3791,7 +3795,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "vytvoøen: %s"
@@ -3808,7 +3812,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "platnost skonèí: %s"
@@ -3844,12 +3848,12 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "revokován"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "platnost skonèila"
@@ -4705,177 +4709,177 @@ msgstr "%lu klíèù ulo¾eno v cache (%lu podpisù)\n"
msgid "%s: keyring created\n"
msgstr "%s: soubor klíèù (keyring) vytvoøen\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "Vlo¾te URL preferovaného keyserveru: "
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "disabled"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> "
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klíè \"%s\" nebyl na serveru klíèù nalezen\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "klíè nebyl na serveru klíèù nalezen\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "po¾aduji klíè %s ze %s server %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "po¾aduji klíè %s z %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "vyhledávám \"%s\" na serveru %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "posílám klíè %s na %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "vyhledávám \"%s\" na %s serveru %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "vyhledávám \"%s\" na serveru %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "¾ádná operace se serverem klíèù!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "server klíèù neposlal VERSION\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "protokol serveru klíèù `%s' není podporován\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s nepodporuje protokol verze %d\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "èasový limit pro server klíèù vypr¹el\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "interní chyba serveru klíèù\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "chyba komunikace se serverem klíèù: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" není ID klíèe: pøeskoèeno\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "aktualizuji 1 klíè z %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "aktualizuji %d klíèù z %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n"
@@ -5225,16 +5229,16 @@ msgstr "vytvoøen nový konfiguraèní soubor `%s'\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d má nastavený kritický bit\n"
@@ -5832,7 +5836,7 @@ msgstr ""
"nemohu se vyvarovat slabého klíèe pro symetrickou ¹ifru; operaci jsem zkusil "
"%d krát!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6399,7 +6403,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "podepsání selhalo: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "pøejmenování `%s' na `%s' se nezdaøilo: %s\n"
@@ -6624,7 +6628,7 @@ msgstr "pøístup na %s se nezdaøil - vadná OpenPGP karta?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "ètu mo¾nosti z `%s'\n"
@@ -6665,21 +6669,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "neplatný radix64 znak %02X byl pøeskoèen\n"
@@ -6703,180 +6707,186 @@ msgstr "gpg-agent protokol verze %d není podporován\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agent protokol verze %d není podporován\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "Nemohu otevøít `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "exportování tajného klíèe není povoleno\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "nelze ulo¾it klíè: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "POZNÁMKA: klíè byl revokován"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "¹patný certifikát"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Klíè k dispozici na: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "kontrola vytvoøeného podpisu se nepodaøila: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "vytvoøit revokaèní certifikát"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Platnost klíèe vypr¹ela!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA fingerprint: "
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifikovat podpis"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA po¾aduje pou¾ití 160-ti bitového hashovacího algoritmu\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "ne"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[není nastaven]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Chyba: neplatná odpovìï.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Chyba: neplatná odpovìï.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6891,7 +6901,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, 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"
@@ -6978,7 +6988,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "tajný klíè \"%s\" nenalezen: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "chyba pøi ètení bloku klíèe: %s\n"
@@ -7003,200 +7013,200 @@ msgstr "smazání bloku klíèe se nezdaøilo: %s\n"
msgid "no valid recipients given\n"
msgstr "(Nebyl zadán ®ádný popis)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "chyba pøi vytváøení hesla: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, 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:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[soubor]|vytvoøit podpis"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[soubor]|vytvoøit podpis v èitelném dokumentu"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "vypsat seznam tajných klíèù"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "¹patný certifikát"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "odstranit klíè ze souboru veøejných klíèù"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "¹patný certifikát"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "¹patný certifikát"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "pøidat klíè na kartu"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "zmìnit heslo"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "vytvoø výstup zakódovaný pomocí ASCII"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
#, 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:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "kontrolovat podpisy"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "ber klíèe z této klíèenky (keyringu)"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "Pro provedení této operace je potøeba tajný klíè.\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|JMÉNO|¹ifrovat pro JMÉNO"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "neznámý ¹ifrovací algoritmus"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "podpis %s, hashovací algoritmus %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "neznámý komprimaèní algoritmus"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7207,45 +7217,40 @@ msgstr ""
"podepsat, ovìøit, ¹ifrovat nebo de¹ifrovat\n"
"implicitní operace závisí na vstupních datech\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "u¾ití: gpg [mo¾nosti]"
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "nemohu se pøipojit k `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nemohu otevøít `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent není v tomto sezení dostupný\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7255,21 +7260,21 @@ msgstr "Prosím, vyberte druh klíèe, který chcete generovat:\n"
msgid "total number processed: %lu\n"
msgstr "Celkový poèet zpracovaných klíèù: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "vytvoøit revokaèní certifikát"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "chyba pøi vytváøení hesla: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "chyba pøi ètení `%s': %s\n"
@@ -7288,12 +7293,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "soubor klíèù (keyring) `%s' vytvoøen\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "ulo¾ení fingerprintu se nezdaøilo: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "nelze ulo¾it klíè: %s\n"
@@ -7313,17 +7318,17 @@ msgstr "chyba pøi hledání záznamu dùvìryhodnosti v `%s': %s\n"
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:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, 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:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "chyba pøi ètení `%s': %s\n"
@@ -7396,103 +7401,107 @@ msgstr "Dobrý podpis od \"%s\""
msgid " aka"
msgstr " alias \"%s\""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "ukonèit"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "øádek je pøíli¹ dlouhý"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "neznámá volba `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "podepsání selhalo: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, 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:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "chyba pøi ètení `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, 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:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7520,31 +7529,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7609,7 +7622,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7619,166 +7632,169 @@ msgstr ""
"@Pøíkazy:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "de¹ifrování o.k.\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "de¹ifrování o.k.\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [jméno souboru]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "Není dovoleno pou¾ívat %s s %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "fstat `%s' selhal na %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "nemohu vytvoøit adresáø `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, 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:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "chyba pøi ètení `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "chyba v `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "spu¹tìní externího programu není podporováno\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "nemohu vytvoøit `%s': %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "nemohu vytvoøit `%s': %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "smazání bloku klíèe se nezdaøilo: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nemohu vytvoøit zálohu souboru `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nemohu vytvoøit zálohu souboru `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ochranný algoritmus %d není podporován\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA po¾aduje pou¾ití 160-ti bitového hashovacího algoritmu\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
diff --git a/po/da.po b/po/da.po
index b6c1b101b..6c16a2589 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -89,8 +89,8 @@ msgstr "kan ikke oprette %s: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke åbne '%s': %s\n"
@@ -191,13 +191,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ændr kodesætningen"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -206,7 +206,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "ændr kodesætningen"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -226,13 +226,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "meddelsom"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "vær mere stille"
@@ -244,7 +244,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|indlæs udvidelsesmodul FILE"
@@ -257,8 +257,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "eksportér nøgler til en nøgletjener"
@@ -314,9 +314,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\n"
@@ -332,137 +332,126 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "læser indstillinger fra `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, fuzzy, c-format
msgid "error creating `%s': %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: mappe oprettet\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "kan ikke åbne %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: udelod: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, fuzzy, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -478,48 +467,48 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "dårlig kodesætning"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
msgid "cancelled\n"
msgstr ""
@@ -558,7 +547,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -571,7 +560,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -581,7 +570,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -593,19 +582,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "ja"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -649,12 +638,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: bruger ikke fundet\n"
@@ -745,6 +734,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1176,13 +1175,13 @@ msgstr ""
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
@@ -1448,22 +1447,22 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1479,27 +1478,27 @@ msgstr "|[filer]|opret en signatur"
msgid "|[file]|make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "opret en separat signatur"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "kryptér data"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "kryptér kun med symmetriske cifre"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "afkryptér data (standard)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "godkend en signatur"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "vis nøgler"
@@ -1512,11 +1511,11 @@ msgstr "vis nøgler og signaturer"
msgid "list and check key signatures"
msgstr "tjek nøglesignaturer"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "vis nøgle og fingeraftryk"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
@@ -1554,11 +1553,11 @@ msgstr "Generér en annullérbar certifikat"
msgid "export keys"
msgstr "eksportér nøgler"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "eksportér nøgler til en nøgletjener"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importér nøgler fra en nøgleserver"
@@ -1596,12 +1595,12 @@ msgstr "opdatér tillidsdatabasen"
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|print meddelelsesresumé"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1611,31 +1610,31 @@ msgstr ""
"Indstillinger:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "opret ascii beskyttet uddata"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|kryptér for NAME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "brug kanonisk tekstmodus"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "brug som uddatafil"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "lav ingen ændringer"
@@ -1651,13 +1650,13 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1696,7 +1695,7 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afhænger af inddata\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1725,7 +1724,7 @@ msgstr "Kommentar: "
msgid "usage: gpg [options] "
msgstr "brug: gpg [flag] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "konfliktende kommandoer\n"
@@ -1847,6 +1846,11 @@ msgstr "skift imellem hemmelig og offentlig nøgle visning"
msgid "show expiration dates during signature listings"
msgstr ""
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1989,7 +1993,7 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr ""
@@ -2029,11 +2033,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resuméalgoritme er ugyldig\n"
@@ -2278,7 +2282,7 @@ msgstr "Slet denne nøgle fra nøgleringen? "
msgid "make timestamp conflicts only a warning"
msgstr "tidsstempelkonflikt"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinfo til denne FD"
@@ -3703,7 +3707,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "kan ikke oprette %s: %s\n"
@@ -3720,7 +3724,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr "Nøgle udløber d. %s\n"
@@ -3754,13 +3758,13 @@ msgid ""
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "tilføj nøgle"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4604,182 +4608,182 @@ msgstr "vis nøgler og signaturer"
msgid "%s: keyring created\n"
msgstr ""
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "slåfra"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ugyldig nøglering"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "eksportér nøgler til en nøgletjener"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "læser indstillinger fra `%s'\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "eksportér nøgler til en nøgletjener"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "læser indstillinger fra `%s'\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "ugyldig nøglering"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "generel fejl"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "generel fejl"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "påklædning af beskyttelse fejlede: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s er ikke et gyldigt tegnsæt\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "importér nøgler fra en nøgleserver: %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "kan ikke åbne %s: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -5130,16 +5134,16 @@ msgstr ""
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr ""
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -5740,7 +5744,7 @@ msgstr ""
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6283,7 +6287,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "kan ikke åbne %s: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "påklædning af beskyttelse fejlede: %s\n"
@@ -6510,7 +6514,7 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "læser indstillinger fra `%s'\n"
@@ -6554,21 +6558,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "ugyldigt radix64 tegn %02x udeladt\n"
@@ -6591,182 +6595,188 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "kan ikke åbne '%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
# er det klogt at oversætte TrustDB?
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "nøgle %08lX: nøgle er blevet annulleret!\n"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Godt certifikat"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Ingen hjælp tilgængelig"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "Kan ikke tjekke signatur: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Godt certifikat"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "certifikatlæseproblem: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "certifikatlæseproblem: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Fingeraftryk:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "Kan ikke tjekke signatur: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "certifikatlæseproblem: %s\n"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "godkend en signatur"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "n"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "ukendt version"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "fejl i trailerlinie\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "fejl i trailerlinie\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6780,7 +6790,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "fejl ved skrivning af nøglering `%s': %s\n"
@@ -6867,7 +6877,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
@@ -6892,192 +6902,192 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
msgid "no valid recipients given\n"
msgstr "ingen gyldige adresser\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "fejl ved oprettelse af kodesætning: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "skriver til `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[filer]|opret en signatur"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "vis hemmelige nøgler"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "ugyldigt certifikat"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "fjern nøgle fra den offentlige nøglering"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Godt certifikat"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Godt certifikat"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "ændr kodesætningen"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "opret ascii beskyttet uddata"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|brug NAME som standard modtager"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "brug standard nøglen som standard modtager"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "brug overhovedet ikke terminalen"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "tving v3 signaturer"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "brug altid en MDC for kryptering"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "kørselsmodus: spørg aldrig"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "forvent ja til de fleste sprøgsmål"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "forvent nej til de fleste sprøgsmål"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "tilføj denne nøglering til nøgleringslisten"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "tilføj denne hemmeligenøglering til listen"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|brug NAME som standard hemmelignøgle"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|brug denne nøgletjener til at slå nøgler op"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|sæt terminal karaktersæt til NAME"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FILE|indlæs udvidelsesmodul FILE"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|brug cifferalgoritme NAME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|brug meddelelsesresumé algoritme NAME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|brug kompresalgoritme N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, 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:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7088,44 +7098,39 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afhænger af inddata\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "brug: gpg [flag] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "kan ikke åbne '%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "skriver til `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan ikke åbne '%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
msgid "key generation is not available from the commandline\n"
msgstr ""
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7135,21 +7140,21 @@ msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
msgid "total number processed: %lu\n"
msgstr "Totalt antal behandlede: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Godt certifikat"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "fejl ved oprettelse af kodesætning: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
@@ -7169,13 +7174,13 @@ msgid "keybox `%s' created\n"
msgstr "%s: mappe oprettet\n"
# er det klogt at oversætte TrustDB?
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -7195,17 +7200,17 @@ msgstr "fejl ved oprettelse af kodesætning: %s\n"
msgid "error storing certificate: %s\n"
msgstr "fejl ved oprettelse af kodesætning: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "fejl ved oprettelse af kodesætning: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
@@ -7278,104 +7283,108 @@ msgstr "God signatur fra \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "afslut"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
#, fuzzy
msgid "Options useful for debugging"
msgstr "slå fuld fejltjekning til"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7403,31 +7412,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7491,7 +7505,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7501,160 +7515,160 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
msgid "decryption modus"
msgstr ""
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "kryptér data"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [filnavn (som gemmes)]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ikke tilladt med %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "kan ikke åbne %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "kan ikke åbne %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "fejl ved skrivning af nøglering `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "fejl ved læsning af '%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr ""
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "påklædning af beskyttelse fejlede: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "påklædning af beskyttelse fejlede: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "påklædning af beskyttelse fejlede: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -8266,9 +8280,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NAME|brug meddelelses resuméalgoritme NAME for pasfrase"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
-
#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
#~ msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
diff --git a/po/de.po b/po/de.po
index 4428ff4fe..0200be571 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.9.90\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2007-03-08 14:30+0100\n"
"Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -90,8 +90,8 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -190,12 +190,12 @@ msgstr "Neue Passphrase eingeben"
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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
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:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr "Keine Ãœbereinstimmung - bitte nochmal versuchen"
@@ -203,7 +203,7 @@ msgstr "Keine Ãœbereinstimmung - bitte nochmal versuchen"
msgid "Please enter the new passphrase"
msgstr "Bitte geben Sie die Passphrase ein:"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
msgid ""
"@Options:\n"
@@ -221,13 +221,13 @@ msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "Detaillierte Informationen"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "Etwas weniger Infos"
@@ -239,7 +239,7 @@ msgstr "Ausgabe für /bin/sh"
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
@@ -251,8 +251,8 @@ msgstr "Im Vordergrund laufen lassen"
msgid "do not grab keyboard and mouse"
msgstr "Tastatur und Maus nicht \"grabben\""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "Logausgaben in eine Datei umlenken"
@@ -304,9 +304,9 @@ msgstr "Die ssh-agent-Emulation anschalten"
msgid "|FILE|write environment settings also to FILE"
msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
msgid "Please report bugs to <"
msgstr "Fehlerberichte bitte an <"
@@ -322,139 +322,126 @@ msgstr ""
"Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für GnuPG\n"
-#: agent/gpg-agent.c:311
-#, 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"
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
-#, 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"
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#, fuzzy, c-format
+msgid "%s is too old (need %s, have %s)\n"
+msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n"
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr "Der Name des Sockets ist zu lang\n"
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, 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:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, c-format
msgid "listening on socket `%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, 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:1509
+#: agent/gpg-agent.c:1466
#, 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:1526
+#: agent/gpg-agent.c:1483
#, 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:1531
+#: agent/gpg-agent.c:1488
#, 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:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
@@ -471,11 +458,11 @@ msgstr ""
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@ -483,16 +470,16 @@ msgstr ""
"Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
"Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
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:1210
+#: agent/protect-tool.c:1196
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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@ -500,7 +487,7 @@ msgstr ""
"Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
"System zu schützen."
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@ -508,16 +495,16 @@ msgstr ""
"Die Eingabe der Passphrase bzw. der PIN\n"
"wird benötigt um diese Aktion auszuführen."
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
msgid "Passphrase:"
msgstr "Passphrase:"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
msgid "cancelled\n"
msgstr "Vom Benutzer abgebrochen\n"
@@ -559,7 +546,7 @@ msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
msgid "error reading `%s', line %d: %s\n"
msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
@@ -572,7 +559,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -584,7 +571,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr "Korrekt"
@@ -596,7 +583,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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -605,11 +592,11 @@ msgstr ""
"Wenn Sie vollständiges Vertrauen haben, daß%%0A \"%s\"%%"
"0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr "Nein"
@@ -653,12 +640,12 @@ msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
msgid "error running `%s': terminated\n"
msgstr "Fehler bei Ausführung von `%s': beendet\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, c-format
msgid "error creating socket: %s\n"
msgstr "Fehler beim Erstellen des Sockets: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
msgid "host not found"
msgstr "Host nicht gefunden"
@@ -747,6 +734,17 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, 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
+#, 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
#, c-format
msgid "armor: %s\n"
@@ -1153,13 +1151,13 @@ msgstr "--output funktioniert nicht bei diesem Befehl\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1442,24 +1440,24 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1475,27 +1473,27 @@ msgstr "|[Datei]|Eine Unterschrift erzeugen"
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "Daten verschlüsseln"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "Signatur prüfen"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "Liste der Schlüssel"
@@ -1507,11 +1505,11 @@ msgstr "Liste der Schlüssel und ihrer Signaturen"
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
@@ -1547,11 +1545,11 @@ msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
msgid "export keys"
msgstr "Schlüssel exportieren"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "Schlüssel zu einem Schlü.server exportieren"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "Schlüssel von einem Schlü.server importieren"
@@ -1587,12 +1585,12 @@ msgstr "Ändern der \"Trust\"-Datenbank"
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
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:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1602,31 +1600,31 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|Verschlüsseln für NAME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
@@ -1642,7 +1640,7 @@ msgstr "OpenPGP-Verhalten strikt beachten"
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1651,7 +1649,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1691,7 +1689,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1719,7 +1717,7 @@ msgstr "Komprimierung: "
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
@@ -1850,6 +1848,12 @@ msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
+#: g10/gpg.c:1835
+#, 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:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1987,7 +1991,7 @@ msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
@@ -2035,11 +2039,11 @@ msgstr ""
"Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
"Verschlüsselung\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
@@ -2275,7 +2279,7 @@ msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
msgid "make timestamp conflicts only a warning"
msgstr "differierende Zeitangaben sind kein Fehler"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
@@ -3830,7 +3834,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "erzeugt: %s"
@@ -3847,7 +3851,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "verfällt: %s"
@@ -3883,12 +3887,12 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "widerrufen"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "verfallen"
@@ -4755,184 +4759,184 @@ msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n"
msgid "%s: keyring created\n"
msgstr "%s: Schlüsselbund erstellt\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
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:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr "Temporäre Dateien nach Nutzung nicht löschen"
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr "Schlüssel für die Unterschriftenprüfung automatisch holen"
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
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:79
+#: g10/keyserver.c:86
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:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "abgeschaltet"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, 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:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "fordere Schlüssel %s von %s an\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "suche Namen auf %s-Server %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr "suche Namen auf %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "sende Schlüssel %s auf %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "suche nach \"%s\" auf %s-Server %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "suche nach \"%s\" auf %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "Kein Schlüsselserver-Vorgang\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "Schlüsselserver sendete VERSION nicht\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "Schlüsselserver-Zeitüberschreitung\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "interner Fehler Schlüsselserver\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "ein Schlüssel wird per %s aktualisiert\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d Schlüssel werden per %s aktualisiert\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
@@ -5282,18 +5286,18 @@ 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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
"Sitzungsschlüssel\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -5914,7 +5918,7 @@ 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
+#: g10/seskey.c:229 sm/certcheck.c:91
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"
@@ -6504,7 +6508,7 @@ msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
msgid "iconv_open failed: %s\n"
msgstr "iconv_open fehlgeschlagen: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
@@ -6728,7 +6732,7 @@ msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
msgid "run in multi server mode (foreground)"
msgstr "Im Multiserver Modus ausführen"
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
msgid "read options from file"
msgstr "Konfigurationsoptionen aus Datei lesen"
@@ -6768,23 +6772,23 @@ msgstr ""
"Synatx: scdaemon [Optionen] [Befehl [Argumente]]\n"
"Smartcard Daemon für GnuPG\n"
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
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:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr "Handhabungsroutine für fd %d gestartet\n"
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Handhabungsroutine für den fd %d beendet\n"
-#: sm/base64.c:323
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
@@ -6809,173 +6813,179 @@ msgstr ""
"Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
"versucht\n"
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, c-format
msgid "failed to open `%s': %s\n"
msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr "Notiz: Die unkritische Zertifikatrichtlinie ist nicht erlaubt"
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
msgid "certificate policy not allowed"
msgstr "Die Zertifikatrichtlinie ist nicht erlaubt"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n"
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
msgid "failed to allocated keyDB handle\n"
msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
msgid "certificate has been revoked"
msgstr "Das Zertifikat wurde widerrufen"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
msgid "no CRL found for certificate"
msgstr "Keine CRL für das Zertifikat gefunden"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
msgid "the available CRL is too old"
msgstr "Die vorhandene CRL ist zu alt"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
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:687
+#: sm/certchain.c:698
#, c-format
msgid "checking the CRL failed: %s"
msgstr "Die CRL konnte nicht geprüft werden: %s"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
msgid "no issuer found in certificate"
msgstr "Im Zertifikat ist kein Herausgeber enthalten"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr "Das Zertifikat ist noch nicht gültig"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
msgid "certificate has expired"
msgstr "Das Zertifikat ist abgelaufen"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, c-format
msgid "fingerprint=%s\n"
msgstr "Fingerprint=%s\n"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
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:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
"Interaktives vertrauenswürdig-Markieren ist in dieser Sitzung ausgeschaltet\n"
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, c-format
msgid "checking the trust list failed: %s\n"
msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr "Der Zertifikatkette ist zu lang\n"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr "Herausgeberzertifikat nicht gefunden"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
msgid "certificate has a BAD signature"
msgstr "Das Zertifikat hat eine FALSCHE Signatur"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
"Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
"nochmal"
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, 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:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
+#: sm/certcheck.c:103
+#, fuzzy, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr "DSA-Schlüssel %s verwendet einen unsicheren (%u Bit-) Hash\n"
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr "(Dies ist der MD2 Algorithmus)\n"
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
msgid "none"
msgstr "keine"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
msgid "[none]"
msgstr "[keine]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
msgid "[Error - invalid encoding]"
msgstr "[Fehler - Ungültige Kodierung]"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr "[Fehler - Nich genügend Speicher]"
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr "[Fehler - Kein Name]"
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
msgid "[Error - invalid DN]"
msgstr "[Fehler - Ungültiger DN]"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6993,7 +7003,7 @@ 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:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
@@ -7082,7 +7092,7 @@ msgstr "(dies is wahrscheinlich keine verschlüsselte Nachricht)\n"
msgid "certificate `%s' not found: %s\n"
msgstr "Zertifikat `%s' nicht gefunden: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, c-format
msgid "error locking keybox: %s\n"
msgstr "Fehler beim Sperren der Keybox: %s\n"
@@ -7106,183 +7116,183 @@ msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
msgid "no valid recipients given\n"
msgstr "Keine gültigen Empfänger angegeben\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
msgid "|[FILE]|make a signature"
msgstr "|[DATEI]|Erzeuge eine Signatur"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
msgid "|[FILE]|make a clear text signature"
msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
msgid "list external keys"
msgstr "Externe Schlüssel anzeigen"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
msgid "list certificate chain"
msgstr "Schlüssel mit Zertifikatekette anzeigen"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
msgid "remove key from the public keyring"
msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
msgid "import certificates"
msgstr "Zertifikate importieren"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
msgid "export certificates"
msgstr "Zertifikate exportieren"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr "Smartcard registrieren"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr "Das Kommand an den Dirmngr durchreichen"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr "Rufe das gpg-protect-tool auf"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
msgid "create base-64 encoded output"
msgstr "Ausgabe im Basis-64 format erzeugen"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr "Eingabedaten sind im PEM Format"
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr "Eingabedaten sind im Basis-64 Format"
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr "Eingabedaten sind im Binärformat"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr "Benutze den System Dirmngr when verfügbar"
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr "Niemals eine CRL konsultieren"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr "Die Gültigkeit mittels OCSP prüfen"
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr "|N|Sende N Zertifikate mit"
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr "Zertikikatrichtlinien nicht überprüfen"
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr "Fehlende Zertifikate automatisch holen"
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr ""
"Den Standardschlüssel als voreingestellten\n"
"Empfänger benutzen"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "das Terminal gar nicht benutzen"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "v3 Signaturen erzwingen"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "Als geheimen Schlüsselbund mitbenutzen"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|Terminalzeichensatz NAME benutzen"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|DATEI|Erweiterungsmodul DATEI laden"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Verschl.verfahren NAME benutzen"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Hashverfahren NAME benutzen"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|Komprimierverfahren N benutzen"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7291,43 +7301,38 @@ msgstr ""
"Syntax: gpgsm [Optionen] [Dateien]\n"
"Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
msgid "usage: gpgsm [options] "
msgstr "Aufruf: gpgsm [Optionen] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "Verschlüsseln für `%s' nicht möglich: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n"
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr "Dieser Befehl wurde noch nicht implementiert\n"
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
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:1602
+#: sm/gpgsm.c:1607
#, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr ""
@@ -7338,20 +7343,20 @@ msgstr ""
msgid "total number processed: %lu\n"
msgstr "gesamte verarbeitete Anzahl: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
msgid "error storing certificate\n"
msgstr "Fehler beim speichern des Zertifikats\n"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, c-format
msgid "error importing certificate: %s\n"
msgstr "Fehler beim Importieren des Zertifikats: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, c-format
msgid "error reading input: %s\n"
msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7370,11 +7375,11 @@ msgstr "Sie sollten zuerst den gpg-agent starten\n"
msgid "keybox `%s' created\n"
msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
msgid "failed to get the fingerprint\n"
msgstr "Kann den Fingerprint nicht ermitteln\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
msgid "failed to allocate keyDB handle\n"
msgstr "Kann keinen KeyDB Handler bereitstellen\n"
@@ -7393,17 +7398,17 @@ msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
msgid "error storing certificate: %s\n"
msgstr "Fehler beim Speichern des Zertifikats: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, c-format
msgid "error storing flags: %s\n"
msgstr "Fehler beim Speichern der Flags: %s\n"
@@ -7487,31 +7492,35 @@ msgstr "Korrekte Signatur von"
msgid " aka"
msgstr " alias"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
msgid "quiet"
msgstr "Weniger Ausgaben"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr "Druckdaten hexkodiert ausgeben"
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr "Starten des auf der Kommandozeile angegebenen Assuan-Server"
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr "Den \"extended connect\"-Modus nicht nutzen"
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Aufruf: gpg-connect-agent [Optionen] (-h für Hilfe)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
@@ -7519,70 +7528,70 @@ msgstr ""
"Syntax: gpg-connect-agent [Optionen]\n"
"Mit einem laufenden Agenten verbinden und Befehle senden\n"
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, 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:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "Optuin \"%s\" wird wegen \"%s\" nicht beachtet\n"
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
msgid "line too long - skipped\n"
msgstr "Zeile zu lang - übersprungen\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, c-format
msgid "unknown command `%s'\n"
msgstr "unbekannter Befehl `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, c-format
msgid "sending line failed: %s\n"
msgstr "Senden der Zeile schlug fehl: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, c-format
msgid "receiving line failed: %s\n"
msgstr "Empfangen der Zeile schlug fehl: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, c-format
msgid "error sending %s command: %s\n"
msgstr "Fehler beim Senden des %s-Befehls: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, c-format
msgid "error sending standard options: %s\n"
msgstr "Fehler beim Senden der Standardoptionen: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr "Optionen zur Einstellung Diagnoseausgaben"
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr "Optionen zur Einstellung der Konfiguration"
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr "Nützliche Optionen zum Debuggen"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr "Optionen zur Einstellung der Sicherheit"
@@ -7610,31 +7619,35 @@ msgstr "Konfiguration der Schlüsselserver"
msgid "allow PKA lookups (DNS requests)"
msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr "Optionen zum Einstellen der Ausgabeformate"
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr "Konfiguration für HTTP Server"
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr "Einstellungen des System HTTP-Proxy benutzen"
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration der zu nutzenden LDAP-Server"
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr "Konfiguration zu OCSP"
@@ -7695,7 +7708,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:173
+#: tools/symcryptrun.c:154
msgid ""
"@\n"
"Commands:\n"
@@ -7705,35 +7718,35 @@ msgstr ""
"@KBefehle:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
msgid "decryption modus"
msgstr "Entschlüsselungsmodus"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
msgid "encryption modus"
msgstr "Verschlüsselungsmodus"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr "Toolklasse (Konfuzius)"
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
msgid "program filename"
msgstr "Programmdateiname"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr "Dateiname des geheimen Schlüssels (erforderlich)"
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr "Eingabedateiname (Standardeingabe ist voreingestellt)"
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Aufruf: symcryptrun [Optionen] (-h für Hilfe)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
@@ -7743,126 +7756,129 @@ msgstr ""
"keyfileSCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
"Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s auf %s brach mit Status %i ab\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s auf %s schlug mit Status %i fehl\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, 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:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, 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:414
+#: tools/symcryptrun.c:395
#, c-format
msgid "error writing to %s: %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, c-format
msgid "error reading from %s: %s\n"
msgstr "Fehler beim Lesen von %s: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, c-format
msgid "error closing %s: %s\n"
msgstr "Fehler beim Schliessen von %s: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr "Option --programm nicht angegeben\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr "nur --decrypt und --encrypt sind vorhanden\n"
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr "keine --keyfile -Option angegeben\n"
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr "Kann \"args-vector\" nicht zuteilen\n"
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, c-format
msgid "could not create pipe: %s\n"
msgstr "Pipe kann nicht erzeugt werden: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, c-format
msgid "could not create pty: %s\n"
msgstr "Pty kann nicht erzeugt werden: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr "Kann nicht fork()en: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, c-format
msgid "execv failed: %s\n"
msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, c-format
msgid "select failed: %s\n"
msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, c-format
msgid "read failed: %s\n"
msgstr "Lesen schlug fehl: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, c-format
msgid "pty read failed: %s\n"
msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, c-format
msgid "waitpid failed: %s\n"
msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr "Kind brach mit Status %i ab\n"
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr "entweder %s oder %s muß angegeben sein\n"
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr "keine Klasse angegeben\n"
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, c-format
msgid "class %s is not supported\n"
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"
diff --git a/po/el.po b/po/el.po
index 7f29b675e..23c36d28b 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -89,8 +89,8 @@ msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n"
@@ -189,13 +189,13 @@ msgstr ""
"×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -224,13 +224,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "áíáëõôéêÜ"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "Þóõ÷ç Ýîïäïò"
@@ -242,7 +242,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|ÁÑ×ÅÉÏ|öüñôùìá ôïõ áñèñþìáôïò åðÝêôáóçò ÁÑ×ÅÉÏ"
@@ -255,8 +255,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "áíáæÞôçóç êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
@@ -313,9 +313,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "ÁíáöÝñåôå ôá ðñïâëÞìáôá óôï <gnupg-bugs@gnu.org>\n"
@@ -331,138 +331,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ÓÇÌÅÉÙÓÇ: ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "áñ÷åßï åðéëïãþí `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "óöÜëìá êáôÜ ôç äçìéïõñãßá ôïõ `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò êáôáëüãïõ `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "óöÜëìá óôç áðïóôïëÞ ðñïò ôï `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: êáôÜëïãïò äçìéïõñãÞèçêå\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read áðÝôõ÷å (n=%d): %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: áäõíáìßá äçìéïõñãßáò êáôáëüãïõ: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ðáñáëåßöèçêå: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n"
@@ -478,51 +467,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß· áõôÞ åßíáé ìéá ìõóôéêÞ ðñüôáóç \n"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß· áõôÞ åßíáé ìéá ìõóôéêÞ ðñüôáóç \n"
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß· áõôÞ åßíáé ìéá ìõóôéêÞ ðñüôáóç \n"
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "êáêÞ öñÜóç êëåéäß"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Áêýñùóç"
@@ -562,7 +551,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -575,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -585,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -597,19 +586,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "íáé|íáß"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -653,12 +642,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "óöÜëìá êáôÜ ôç äçìéïõñãßá ôïõ `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[User id äåí âñÝèçêå]"
@@ -752,6 +741,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1185,13 +1184,13 @@ msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n"
msgid "can't open `%s'\n"
msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n"
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1482,22 +1481,22 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ìç Ýãêõñï êëåéäß %08lX Ýãéíå Ýãêõñï áðü ôï --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "êáíÝíá ìõóôéêü õðïêëåéäß ãéá ôï äçìüóéï õðïêëåéäß %08lX - áãíüçóç\n"
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n"
-#: g10/getkey.c:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1513,27 +1512,27 @@ msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò õðïãñáöÞò"
msgid "|[file]|make a clear text signature"
msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò ìç êñõðôïãñáöçìÝíçò õðïãñáöÞò"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "êñõðôïãñÜöçóç äåäïìÝíùí"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "êñõðôïãñÜöçóç ìå ÷ñÞóç ìüíï óõììåôñéêþí áëãïñßèìùí"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "áðïêñõðôïãñÜöçóç äåäïìÝíùí (ðñïêáèïñéóìÝíï)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "åðáëÞèåõóç ìéáò õðïãñáöÞò"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí"
@@ -1546,11 +1545,11 @@ msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé õðïãñáöþí"
msgid "list and check key signatures"
msgstr "Ýëåã÷ïò õðïãñáöÞò êëåéäéïý"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé áðïôõðùìÜôùí (fingerprints)"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "áðåéêüíéóç ôçò ëßóôáò ìõóôéêþí êëåéäéþí"
@@ -1586,11 +1585,11 @@ msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò"
msgid "export keys"
msgstr "åîáãùãÞ êëåéäéþí"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "åîáãùãÞ êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "åéóáãùãÞ êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí"
@@ -1626,12 +1625,12 @@ msgstr "áíáíÝùóç ôçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
msgid "|algo [files]|print message digests"
msgstr "|áëãüñ [áñ÷åßá]| áðåéêüíéóç ðåñéëÞøåùí ôùí ìçíõìÜôùí"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1641,31 +1640,31 @@ msgstr ""
"ÅðéëïãÝò:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|ÏÍÏÌÁ|êñõðôïãñÜöçóç ãéá ÏÍÏÌÁ"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "÷ñÞóç áõôÞò ôçò ôáõôüôçôáò (user id) ãéá õðïãñáöÞ Þ áðïêñõðôïãñÜöçóç"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|êáèïñéóìüò åðéðÝäïõ óõìðßåóçò N (0 áðåíåñãïðïéåß)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "÷ñÞóç êáíïíéêÞò êáôÜóôáóçò êåéìÝíïõ"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "÷ñÞóç ùò áñ÷åßïõ åîüäïõ"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "íá ìç ãßíåé êáììßá áëëáãÞ"
@@ -1681,7 +1680,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1689,7 +1688,7 @@ msgstr ""
"@\n"
"(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1727,7 +1726,7 @@ msgstr ""
"õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n"
"ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1755,7 +1754,7 @@ msgstr "Óõìðßåóç: "
msgid "usage: gpg [options] "
msgstr "÷ñÞóç: gpg [åðéëïãÝò] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "óõãêñïõüìåíåò åíôïëÝò\n"
@@ -1882,6 +1881,11 @@ msgstr "áðåéêüíéóç ôçò êëåéäïèÞêçò óôçí ïðïßá áíáöÝñåôå ôï êëåéäß"
msgid "show expiration dates during signature listings"
msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2024,7 +2028,7 @@ msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n"
@@ -2068,11 +2072,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n"
@@ -2311,7 +2315,7 @@ msgstr "åîáãùãÞ ôùí êëåéäéþí áðü áõôÞ ôç êëåéäïèÞêç"
msgid "make timestamp conflicts only a warning"
msgstr "ïñéóìüò ôùí óõãêñïýóåùí þñáò (timestamp) ìüíï óáí ðñïåéäïðïßçóç"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï FD"
@@ -3887,7 +3891,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n"
@@ -3904,7 +3908,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [ëÞãåé: %s]"
@@ -3940,13 +3944,13 @@ msgstr ""
"Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n"
"åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n"
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[áíáêëçìÝíï]"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4835,185 +4839,185 @@ msgstr "%lu êëåéäéÜ Ý÷ïõí åëåã÷èåß (%lu õðïãñáöÝò)\n"
msgid "%s: keyring created\n"
msgstr "%s: êëåéäïèÞêç äçìéïõñãÞèçêå\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, fuzzy, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ïé åðéëïãåò óôï `%s' äåí åßíáé åíåñãÝò óå áõôÞ ôçí åêôÝëåóç\n"
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n"
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n"
@@ -5364,16 +5368,16 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr ""
"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ïé åðéëïãåò óôï `%s' äåí åßíáé åíåñãÝò óå áõôÞ ôçí åêôÝëåóç\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "áäõíáìßá ÷åéñéóìïý ôïõ áëãüñéèìïõ äçìïóßïõ êëåéäéïý %d\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ðéèáíüí ìç áóöáëÝò êñõðôïãñáöçìÝíï óõììåôñéêÜ êëåéäß\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n"
@@ -5993,7 +5997,7 @@ msgstr ""
"áäõíáìßá áðïöõãÞò áäýíáìïõ êëåéäéïý ãéá óõììåôñéêü êñõðôáëãüñéèìï, äïêéìÞ "
"ãéá %d öïñÝò!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6574,7 +6578,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "áäõíáìßá ðñüóâáóçò ôïõ áñ÷åßïõ: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "èùñÜêéóç áðÝôõ÷å: %s\n"
@@ -6799,7 +6803,7 @@ msgstr "äå âñÝèçêáí Ýãêõñá OpenPGP äåäïìÝíá.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n"
@@ -6843,21 +6847,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "ìç Ýãêõñïò radix64 ÷áñáêôÞñáò %02x ðáñÜâëåøç\n"
@@ -6881,180 +6885,186 @@ msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "ÓÇÌÅÉÙÓÇ: ôï êëåéäß Ý÷åé áíáêëçèåß"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "êáêü ðéóôïðïéçôéêü"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Êëåéäß äéáèÝóéìï óôï: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "áðÝôõ÷å ï Ýëåã÷ïò ôçò õðïãñáöÞò ðïõ äçìéïõñãÞèçêå: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Áõôü ôï êëåéäß Ý÷åé ëÞîåé!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "áðåéêüíéóç ôïõ fingerprint"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "áðÝôõ÷å ï Ýëåã÷ïò ôçò õðïãñáöÞò ðïõ äçìéïõñãÞèçêå: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "åðáëÞèåõóç ìéáò õðïãñáöÞò"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "ï DSA áðáéôåß ôç ÷ñÞóç åíüò 160 bit áëãüñéèìïõ hash\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "ü÷é|ï÷é"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "Üãíùóôï"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7070,7 +7080,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n"
@@ -7157,7 +7167,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n"
@@ -7182,191 +7192,191 @@ msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n"
msgid "no valid recipients given\n"
msgstr "(Äåí äþèçêå ðåñéãñáöÞ)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "åããñáöÞ óôï `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò õðïãñáöÞò"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò ìç êñõðôïãñáöçìÝíçò õðïãñáöÞò"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "áðåéêüíéóç ôçò ëßóôáò ìõóôéêþí êëåéäéþí"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "êáêü ðéóôïðïéçôéêü"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç äçìüóéá êëåéäïèÞêç"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "êáêü ðéóôïðïéçôéêü"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "êáêü ðéóôïðïéçôéêü"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|ÏÍÏÌÁ|÷ñÞóç ôïõ ÏÍÏÌÁôïò ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "÷ñÞóç ôïõ ðñïêáèïñéóìÝíïõ êëåéäéïý ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "ìç ÷ñÞóç ôåñìáôéêïý"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "÷ñÞóç ðÜíôïôå MDC ãéá êñõðôïãñÜöçóç"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "êáôÜóôáóç batch: íá ìç ãßíïíôáé åñùôÞóåéò"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "áðÜíôçóç íáé óôéò ðåñéóóüôåñåò åñùôÞóåéò"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "áðÜíôçóç ü÷é óôéò ðåñéóóüôåñåò åñùôÞóåéò"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "ðñïóèÞêç áõôïý ôïõ êëåéäéïý óôç ëßóôá ôùí êëåéäïèçêþí"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "ðñïóèÞêç áõôÞò ôçò ìõóôéêÞò êëåéäïèÞêçò óôç ëßóôá"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|ÏÍÏÌÁ|÷ñÞóç ÏÍÏÌÁôïò óáí ðñïêáèïñéóìÝíï ìõóôéêü êëåéäß"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ÄÉÁÊÏÌÉÓÔÇÓ|÷ñÞóç áõôïý ôïõ äéáêïìéóôÞ êëåéäéþí ãéá áíáæÞôçóç"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|ÏÍÏÌÁ|êáèïñéóìüò ôïõ óåô ÷áñáêôÞñùí ôåñìáôéêïý óå ÏÍÏÌÁ"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|ÁÑ×ÅÉÏ|öüñôùìá ôïõ áñèñþìáôïò åðÝêôáóçò ÁÑ×ÅÉÏ"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ ðåñßëçøçò ìçíýìáôïò ÏÍÏÌÁ "
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|÷ñÞóç áëãïñßèìïõ óõìðßåóçò N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7377,45 +7387,40 @@ msgstr ""
"õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n"
"ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "÷ñÞóç: gpg [åðéëïãÝò] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "åããñáöÞ óôï `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "áäõíáìßá êëåéóßìáôïò ôïõ `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n"
@@ -7425,21 +7430,21 @@ msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n"
msgid "total number processed: %lu\n"
msgstr "Óõíïëéêüò áñéèìüò ðïõ åðåîåñãÜóôçêáí: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
@@ -7458,12 +7463,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "êëåéäïèÞêç `%s' äçìéïõñãÞèçêå\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n"
@@ -7483,17 +7488,17 @@ msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
msgid "error storing certificate: %s\n"
msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? ðñüâëçìá óôïí Ýëåã÷ï áíÜêëçóçò: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
@@ -7566,103 +7571,107 @@ msgstr "ÊáëÞ õðïãñáöÞ áðü \""
msgid " aka"
msgstr " ãíùóôü óáí \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "ôåñìáôéóìüò"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "ç ãñáììÞ åßíáé ðïëý ìåãÜëç\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "Üãíùóôïò ðñïêáèïñéóìÝíïò ðáñáëÞðôçò `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "ç õðïãñáöÞ áðÝôõ÷å: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "óöÜëìá óôç áðïóôïëÞ ðñïò ôï `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "óöÜëìá óôç áðïóôïëÞ ðñïò ôï `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7690,31 +7699,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7778,7 +7792,7 @@ msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n"
msgid "error allocating enough memory: %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò ôçò êëåéäïèÞêçò `%s': %s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7788,166 +7802,169 @@ msgstr ""
"@ÅíôïëÝò:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "áðïêñõðôïãñÜöçóç OK\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "áðïêñõðôïãñÜöçóç OK\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [üíïìá áñ÷åßïõ]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "áäõíáìßá ðñüóâáóçò ôïõ áñ÷åßïõ: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò êáôáëüãïõ `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "áäõíáìßá ðñüóâáóçò ôïõ %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "áäõíáìßá åããñáöÞò ôçò êëåéäïèÞêçò `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "äåí õðïóôçñßæåôå ç áðïìáêñõóìÝíç åêôÝëåóç ðñïãñÜììáôïò\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "äåí õðïóôçñßæåôáé ï áëãüñéèìïò ðñïóôáóßáò %d%s\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "ï DSA áðáéôåß ôç ÷ñÞóç åíüò 160 bit áëãüñéèìïõ hash\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8719,9 +8736,6 @@ msgstr "äåí õðïóôçñßæåôáé ï áëãüñéèìïò ðñïóôáóßáò %d%s\n"
#~ msgstr ""
#~ "|ONOMA|÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò ìçíýìáôïò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "äéáãñáöÞ ôïõ ðåäßïõ keyid ôùí êñõðôïãñáöçìÝíùí ðáêÝôùí"
diff --git a/po/eo.po b/po/eo.po
index 9ed5e83d5..233ceaba6 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -89,8 +89,8 @@ msgstr "ne povas krei '%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -190,13 +190,13 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "þanøi la pasfrazon"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "þanøi la pasfrazon"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -225,13 +225,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detala eligo"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
@@ -243,7 +243,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
@@ -256,8 +256,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "seræi þlosilojn æe þlosilservilo"
@@ -313,9 +313,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
@@ -331,138 +331,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skribas sekretan þlosilon al '%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: dosierujo kreita\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu þlosiloj ignoritaj\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
@@ -478,51 +467,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "malbona pasfrazo"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "nuligita de uzanto\n"
@@ -562,7 +551,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -575,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -585,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -597,19 +586,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "jes"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -653,12 +642,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: uzanto ne trovita\n"
@@ -753,6 +742,16 @@ msgstr ""
msgid "cC"
msgstr "k"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1188,13 +1187,13 @@ msgstr "--output ne funkcias por æi tiu komando\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1466,22 +1465,22 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1497,27 +1496,27 @@ msgstr "|[dosiero]|fari subskribon"
msgid "|[file]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "æifri datenojn"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "æifri nur kun simetria æifro"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "malæifri datenojn (implicita elekto)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "listigi þlosilojn"
@@ -1530,11 +1529,11 @@ msgstr "listigi þlosilojn kaj subskribojn"
msgid "list and check key signatures"
msgstr "kontroli þlosilsubskribojn"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "listigi þlosilojn kaj fingroþpurojn"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "listigi sekretajn þlosilojn"
@@ -1570,11 +1569,11 @@ msgstr "krei revokatestilon"
msgid "export keys"
msgstr "eksporti þlosilojn"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "eksporti þlosilojn al þlosilservilo"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importi þlosilojn de þlosilservilo"
@@ -1610,12 +1609,12 @@ msgstr "aktualigi la fido-datenaron"
msgid "|algo [files]|print message digests"
msgstr "|metodo [dosieroj]|presi mesaøo-kompendiojn"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1625,31 +1624,31 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOMO|æifri por NOMO"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "uzi tekstan reøimon"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "fari neniajn þanøojn"
@@ -1665,7 +1664,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1673,7 +1672,7 @@ msgstr ""
"@\n"
"(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1711,7 +1710,7 @@ msgstr ""
"subskribi, kontroli, æifri aý malæifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1740,7 +1739,7 @@ msgstr "Komento: "
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
@@ -1864,6 +1863,11 @@ msgstr "montri, en kiu þlosilaro estas listigita þlosilo"
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2006,7 +2010,7 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
@@ -2046,11 +2050,11 @@ msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita æifrad-metodo ne validas\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
@@ -2292,7 +2296,7 @@ msgstr "Æu forviþi æi tiun þlosilon de la þlosilaro? "
msgid "make timestamp conflicts only a warning"
msgstr "malkongruo de tempostampoj"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
@@ -3858,7 +3862,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "ne povas krei %s: %s\n"
@@ -3875,7 +3879,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [eksvalidiøos: %s]"
@@ -3909,13 +3913,13 @@ msgid ""
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "rev"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4798,184 +4802,184 @@ msgstr "%lu þlosiloj kontrolitaj (%lu subskriboj)\n"
msgid "%s: keyring created\n"
msgstr "%s: þlosilaro kreita\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "el"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "nevalida þlosilaro"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "þlosilo '%s' ne trovita: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "þlosilo '%s' ne trovita: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"subskribita per via þlosilo %08lX je %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, 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:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "nevalida þlosilaro"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "þlosilservila eraro"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "þlosilservila eraro"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: ne valida þlosilidentigilo\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -5326,16 +5330,16 @@ msgstr "%s: nova opcio-dosiero kreita\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr ""
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publikþlosilan metodon %d\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
@@ -5946,7 +5950,7 @@ 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
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6509,7 +6513,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
@@ -6734,7 +6738,7 @@ msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "legas opciojn el '%s'\n"
@@ -6778,21 +6782,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
@@ -6816,189 +6820,195 @@ msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "skribas sekretan þlosilon al '%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "þlosilo %08lX: þlosilo estas revokita!\n"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Bona atestilo"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Nenia helpo disponata"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Bona atestilo"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problemo æe legado de atestilo: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
#, fuzzy
msgid "certificate not yet valid"
msgstr "Valida atestilrevoko"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "problemo æe legado de atestilo: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
"\n"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Fingrospuro:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
#, fuzzy
msgid "root certificate has now been marked as trusted\n"
msgstr ""
"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
"\n"
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Valida atestilrevoko"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
#, fuzzy
msgid "issuer certificate not found"
msgstr "Valida atestilrevoko"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "kontroli subskribon"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "ne"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "nekonata versio"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "%s: nevalida dosiero-versio %d\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "%s: nevalida dosiero-versio %d\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7013,7 +7023,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n"
@@ -7100,7 +7110,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "þlosilo '%s' ne trovita: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "eraro dum legado de þlosilbloko: %s\n"
@@ -7125,191 +7135,191 @@ msgstr "forviþo de þlosilbloko malsukcesis: %s\n"
msgid "no valid recipients given\n"
msgstr "nevalida respondo de agento\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "skribas al '%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[dosiero]|fari subskribon"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "listigi sekretajn þlosilojn"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "Valida atestilrevoko"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "forigi þlosilojn de la publika þlosilaro"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Bona atestilo"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Bona atestilo"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "þanøi la pasfrazon"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "krei eligon en askia kiraso"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "uzi la implicitan þlosilon kiel implicitan ricevonton"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "devigi v3-subskribojn"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "æiam uzi sigelon (MDC) por æifrado"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "neinteraga reøimo: neniam demandi"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "supozi \"jes\" æe la plej multaj demandoj"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "supozi \"ne\" æe la plej multaj demandoj"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "aldoni æi tiun þlosilaron al la listo de þlosilaroj"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "aldoni æi tiun sekretan þlosilaron al la listo"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan þlosilon"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi æi tiun þlosilservilon por seræi þlosilojn"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi æifrad-metodon NOMO"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|uzi densig-metodon N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7320,45 +7330,40 @@ msgstr ""
"subskribi, kontroli, æifri aý malæifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uzado: gpg [opcioj] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "ne povas konektiøi al '%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "skribas al '%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
@@ -7368,21 +7373,21 @@ msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
msgid "total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Bona atestilo"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@ -7401,12 +7406,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "þlosilaro '%s' kreita\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -7426,17 +7431,17 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
msgid "error storing certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problemo en kontrolo de revoko: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@ -7509,103 +7514,107 @@ msgstr "Bona subskribo de \""
msgid " aka"
msgstr " alinome \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "fini"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "pasfrazo estas tro longa\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "forviþo de þlosilbloko malsukcesis: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7633,31 +7642,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NOMO|uzi æifrad-metodon NOMO por pasfrazoj"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7721,7 +7735,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7731,161 +7745,161 @@ msgstr ""
"@Komandoj:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "malæifrado sukcesis\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "malæifrado sukcesis\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [dosiero]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ne eblas kun %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "eraro dum skribado de þlosilaro '%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr ""
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "ne povas krei %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "ne povas krei %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: uzanto ne trovita: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "forviþo de þlosilbloko malsukcesis: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
@@ -8627,9 +8641,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOMO|uzi æifrad-metodon NOMO por pasfrazoj"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "forigi la þlosilidentigilon de æifritaj paketoj"
diff --git a/po/es.po b/po/es.po
index faad7118b..76fac3784 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2005-03-25 16:50+0100\n"
"Last-Translator: Jaime Suárez <jsuarez@ono.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -111,8 +111,8 @@ msgstr "no se puede crear %s: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no se puede abrir `%s': %s\n"
@@ -211,13 +211,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, 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:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -226,7 +226,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "cambia la frase contraseña"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -246,13 +246,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolijo"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "algo más discreto"
@@ -264,7 +264,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|carga módulo de extensiones FICHERO"
@@ -277,8 +277,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "busca claves en un servidor de claves"
@@ -334,9 +334,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
@@ -352,139 +352,128 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "error creando `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "no se puede crear el directorio `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "error enviando a `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualización fallida: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "directorio `%s' creado\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) falló en %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, 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:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claves omitidas\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, 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"
@@ -500,34 +489,34 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
@@ -543,17 +532,17 @@ 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "Frase contraseña incorrecta"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "error creando frase contraseña: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "cancelado"
@@ -593,7 +582,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "error leyendo `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -606,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -616,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -628,19 +617,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "sí"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -684,12 +673,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "error leyendo `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "error creando `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: usuario no encontrado\n"
@@ -782,6 +771,16 @@ msgstr "vV"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1189,13 +1188,13 @@ msgstr "--output no funciona con esta orden\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1471,17 +1470,17 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "clave %s: clave secreta sin clave pública - omitida\n"
@@ -1490,7 +1489,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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1506,27 +1505,27 @@ msgstr "|[file]|crea una firma"
msgid "|[file]|make a clear text signature"
msgstr "|[file]|crea una firma en texto claro"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "crea una firma separada"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "cifra sólo con un cifrado simétrico"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "lista claves"
@@ -1538,11 +1537,11 @@ msgstr "lista claves y firmas"
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "lista claves secretas"
@@ -1578,11 +1577,11 @@ msgstr "genera un certificado de revocación"
msgid "export keys"
msgstr "exporta claves"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
@@ -1618,12 +1617,12 @@ msgstr "actualiza la base de datos de confianza"
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1633,31 +1632,31 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "usa modo de texto canónico"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "no hace ningún cambio"
@@ -1677,7 +1676,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:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1685,7 +1684,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1723,7 +1722,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1751,7 +1750,7 @@ msgstr "Compresión: "
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "órdenes incompatibles\n"
@@ -1881,6 +1880,11 @@ msgstr "muestra en qué anillos está una clave"
msgid "show expiration dates during signature listings"
msgstr "No existe la firma correspondiente en el anillo secreto\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2017,7 +2021,7 @@ msgstr "%s:%d: opciones de verificación inválidas\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
@@ -2057,11 +2061,11 @@ msgstr "debe usar ficheros (no tuberías) si trabaja con --pgp2 activo.\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inválido\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inválido\n"
@@ -2297,7 +2301,7 @@ msgstr "tomar las claves de este anillo"
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:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe información de estado en este descriptor de fichero"
@@ -3810,7 +3814,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "creado: %s"
@@ -3827,7 +3831,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "caduca: %s"
@@ -3863,12 +3867,12 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "revocada"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "caducada"
@@ -4726,183 +4730,183 @@ msgstr "%lu claves memorizadas (%lu firmas)\n"
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "Introduzca la URL de su servidor de claves preferido: "
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "deshabilitado"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduzca número(s), O)tro, o F)in >"
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, 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:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clave \"%s\" no encontrada en el servidor\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "clave no encontrada en el servidor\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando clave %s de %s servidor %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando clave %s de %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "buscando \"%s\" de %s servidor %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "buscando \"%s\" de %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "enviando clave %s a %s servidor %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "buscando \"%s\" de %s servidor %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "buscando \"%s\" de %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "¡no se solicita ninguna acción al servidor de claves!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "el servidor de claves no envió VERSION\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, 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:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, 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:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "agotado el tiempo de espera para el servidor de claves\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "error interno del servidor de claves\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "error de comunicación con el servidor de claves: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, 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:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "renovando 1 clave de %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "renovando %d claves desde %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, 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"
@@ -5246,17 +5250,17 @@ msgstr "creado un nuevo fichero de configuración `%s'\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, 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"
@@ -5860,7 +5864,7 @@ msgstr ""
"¡imposible evitar clave débil para cifrado simétrico después de %d "
"intentos!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6431,7 +6435,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "no puede abrirse el fichero: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "renombrando `%s' en `%s' fallo: %s\n"
@@ -6653,7 +6657,7 @@ msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "leyendo opciones desde `%s'\n"
@@ -6697,21 +6701,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracter inválido radix64 %02X omitido\n"
@@ -6735,189 +6739,195 @@ msgstr "el programa no permite usar el protocolo agente gpg versión %d\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "No se puede abrir `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "no se permite exportar claves secretas\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "fallo al almacenar la clave: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTA: la clave ha sido revocada"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Certificado correcto"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Clave disponible en: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "la comprobación de la firma creada falló: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Certificado correcto"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problema en la lectura del certificado: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
#, fuzzy
msgid "certificate not yet valid"
msgstr "Revocación de certificado válida"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "problema en la lectura del certificado: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
#, 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:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Huella dactilar CA:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
#, 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:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Revocación de certificado válida"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
#, fuzzy
msgid "issuer certificate not found"
msgstr "Revocación de certificado válida"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifica una firma"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[no establecido]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Error: respuesta no válida.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Error: respuesta no válida.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6932,7 +6942,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "error obteniendo la información actual de la clave: %s\n"
@@ -7019,7 +7029,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
@@ -7044,135 +7054,135 @@ msgstr "borrado de bloque de anillo de claves fallido: %s\n"
msgid "no valid recipients given\n"
msgstr "(No se dió descripción)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "error creando frase contraseña: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[file]|crea una firma"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[file]|crea una firma en texto claro"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "lista claves secretas"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "Revocación de certificado válida"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "elimina claves del anillo público"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Certificado correcto"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Certificado correcto"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "añadir clave a tarjeta"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la frase contraseña"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea una salida ascii con armadura"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "usa la clave por defecto como destinatario"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "no usa la terminal en absoluto"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "fuerza firmas v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "siempre usa un MDC para cifrar"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
@@ -7182,60 +7192,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:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "asume \"sí\" en casi todas las preguntas"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "añade este anillo a la lista de anillos"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "añade este anillo secreto a la lista"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVIDOR|usa este servidor de claves"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FICHERO|carga módulo de extensiones FICHERO"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|usa el algoritmo de compresión N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7246,45 +7256,40 @@ msgstr ""
"firma, comprueba, cifra o descifra\n"
"la operación por defecto depende de los datos de entrada\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpgm [opciones] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "no se puede conectar con `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "no se puede acceder a `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7294,21 +7299,21 @@ msgstr "Por favor seleccione tipo de clave que generar:\n"
msgid "total number processed: %lu\n"
msgstr "Cantidad total procesada: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Certificado correcto"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "error obteniendo el número de serie: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "error leyendo `%s': %s\n"
@@ -7327,12 +7332,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "anillo `%s' creado\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "fallo al almacenar la huella digital: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "fallo al almacenar la clave: %s\n"
@@ -7352,17 +7357,17 @@ msgstr "error obteniendo el número de serie: %s\n"
msgid "error storing certificate: %s\n"
msgstr "error obteniendo el número de serie: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema comprobando la revocación: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "error leyendo `%s': %s\n"
@@ -7435,104 +7440,108 @@ msgstr "Firma correcta de \"%s\""
msgid " aka"
msgstr " alias \"%s\""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "fin"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "línea demasiado larga"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "opción desconocida `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "firma fallida: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "fallo leyendo la clave\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "error enviando a `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "error enviando a `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilita depuración completa"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7560,31 +7569,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, 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:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7652,7 +7666,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7662,166 +7676,169 @@ msgstr ""
"@Órdenes:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "descifrado correcto\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "descifrado correcto\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nombre_fichero]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "¡%s no permitido con %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "fstat de `%s' falló en %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, 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:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "no se puede abrir `%s': %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "error leyendo `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "error en `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "no es posible ejecutar programas remotos\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "no se puede crear %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "no se puede crear %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: usuario no encontrado: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "actualización fallida: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "borrado de bloque de anillo de claves fallido: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "actualización fallida: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "actualización fallida: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "actualización fallida: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "%s: no se puede crear el anillo: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "no se puede crear fichero de respaldo `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "el resumen protector %d no puede ser utilizado\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8284,9 +8301,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
#~ msgstr ""
#~ "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contraseñas"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contraseñas"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "elimina campo keyid de los paquetes cifrados"
diff --git a/po/et.po b/po/et.po
index 9272a37fb..5b04f71ed 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -89,8 +89,8 @@ msgstr "`%s' ei õnnestu luua: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ei õnnestu avada: %s\n"
@@ -189,13 +189,13 @@ msgstr ""
"Te vajate oma salajase võtme kaitsmiseks parooli.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuda parooli"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muuda parooli"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -224,13 +224,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ole jutukas"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "ole mõnevõrra vaiksem"
@@ -242,7 +242,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
@@ -255,8 +255,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "otsi võtmeid võtmeserverist"
@@ -312,9 +312,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
@@ -330,138 +330,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "võtmete fail `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen võtmeid failist `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei õnnestu luua: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: kataloog on loodud\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: kataloogi ei õnnestu luua: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: jätsin vahele: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
@@ -477,51 +466,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "halb parool"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Katkesta"
@@ -561,7 +550,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -574,7 +563,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -584,7 +573,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -596,19 +585,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "jah"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -652,12 +641,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "viga `%s' loomisel: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[Kasutaja id puudub]"
@@ -751,6 +740,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1183,13 +1182,13 @@ msgstr "võti --output ei tööta selle käsuga\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1473,22 +1472,22 @@ msgstr ""
"Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
"kasutamisega\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1504,27 +1503,27 @@ msgstr "|[fail]|loo allkiri"
msgid "|[file]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "krüpteeri andmed"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "krüpteerimine kasutades ainult sümmeetrilist ¨ifrit"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "dekrüpteeri andmed (vaikimisi)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "näita võtmeid"
@@ -1537,11 +1536,11 @@ msgstr "näita võtmeid ja allkirju"
msgid "list and check key signatures"
msgstr "kontrolli võtmete allkirju"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "näita võtmeid ja sõrmejälgi"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "näita salajasi võtmeid"
@@ -1577,11 +1576,11 @@ msgstr "genereeri tühistamise sertifikaat"
msgid "export keys"
msgstr "ekspordi võtmed"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "ekspordi võtmed võtmeserverisse"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "impordi võtmed võtmeserverist"
@@ -1617,12 +1616,12 @@ msgstr "uuenda usalduse andmebaasi"
msgid "|algo [files]|print message digests"
msgstr "|algo [failid]|trüki teatelühendid"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1632,31 +1631,31 @@ msgstr ""
"Võtmed:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "loo ascii pakendis väljund"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|krüpti NIMEle"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|määra pakkimise tase N (0 blokeerib)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "kasuta väljundfailina"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "ära tee mingeid muutusi"
@@ -1672,7 +1671,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1680,7 +1679,7 @@ msgstr ""
"@\n"
"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1718,7 +1717,7 @@ msgstr ""
"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
"vaikimisi operatsioon sõltub sisendandmetest\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1746,7 +1745,7 @@ msgstr "Pakkimine: "
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [võtmed] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "vastuolulised käsud\n"
@@ -1870,6 +1869,11 @@ msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2010,7 +2014,7 @@ msgstr "%s:%d: vigased ekspordi võtmed\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
@@ -2051,11 +2055,11 @@ msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "valitud lühendi algoritm ei ole lubatud\n"
@@ -2289,7 +2293,7 @@ msgstr "võta võtmed sellest võtmehoidlast"
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
@@ -3841,7 +3845,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei õnnestu luua: %s\n"
@@ -3858,7 +3862,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [aegub: %s]"
@@ -3894,13 +3898,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[tühistatud] "
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4770,184 +4774,184 @@ msgstr "kontrollitud %lu võtit (%lu allkirja)\n"
msgid "%s: keyring created\n"
msgstr "%s: võtmehoidla on loodud\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi võtmed\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "võtit '%s' ei leitud: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "võtit '%s' ei leitud: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie võtmega %08lX %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "vigased ekspordi võtmed\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "võtmeserveri viga"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "võtmeserveri viga"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "küsin võtit %08lX võtmeserverist %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -5293,18 +5297,18 @@ msgstr "uus omaduste fail `%s' on loodud\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
@@ -5917,7 +5921,7 @@ msgstr ""
"sümmeetrilises ¨ifris ei õnnestu vältida nõrga võtme kasutamist; proovisin %"
"d korda!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6478,7 +6482,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "faili ei õnnestu avada: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
@@ -6703,7 +6707,7 @@ msgstr "ei leia OpenPGP andmeid.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "loen võtmeid failist `%s'\n"
@@ -6747,21 +6751,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
@@ -6785,180 +6789,186 @@ msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "`%s' ei õnnestu avada: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "kirjutan salajase võtme faili `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "MÄRKUS: võti on tühistatud"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "halb sertifikaat"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Võtme leiate: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "genereeri tühistamise sertifikaat"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "See võti on aegunud!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "näita sõrmejälge"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "kontrolli allkirja"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "ei"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "tundmatu"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "viga: vigane sõrmejälg\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "viga: vigane sõrmejälg\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6973,7 +6983,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@ -7060,7 +7070,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "võtit '%s' ei leitud: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "viga võtmebloki lugemisel: %s\n"
@@ -7085,191 +7095,191 @@ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
msgid "no valid recipients given\n"
msgstr "(Kirjeldust ei antud)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "kirjutan faili `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[fail]|loo allkiri"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "näita salajasi võtmeid"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "halb sertifikaat"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "eemalda võtmed avalike võtmete hoidlast"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "halb sertifikaat"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "halb sertifikaat"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "loo ascii pakendis väljund"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "kasuta vaikimisi saajana vaikimisi võtit"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "ära kasuta terminali"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "kasuta v3 allkirju"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "krüptimisel kasuta alati MDC"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "pakettmood: ära küsi kunagi"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "eelda enamus küsimustele jah vastust"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "eelda enamus küsimustele ei vastust"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "lisa see salajaste võtmete hoidla nimekirja"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda võtmeserverit"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NIMI|terminali kooditabel on NIMI"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|kasuta ¨ifri algoritmi NIMI"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|kasuta pakkimisalgoritmi N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7280,45 +7290,40 @@ msgstr ""
"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
"vaikimisi operatsioon sõltub sisendandmetest\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "kasuta: gpg [võtmed] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "kirjutan faili `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "`%s' ei õnnestu sulgeda: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7328,21 +7333,21 @@ msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
msgid "total number processed: %lu\n"
msgstr "Töödeldud kokku: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "genereeri tühistamise sertifikaat"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@ -7361,12 +7366,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "võtmehoidla `%s' on loodud\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@ -7386,17 +7391,17 @@ msgstr "viga parooli loomisel: %s\n"
msgid "error storing certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@ -7469,103 +7474,107 @@ msgstr "Korrektne allkiri kasutajalt \""
msgid " aka"
msgstr " ka \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "välju"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "rida on liiga pikk\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "allkirjastamine ebaõnnestus: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7593,31 +7602,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NIMI|kasuta paroolidega ¨ifri algoritmi NIMI"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7681,7 +7695,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7691,166 +7705,169 @@ msgstr ""
"@Käsud:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "lahtikrüpteerimine õnnestus\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "lahtikrüpteerimine õnnestus\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [failinimi]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "faili ei õnnestu avada: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%s ei õnnestu avada: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "mittelokaalse programmi käivitamist ei toetata\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s ei õnnestu luua: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s ei õnnestu luua: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "uuendamine ebaõnnestus: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "`%s' ei õnnestu luua: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "`%s' ei õnnestu luua: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8606,9 +8623,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NIMI|kasuta paroolidega lühendialgoritmi NIMI"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NIMI|kasuta paroolidega ¨ifri algoritmi NIMI"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "ära lisa krüptimisel võtme id"
diff --git a/po/fi.po b/po/fi.po
index 638c38258..2d1aff170 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -105,8 +105,8 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -205,13 +205,13 @@ msgstr ""
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuta salasanaa"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muuta salasanaa"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -240,13 +240,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "monisanainen"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
@@ -258,7 +258,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
@@ -271,8 +271,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "etsi avaimia avainpalvelimelta"
@@ -328,9 +328,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
@@ -347,138 +347,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: hakemisto luotu\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
@@ -494,51 +483,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "väärä salasana"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Peru"
@@ -578,7 +567,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -591,7 +580,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -601,7 +590,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -613,19 +602,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "kyllä|kylla|joo"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -669,12 +658,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[Käyttäjätunnusta ei löytynyt]"
@@ -768,6 +757,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1202,13 +1201,13 @@ msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1489,25 +1488,25 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1523,27 +1522,27 @@ msgstr "|[tiedosto]|tee allekirjoitus"
msgid "|[file]|make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "salaa tiedot"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "näytä avaimet"
@@ -1556,11 +1555,11 @@ msgstr "näytä avaimet allekirjoituksineen"
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
@@ -1596,11 +1595,11 @@ msgstr "luo mitätöintivarmenne"
msgid "export keys"
msgstr "vie avaimia"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "vie avaimia palvelimelle"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "nouda avaimia avainpalvelimelta"
@@ -1636,12 +1635,12 @@ msgstr "päivitä luottamustietokanta"
msgid "|algo [files]|print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1651,31 +1650,31 @@ msgstr ""
"Valitsimet:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "käytä tulostustiedostona"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "älä tee muutoksia"
@@ -1691,7 +1690,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1700,7 +1699,7 @@ msgstr ""
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1738,7 +1737,7 @@ msgstr ""
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1766,7 +1765,7 @@ msgstr "Pakkaus: "
msgid "usage: gpg [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
@@ -1890,6 +1889,11 @@ msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2030,7 +2034,7 @@ msgstr "%s:%d: virheelliset vientivalitsimet\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
@@ -2071,11 +2075,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
@@ -2310,7 +2314,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
msgid "make timestamp conflicts only a warning"
msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
@@ -3876,7 +3880,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "ei voida luoda kohdetta %s: %s\n"
@@ -3893,7 +3897,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [vanhenee: %s]"
@@ -3929,13 +3933,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4815,186 +4819,186 @@ msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
msgid "%s: keyring created\n"
msgstr "%s: avainrengas luotu\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "avainpalvelinvirhe"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "avainpalvelinvirhe"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -5349,16 +5353,16 @@ msgstr ""
"VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
"ajossa\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -5978,7 +5982,7 @@ msgstr ""
"heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
"yritettiin %d kertaa!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6555,7 +6559,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -6782,7 +6786,7 @@ msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -6826,21 +6830,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
@@ -6864,180 +6868,186 @@ msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "HUOM: avain on mitätöity!"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "virheellinen varmenne"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Avain saatavilla kohteessa: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "luo mitätöintivarmenne"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Tämä avain on vanhentunut!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "näytä sormenjälki"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "tarkista allekirjoitus"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "ei"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "tuntematon "
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "virhe: sormenjälki on väärä\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "virhe: sormenjälki on väärä\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7052,7 +7062,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@ -7139,7 +7149,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -7164,191 +7174,191 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
msgid "no valid recipients given\n"
msgstr "(Kuvausta ei annettu)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[tiedosto]|tee allekirjoitus"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "näytä salaiset avaimet"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "virheellinen varmenne"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "virheellinen varmenne"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "virheellinen varmenne"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "tuota ascii-koodattu tuloste"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "käytä oletusavainta oletusvastaanottajana"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "älä käytä lainkaan päätettä"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "käytä aina v3-allekirjoituksia"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "käytä aina MDC:tä salaamiseen"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "eräajo: älä kysy mitään"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "lisää tämä salainen avainrengas luetteloon"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|käytä salausalgoritmia NIMI"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|käytä pakkausalgoritmia N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7359,45 +7369,40 @@ msgstr ""
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Valitse millaisen avaimen haluat:\n"
@@ -7407,21 +7412,21 @@ msgstr "Valitse millaisen avaimen haluat:\n"
msgid "total number processed: %lu\n"
msgstr "Kaikkiaan käsitelty: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "luo mitätöintivarmenne"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7440,12 +7445,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "avainrengas \"%s\" luotu\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -7465,17 +7470,17 @@ msgstr "virhe luotaessa salasanaa: %s\n"
msgid "error storing certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7548,103 +7553,107 @@ msgstr "Allekirjoitus täsmää lähettäjään \""
msgid " aka"
msgstr " aka \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "lopeta|sulje"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "rivi on liian pitkä\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7672,31 +7681,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7760,7 +7774,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7770,166 +7784,169 @@ msgstr ""
"@Komennot:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "avaus onnistui\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "avaus onnistui\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [tiedostonimi]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, 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:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "ei voi avata tiedostoa: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "tiedostoa %s ei voi avata: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "etäohjelman suorittamista ei tueta\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8691,9 +8708,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NIMI|käytä salasanoihin viestintiivistealgoritmia NIMI"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "jätä avaintunnistekenttä pois salatuista paketeista"
diff --git a/po/fr.po b/po/fr.po
index 15f9c6b67..1cebd3dbf 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gaël Quéri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -94,8 +94,8 @@ msgstr "impossible de créer `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -198,13 +198,13 @@ msgstr ""
"secrète.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, 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:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -213,7 +213,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "changer la phrase de passe"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -233,13 +233,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "bavard"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
@@ -251,7 +251,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "lire les options de `%s'\n"
@@ -264,8 +264,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "chercher les clés avec un serveur de clés"
@@ -323,9 +323,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
@@ -343,140 +343,129 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erreur pendant la création de `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, 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:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de créer `%s': %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, 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:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "la mise à jour a échoué: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "écriture de la clé secrète dans `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "répertoire `%s' créé\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) échoué dans %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, 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:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignoré: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
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:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "le protocole gpg-agent version %d n'est pas supporté\n"
@@ -492,51 +481,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "mauvaise phrase de passe"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "annulé"
@@ -576,7 +565,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -589,7 +578,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -599,7 +588,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -611,19 +600,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "oui"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -669,12 +658,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erreur pendant la création de `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[Nom utilisateur introuvable]"
@@ -770,6 +759,16 @@ msgstr "oO"
msgid "cC"
msgstr "aA"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1180,13 +1179,13 @@ msgstr "--output n'est pas compatible avec cette commande\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1475,24 +1474,24 @@ msgstr ""
"La clé invalide %s a été rendue valide par\n"
"--allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1508,27 +1507,27 @@ msgstr "|[fichier]|faire une signature"
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "faire une signature détachée"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "chiffrer les données"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "vérifier une signature"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "lister les clés"
@@ -1540,11 +1539,11 @@ msgstr "lister les clés et les signatures"
msgid "list and check key signatures"
msgstr "lister et vérifier les signatures des clés"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "lister les clés et les empreintes"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "lister les clés secrètes"
@@ -1580,11 +1579,11 @@ msgstr "générer un certificat de révocation"
msgid "export keys"
msgstr "exporter les clés"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
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:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importer les clés d'un serveur de clés"
@@ -1620,12 +1619,12 @@ msgstr "mettre la base de confiance à jour"
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1635,31 +1634,31 @@ msgstr ""
"Options:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "créer une sortie ascii avec armure"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 désactive)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "ne rien changer"
@@ -1675,7 +1674,7 @@ msgstr "utiliser strictement le comportement OpenPGP"
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:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1683,7 +1682,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1723,7 +1722,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1751,7 +1750,7 @@ msgstr "Compression: "
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
@@ -1901,6 +1900,11 @@ msgstr ""
msgid "show expiration dates during signature listings"
msgstr "Pas de signature correspondante dans le porte-clés secret\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2039,7 +2043,7 @@ msgstr "%s:%d: options de vérification invalides\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
@@ -2084,11 +2088,11 @@ 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est invalide\n"
@@ -2330,7 +2334,7 @@ msgstr ""
"faire en sorte que les conflits d'horodatage ne soient qu'un\n"
"avertissement non fatal"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|écrire l'état sur ce descripteur"
@@ -3876,7 +3880,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "créé: %s"
@@ -3893,7 +3897,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "expire: %s"
@@ -3929,12 +3933,12 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "revoquée"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "expirée"
@@ -4818,189 +4822,189 @@ msgstr "%lu clés en antémémoire (%lu signatures)\n"
msgid "%s: keyring created\n"
msgstr "%s: porte-clés créé\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, 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:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "désactivé"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, 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:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clé « %s » introuvable dans le serveur de clés\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "clé non trouvée dans le serveur de clés\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "requête de la clé %s de %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "recherche de « %s » du serveur %s %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "recherche de « %s » de %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "envoi de la clé %s à %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "recherche de « %s » du serveur %s %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "recherche de « %s » de %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "pas d'action pour le serveur de clés !\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
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:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, 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:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, 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:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "le délai d'attente du serveur de clés a expiré\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "erreur interne du serveur de clés\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "erreur de communication avec le serveur de clés: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "« %s » n'est pas une ID de clé: ignoré\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "rafraîchissement d'une clé depuis %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "rafraîchissement de %d clés depuis %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -5359,18 +5363,18 @@ 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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, 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"
@@ -5986,7 +5990,7 @@ msgstr ""
"impossible d'éviter une clé faible pour le chiffrement symétrique:\n"
"%d essais ont eu lieu !\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6585,7 +6589,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "la signature a échoué: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "renommer `%s' en `%s' a échoué: %s \n"
@@ -6815,7 +6819,7 @@ msgstr "impossible d'accéder à %s - carte OpenPGP invalide ?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "lire les options de `%s'\n"
@@ -6856,21 +6860,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caractère %02X invalide en radix64 ignoré\n"
@@ -6894,180 +6898,186 @@ msgstr "le protocole gpg-agent version %d n'est pas supporté\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "Impossible d'ouvrir `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "il est interdit d'exporter les clé secrètes\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "le stockage de la clé a échoué: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTE: la clé a été révoquée"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "mauvais certificat"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Clé disponible sur: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "Impossible de vérifier la signature créée: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "générer un certificat de révocation"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Cette clé a expiré !"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "empreinte de l'autorité de certification: "
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "vérifier une signature"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "non"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[non positionné]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Erreur: réponse invalide.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Erreur: réponse invalide.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7083,7 +7093,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr ""
@@ -7172,7 +7182,7 @@ msgstr ""
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:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erreur pendant la lecture du bloc de clé : %s\n"
@@ -7197,202 +7207,202 @@ msgstr "la suppression du bloc de clés a échoué : %s\n"
msgid "no valid recipients given\n"
msgstr "(Aucune description donnée)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, 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:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, 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:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "lister les clés secrètes"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "mauvais certificat"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "enlever les clés du porte-clés public"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "mauvais certificat"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "mauvais certificat"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "ajouter une clé à une carte à puce"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "changer la phrase de passe"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "créer une sortie ascii avec armure"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
#, 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:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "vérifier les signatures"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "enlever les clés de ce porte-clés"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "Il faut la clé secrète pour faire cela.\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "algorithme de chiffrement inconnu"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "signature %s, algorithme de hachage %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "algorithme de compression inconnu"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7403,45 +7413,40 @@ 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:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "utilisation: gpg [options] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "impossible de se connecter à `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossible d'accéder à `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7451,21 +7456,21 @@ msgstr "Sélectionnez le type de clé à générer:\n"
msgid "total number processed: %lu\n"
msgstr " Quantité totale traitée: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "générer un certificat de révocation"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, 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:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7484,12 +7489,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "le porte-clés `%s` a été créé\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "impossible de stocker l'empreinte: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "le stockage de la clé a échoué: %s\n"
@@ -7513,17 +7518,17 @@ msgstr ""
"erreur durant la lecture des informations contenues actuellement\n"
"dans la clé: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7596,78 +7601,82 @@ msgstr "Bonne signature de « %s »"
msgid " aka"
msgstr " alias « %s »"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quitter"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "ligne trop longue"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "option `%s' inconnue\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "la signature a échoué: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, 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:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr ""
@@ -7675,26 +7684,26 @@ msgstr ""
"dans `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7722,31 +7731,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7810,7 +7823,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7820,166 +7833,170 @@ msgstr ""
"@Commandes:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "le déchiffrement a réussi\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "le déchiffrement a réussi\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nom du fichier]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s n'est pas permis avec %s !\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "fstat de `%s' échoué dans %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, 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:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, 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:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "erreur dans `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "aucun programme d'exécution distante n'est supporté\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "impossible de créer `%s': %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "impossible de créer `%s': %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "la mise à jour a échoué: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "la suppression du bloc de clés a échoué : %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "la mise à jour a échoué: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "la mise à jour a échoué: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "la mise à jour a échoué: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, 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:869
+#: tools/symcryptrun.c:850
#, 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:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "le hachage de protection %d n'est pas supporté\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
diff --git a/po/gl.po b/po/gl.po
index 21a70f092..cd9d2d50c 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -89,8 +89,8 @@ msgstr "non se pode crear `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
@@ -190,13 +190,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia-lo contrasinal"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "cambia-lo contrasinal"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -225,13 +225,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "lareto"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "ser un pouquiño máis calado"
@@ -243,7 +243,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
@@ -256,8 +256,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "buscar chaves nun servidor de chaves"
@@ -315,9 +315,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
@@ -335,138 +335,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opcións `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opcións de `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualización fallou: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directorio creado\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "o segredo da actualización fallou: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, 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"
@@ -482,51 +471,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "contrasinal erróneo"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Cancelar"
@@ -566,7 +555,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -579,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -589,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -601,19 +590,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "si|sim"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -657,12 +646,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "erro lendo `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erro ao crear `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: usuario non atopado\n"
@@ -756,6 +745,16 @@ msgstr ""
msgid "cC"
msgstr "v"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1189,13 +1188,13 @@ msgstr "--output non traballa con este comando\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1480,23 +1479,23 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1512,27 +1511,27 @@ msgstr "|[ficheiro]|facer unha sinatura"
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "cifrar datos"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "cifrar só con cifrado simétrico"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verificar unha sinatura"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "ve-la lista de chaves"
@@ -1545,11 +1544,11 @@ msgstr "ve-la lista de chaves e sinaturas"
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
@@ -1585,11 +1584,11 @@ msgstr "xerar un certificado de revocación"
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportar chaves a un servidor de chaves"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importar chaves dun servidor de chaves"
@@ -1625,12 +1624,12 @@ msgstr "actualiza-la base de datos de confianza"
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1640,31 +1639,31 @@ msgstr ""
"Opcións:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "crear saída con armadura en ascii"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifrar para NOME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "usar modo de texto canónico"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "usar coma ficheiro de saída"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "non facer ningún cambio"
@@ -1680,7 +1679,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1688,7 +1687,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1728,7 +1727,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1756,7 +1755,7 @@ msgstr "Compresión: "
msgid "usage: gpg [options] "
msgstr "uso: gpg [opcións] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
@@ -1880,6 +1879,11 @@ msgstr "amosar en que chaveiro está unha chave listada"
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2021,7 +2025,7 @@ msgstr "%s:%d: opcións de exportación non válidas\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
@@ -2063,11 +2067,11 @@ msgstr ""
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non é válido\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non é válido\n"
@@ -2303,7 +2307,7 @@ msgstr "toma-las chaves deste chaveiro"
msgid "make timestamp conflicts only a warning"
msgstr "converte-los conflictos de selo de data nun aviso"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la información de estado a este DF"
@@ -3873,7 +3877,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "non foi posible crear %s: %s\n"
@@ -3890,7 +3894,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
@@ -3926,13 +3930,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4819,185 +4823,185 @@ msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
msgid "%s: keyring created\n"
msgstr "%s: chaveiro creado\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, 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:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, 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:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando a chave %08lX de %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"asinado coa súa chave %08lX no %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opcións de exportación non válidas\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
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:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "a recepción do servidor de chaves fallou: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: non é un ID de chave válido\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@ -5346,17 +5350,17 @@ msgstr " creouse un novo ficheiro de configuración `%s'\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: chave de sesión cifrada simetricamente potencialmente insegura\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, 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"
@@ -5975,7 +5979,7 @@ msgstr ""
"non se pode evitar unha chave feble para o cifrado simétrico; tentouse %d "
"veces\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6554,7 +6558,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "non se puido abrir un ficheiro: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
@@ -6781,7 +6785,7 @@ msgstr "non se atoparon datos OpenPGP válidos.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "lendo as opcións de `%s'\n"
@@ -6825,21 +6829,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "carácter radix64 non válido %02x omitido\n"
@@ -6863,189 +6867,195 @@ msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "gravando a chave secreta en `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTA: a chave está revocada"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Certificado correcto"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Chave dispoñible en: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "fallou a comprobación da sinatura creada: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Certificado correcto"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "problema de lectura do certificado: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
#, fuzzy
msgid "certificate not yet valid"
msgstr "Revocación de certificado válida"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "problema de lectura do certificado: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
"Non se atoparon certificados con confianza non definida.\n"
"\n"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Pegada dactilar:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
#, 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:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "fallou a comprobación da sinatura creada: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Revocación de certificado válida"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
#, fuzzy
msgid "issuer certificate not found"
msgstr "Revocación de certificado válida"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verificar unha sinatura"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "non|nom"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "descoñecido"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "erro: pegada dactilar non válida\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "erro: pegada dactilar non válida\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7060,7 +7070,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@ -7147,7 +7157,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -7172,191 +7182,191 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
msgid "no valid recipients given\n"
msgstr "(Non se deu unha descrición)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "escribindo a `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[ficheiro]|facer unha sinatura"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "ve-la lista de chaves secretas"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "Revocación de certificado válida"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "borrar chaves do chaveiro público"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Certificado correcto"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Certificado correcto"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crear saída con armadura en ascii"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "usa-la chave por defecto coma o destinatario por defecto"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "non usa-la terminal en absoluto"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "forzar sinaturas v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "sempre usar un MDC para cifrar"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "modo por lotes: non preguntar nunca"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "asumir `si' na maioría das preguntas"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "asumir `non' na maioría das preguntas"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "engadir este chaveiro á lista de chaveiros"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "engadir este chaveiro secreto á lista"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|emprega-lo algoritmo de compresión N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7367,45 +7377,40 @@ msgstr ""
"asinar, verificar, cifrar ou descifrar\n"
"a operación por defecto depende dos datos de entrada\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpg [opcións] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "non se puido conectar a `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "escribindo a `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7415,21 +7420,21 @@ msgstr "Por favor, seleccione o tipo de chave que quere:\n"
msgid "total number processed: %lu\n"
msgstr "Número total procesado: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Certificado correcto"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erro lendo `%s': %s\n"
@@ -7448,12 +7453,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "chaveiro `%s' creado\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@ -7473,17 +7478,17 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
msgid "error storing certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema ao comproba-la revocación: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "erro lendo `%s': %s\n"
@@ -7556,104 +7561,108 @@ msgstr "Sinatura correcta de \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "abandonar"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "liña longa de máis\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "fallou a sinatura: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilitar depuración total"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7681,31 +7690,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, 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:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7769,7 +7783,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7779,168 +7793,171 @@ msgstr ""
"@Comandos:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "descifrado correcto\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "descifrado correcto\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [ficheiro]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "¡%s non se admite con %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, 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:346
+#: tools/symcryptrun.c:327
#, 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:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "non se puido abrir %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "non se soporta a execución remota de programas\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "non foi posible crear %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "non foi posible crear %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: non se atopou o usuario: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "a actualización fallou: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "a actualización fallou: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "a actualización fallou: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "a actualización fallou: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "non se pode crear `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "non se pode crear `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "o algoritmo de protección %d%s non está soportado\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8714,9 +8731,6 @@ msgstr "o algoritmo de protección %d%s non está soportado\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
diff --git a/po/hu.po b/po/hu.po
index 1dc9f6359..c042a9cac 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -89,8 +89,8 @@ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
@@ -189,13 +189,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "jelszóváltoztatás"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "jelszóváltoztatás"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -224,13 +224,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "bõbeszédû mód"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "még szûkszavúbb mód"
@@ -242,7 +242,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|fájl|bõvítõ modul betöltése"
@@ -255,8 +255,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "kulcsok keresése kulcsszerveren"
@@ -312,9 +312,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "A hibákat (angolul) a <gnupg-bugs@gnu.org> címre írja meg!\n"
@@ -330,138 +330,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opciós fájl: %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Hiba \"%s\" létrehozásakor: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, 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:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozható létre: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, 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:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: Könyvtárat létrehoztam.\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
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:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
@@ -477,51 +466,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "rossz jelszó"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Mégsem"
@@ -561,7 +550,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -574,7 +563,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -584,7 +573,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -596,19 +585,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "igen"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -652,12 +641,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "Hiba \"%s\" létrehozásakor: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[ismeretlen kulcs]"
@@ -751,6 +740,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1183,13 +1182,13 @@ msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1469,23 +1468,23 @@ msgstr ""
"%08lX érvénytelen kulcsot érvényesítettük az\n"
"--allow-non-selfsigned-uid opcióval.\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1501,27 +1500,27 @@ msgstr "|[fájl]|aláírás készítése"
msgid "|[file]|make a clear text signature"
msgstr "|[fájl]|olvasható szöveg aláírása"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "különálló aláírás készítése"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "adat titkosítása"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "titkosítás csak szimmetrikus rejtjelezõvel"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "adat visszafejtése (alapértelmezés)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "aláírás ellenõrzése"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "kulcsok listázása"
@@ -1534,11 +1533,11 @@ msgstr "kulcsok és aláírások listázása"
msgid "list and check key signatures"
msgstr "kulcsaláírások ellenõrzése"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "kulcsok és ujjlenyomatok listázása"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "titkos kulcsok listázása"
@@ -1574,11 +1573,11 @@ msgstr "visszavonási igazolás készítése"
msgid "export keys"
msgstr "kulcsok exportálása"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "kulcsok exportálása kulcsszerverre"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "kulcsok importálása kulcsszerverrõl"
@@ -1614,12 +1613,12 @@ msgstr "bizalmi adatbázis frissítése"
msgid "|algo [files]|print message digests"
msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1629,31 +1628,31 @@ msgstr ""
"Opciók:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "ascii páncélozott kimenet létrehozása"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NÉV|titkosítás NÉV részére"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "kanonikus szöveges mód használata"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "kimeneti állomány megadása"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "ne csináljon semmi változtatást"
@@ -1669,7 +1668,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1677,7 +1676,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1715,7 +1714,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1743,7 +1742,7 @@ msgstr "Tömörítõ (compression): "
msgid "usage: gpg [options] "
msgstr "Használat: gpg [opciók] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "Egymásnak ellentmondó parancsok!\n"
@@ -1867,6 +1866,11 @@ msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2007,7 +2011,7 @@ msgstr "%s:%d: Érvénytelen export opciók!\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
@@ -2047,11 +2051,11 @@ msgstr "Csak állományokat (pipe-ot nem) használhat --pgp2 módban!\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
@@ -2287,7 +2291,7 @@ msgstr "a megadott kulcskarikáról vegye a kulcsokat"
msgid "make timestamp conflicts only a warning"
msgstr "idõbélyeg-konfliktus esetén csak figyelmeztessen"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
@@ -3849,7 +3853,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s nem hozható létre: %s\n"
@@ -3866,7 +3870,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [lejár: %s]"
@@ -3902,13 +3906,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4787,187 +4791,187 @@ msgstr "%lu kulcsot ellenõriztem (%lu aláírással).\n"
msgid "%s: keyring created\n"
msgstr "%s: Kulcskarikát létrehoztam.\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, 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:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Érvénytelen export opciók!\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "\"%s\" kulcs nem található: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "\"%s\" kulcs nem található: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, 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:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "Érvénytelen export opciók!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "kulcsszerverhiba"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "kulcsszerverhiba"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -5319,17 +5323,17 @@ 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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
@@ -5947,7 +5951,7 @@ msgstr ""
"Nem tudom elkerülni a gyenge kulcsot a szimmetrikus titkosítóhoz.\n"
"%d alkalommal próbáltam!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6518,7 +6522,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "Nem tudom megnyitni az állományt: %s.\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
@@ -6743,7 +6747,7 @@ msgstr "Nem találtam érvényes OpenPGP adatot.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
@@ -6787,21 +6791,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
@@ -6825,180 +6829,186 @@ msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "rossz igazolás"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Kulcs található: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, 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:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "visszavonási igazolás készítése"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Ez a kulcs lejárt!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "megmutatja az ujjlenyomatot"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "aláírás ellenõrzése"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "A DSA 160 bites hash (kivonatoló) algoritmust igényel.\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "nem"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "Ismeretlen módú"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7014,7 +7024,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@ -7101,7 +7111,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "\"%s\" kulcs nem található: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@ -7126,191 +7136,191 @@ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
msgid "no valid recipients given\n"
msgstr "(Nincs leírás.)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "Írok a \"%s\" állományba.\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[fájl]|aláírás készítése"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[fájl]|olvasható szöveg aláírása"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "titkos kulcsok listázása"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "rossz igazolás"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "rossz igazolás"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "rossz igazolás"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "jelszóváltoztatás"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ascii páncélozott kimenet létrehozása"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "alapért. kulcs haszn. alapért. címzettként"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "ne használja a terminált egyáltalán"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "3-as verziójú aláírások erõltetése"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "mindig használjon MDC-t titkosításkor"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "kötegelt mód: soha nem kérdez"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "igen válasz feltételezése a legtöbb kérdésre"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "nem válasz feltételezése a legtöbb kérdésre"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "kulcskarika hozzáadása a kulcskarikalistához"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "titkoskulcs-karika hozzáadása a listához"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NÉV|terminál karakterkódolásának megadása"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|fájl|bõvítõ modul betöltése"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NÉV|NÉV rejtjelezõ algoritmus használata"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|N. sorszámú tömörítõ algoritmus használata"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, 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:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7321,45 +7331,40 @@ 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:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "Használat: gpg [opciók] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "Írok a \"%s\" állományba.\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, 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:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7369,21 +7374,21 @@ msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
msgid "total number processed: %lu\n"
msgstr " Összesen feldolgoztam: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "visszavonási igazolás készítése"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -7402,12 +7407,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "\"%s\" kulcskarikát létrehoztam.\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@ -7427,17 +7432,17 @@ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
msgid "error storing certificate: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? Nem tudom ellenõrizni a visszavonást: %s.\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -7510,103 +7515,107 @@ msgstr "Jó aláírás a következõtõl: \""
msgid " aka"
msgstr " azaz \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "kilépés|kilepes"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "A sor túl hosszú!\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "Aláírás sikertelen: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, 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:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7634,31 +7643,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NÉV|NÉV rejtjelezõ algoritmus haszn. jelszavakhoz"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7722,7 +7736,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7732,166 +7746,169 @@ msgstr ""
"@Parancsok:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "Visszafejtés rendben.\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "Visszafejtés rendben.\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [fájlnév]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, 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:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "Nem tudom megnyitni az állományt: %s.\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, 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:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "Nem tudom megnyitni %s-t: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "Külsõ program meghívása nem támogatott.\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s nem hozható létre: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s nem hozható létre: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "Frissítés sikertelen: %s.\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, 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:869
+#: tools/symcryptrun.c:850
#, 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:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "%d%s védõ algoritmus nem támogatott.\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "A DSA 160 bites hash (kivonatoló) algoritmust igényel.\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8655,9 +8672,6 @@ msgstr "%d%s védõ algoritmus nem támogatott.\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NÉV|NÉV kivonatoló algoritmus haszn. jelszavakhoz"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NÉV|NÉV rejtjelezõ algoritmus haszn. jelszavakhoz"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "titkosított csomagok keyid mezõjének eldobása"
diff --git a/po/id.po b/po/id.po
index 8073eb97c..f08f43d7b 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -91,8 +91,8 @@ msgstr "tidak dapat membuat %s: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -191,13 +191,13 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ubah passphrase"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -206,7 +206,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "ubah passphrase"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -226,13 +226,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detil"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "lebih diam"
@@ -244,7 +244,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
@@ -257,8 +257,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cari kunci di key server"
@@ -314,9 +314,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
@@ -332,138 +332,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: direktori tercipta\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "protokol gpg-agent versi %d tidak didukung\n"
@@ -479,51 +468,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase yang buruk"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Batal"
@@ -563,7 +552,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -576,7 +565,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -586,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -598,19 +587,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "y|ya"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -654,12 +643,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[User id tidak ditemukan]"
@@ -753,6 +742,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1186,13 +1185,13 @@ msgstr "--output tidak berfungsi untuk perintah ini\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1472,22 +1471,22 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1503,27 +1502,27 @@ msgstr "|[file]|buat signature"
msgid "|[file]|make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "buat detached signature"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "enkripsi data"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verifikasi signature"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "tampilkan kunci"
@@ -1536,11 +1535,11 @@ msgstr "tampilkan kunci dan signature"
msgid "list and check key signatures"
msgstr "periksa signature kunci"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
@@ -1576,11 +1575,11 @@ msgstr "buat sertifikat revokasi"
msgid "export keys"
msgstr "ekspor kunci"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
@@ -1616,12 +1615,12 @@ msgstr "perbarui database trust"
msgid "|algo [files]|print message digests"
msgstr "|algo [file]|cetak digest pesan"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1631,31 +1630,31 @@ msgstr ""
"Pilihan:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "gunakan sebagai file output"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "jangan buat perubahan"
@@ -1671,7 +1670,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1679,7 +1678,7 @@ msgstr ""
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1717,7 +1716,7 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1745,7 +1744,7 @@ msgstr "Kompresi: "
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
@@ -1869,6 +1868,11 @@ msgstr "tampilkan keyring tempat kunci yang dipilih berada"
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2009,7 +2013,7 @@ msgstr "%s:%d: opsi ekspor tidak valid\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
@@ -2055,11 +2059,11 @@ msgstr ""
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
@@ -2297,7 +2301,7 @@ msgstr "mengambil kunci ini dari keyring"
msgid "make timestamp conflicts only a warning"
msgstr "buat timestamp konflik hanya sebagai peringatan"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
@@ -3866,7 +3870,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "tidak dapat membuat %s: %s\n"
@@ -3883,7 +3887,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [berakhir: %s]"
@@ -3919,13 +3923,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4804,184 +4808,184 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "meminta kunci %08lX dari %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "kesalahan keyserver"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "kesalahan keyserver"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -5327,16 +5331,16 @@ msgstr "file konfigurasi baru `%s' tercipta\n"
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:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -5950,7 +5954,7 @@ 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
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6521,7 +6525,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "tidak dapat membuka file: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
@@ -6746,7 +6750,7 @@ msgstr "tidak ditemukan data OpenPGP yang valid.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "membaca pilihan dari `%s'\n"
@@ -6790,21 +6794,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "karakter radix64 tidak valid %02x dilewati\n"
@@ -6828,180 +6832,186 @@ msgstr "protokol gpg-agent versi %d tidak didukung\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "protokol gpg-agent versi %d tidak didukung\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "CATATAN: kunci telah dibatalkan"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "sertifikat yang buruk"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Kunci tersedia di:"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "buat sertifikat revokasi"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Kunci ini telah berakhir!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "tampilkan fingerprint"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifikasi signature"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "n|t|tidak"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "tidak dikenal"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "kesalahan: fingerprint tidak valid\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "kesalahan: fingerprint tidak valid\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7016,7 +7026,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@ -7103,7 +7113,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "gagal membaca keyblock: %s\n"
@@ -7128,191 +7138,191 @@ msgstr "gagal menghapus keyblok: %s\n"
msgid "no valid recipients given\n"
msgstr "(Tidak diberikan deskripsi)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "menulis ke `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[file]|buat signature"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "tampilkan kunci rahasia"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "sertifikat yang buruk"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "hapus kunci dari keyring publik"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "sertifikat yang buruk"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "sertifikat yang buruk"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ciptakan output ascii"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "gunakan kunci baku sebagai penerima baku"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "jangan menggunakan terminal"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "paksa signature v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "selalu gunakan MDC untuk enkripsi"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "mode batch: tanpa tanya"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "asumsikan ya untuk seluruh pertanyaan"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "asumsikan tidak untuk seluruh pertanyaan"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "tambah keyring ini ke daftar keyring"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "tambah keyring rahasia ini ke daftar"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAMA|set charset terminal ke NAMA"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FILE|muat modul ekstensi FILE"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMA|gunakan algoritma cipher NAMA"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|gunakan algoritma kompresi N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7323,45 +7333,40 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "menulis ke `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
@@ -7371,21 +7376,21 @@ msgstr "Silakan pilih kunci yang anda inginkan:\n"
msgid "total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "buat sertifikat revokasi"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@ -7404,12 +7409,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "%s: keyring tercipta\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -7429,17 +7434,17 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
msgid "error storing certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? masalah memeriksa pembatalan: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@ -7512,103 +7517,107 @@ msgstr "Signature baik dari \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "q|k|keluar"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "baris terlalu panjang\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "gagal menandai: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7636,31 +7645,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7724,7 +7738,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7734,166 +7748,169 @@ msgstr ""
"@Perintah:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "dekripsi lancar\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "dekripsi lancar\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [namafile]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "tidak dapat membuka file: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "tidak dapat membuka %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "tidak ada eksekusi program remote yang didukung\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8653,9 +8670,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "buang field keyid paket terenkripsi"
diff --git a/po/it.po b/po/it.po
index b29d777ed..5afd75176 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-06-16 17:01+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -89,8 +89,8 @@ msgstr "impossibile creare `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -189,13 +189,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia la passphrase"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "cambia la passphrase"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -224,13 +224,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolisso"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "meno prolisso"
@@ -242,7 +242,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
@@ -255,8 +255,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca delle chiavi su un key server"
@@ -312,9 +312,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
@@ -330,138 +330,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "errore creando `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directory creata\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non è disponibile in questa sessione\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
@@ -477,51 +466,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase errata"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Cancella"
@@ -561,7 +550,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -574,7 +563,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -584,7 +573,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -596,19 +585,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "si|sì"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -652,12 +641,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "errore leggendo `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "errore creando `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[User ID non trovato]"
@@ -751,6 +740,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1185,13 +1184,13 @@ msgstr "--output non funziona con questo comando\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1480,23 +1479,23 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1512,27 +1511,27 @@ msgstr "|[file]|fai una firma"
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "elenca le chiavi"
@@ -1545,11 +1544,11 @@ msgstr "elenca le chiavi e le firme"
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
@@ -1585,11 +1584,11 @@ msgstr "genera un certificato di revoca"
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
@@ -1625,12 +1624,12 @@ msgstr "aggiorna il database della fiducia"
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1640,31 +1639,31 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "non fa cambiamenti"
@@ -1680,7 +1679,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1688,7 +1687,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1726,7 +1725,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1754,7 +1753,7 @@ msgstr "Compressione: "
msgid "usage: gpg [options] "
msgstr "uso: gpg [opzioni] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
@@ -1878,6 +1877,11 @@ msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2021,7 +2025,7 @@ msgstr "%s:%d: opzioni di esportazione non valide\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
@@ -2063,11 +2067,11 @@ 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non è valido\n"
@@ -2303,7 +2307,7 @@ msgstr "prende le chiavi da questo portachiavi"
msgid "make timestamp conflicts only a warning"
msgstr "segnala i conflitti di data solo con un avvertimento"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
@@ -3874,7 +3878,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossibile creare %s: %s\n"
@@ -3891,7 +3895,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[scadenza: %s]"
@@ -3928,13 +3932,13 @@ msgstr ""
"corretta\n"
"finchè non eseguirai di nuovo il programma.\n"
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4823,92 +4827,92 @@ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, 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:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
@@ -4916,94 +4920,94 @@ msgstr ""
"firmata con la tua chiave %08lX il %s\n"
"\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "errore del keyserver"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "errore del keyserver"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@ -5351,18 +5355,18 @@ msgstr ""
"ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
"esecuzione del programma\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -5985,7 +5989,7 @@ msgstr ""
"Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
"ho provato %d volte!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6569,7 +6573,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "impossibile aprire il file: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
@@ -6794,7 +6798,7 @@ msgstr "Non sono stati trovati dati OpenPGP validi.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "lettura delle opzioni da `%s'\n"
@@ -6838,21 +6842,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
@@ -6876,180 +6880,186 @@ msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTA: la chiave è stata revocata"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "certificato danneggiato"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Chiave disponibile presso: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "controllo della firma creata fallito: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "genera un certificato di revoca"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Questa chiave è scaduta!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "mostra le impronte digitali"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifica una firma"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "sconosciuto"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "errore: impronta digitale non valida\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "errore: impronta digitale non valida\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7064,7 +7074,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@ -7151,7 +7161,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
@@ -7176,191 +7186,191 @@ msgstr "cancellazione del keyblock fallita: %s\n"
msgid "no valid recipients given\n"
msgstr "(Non è stata data una descrizione)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "scrittura in `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[file]|fai una firma"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "elenca le chiavi segrete"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "certificato danneggiato"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "certificato danneggiato"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "certificato danneggiato"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea un output ascii con armatura"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usa NOME come destinatario predefinito"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "usa la chiave predefinita come destinatario predefinito"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "non usa per niente il terminale"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "forza l'uso di firme v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "usa sempre un MDC per cifrare"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "modo batch: non fa domande"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "risponde \"sì\" a quasi tutte le domande"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "risponde \"no\" a quasi tutte le domande"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "aggiungi questo portachiavi segreto alla lista"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOME|imposta NOME come set di caratteri del terminale"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa l'algoritmo di cifratura NOME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa l'algoritmo di message digest NOME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|usa l'algoritmo di compressione N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7371,45 +7381,40 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpg [opzioni] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "scrittura in `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent non è disponibile in questa sessione\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7419,21 +7424,21 @@ msgstr "Per favore scegli che tipo di chiave vuoi:\n"
msgid "total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "genera un certificato di revoca"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@ -7452,12 +7457,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "portachiavi `%s' creato\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
@@ -7477,17 +7482,17 @@ msgstr "errore nella creazione della passhprase: %s\n"
msgid "error storing certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema controllando la revoca: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@ -7560,103 +7565,107 @@ msgstr "Firma valida da \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "riga troppo lunga\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "firma fallita: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "errore leggendo `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7684,31 +7693,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, 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:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7772,7 +7786,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7782,166 +7796,169 @@ msgstr ""
"@Comandi:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "decifratura corretta\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "decifratura corretta\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nomefile]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "Non è permesso usare %s con %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "impossibile aprire il file: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "l'esecuzione remota dei programmi non è gestita\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "impossibile creare `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "impossibile creare `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8707,9 +8724,6 @@ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "elimina il campo keyid dei pacchetti cifrati"
diff --git a/po/ja.po b/po/ja.po
index ec944ae8f..3f165cf32 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -92,8 +92,8 @@ msgstr "¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó: %s\n"
@@ -192,13 +192,13 @@ msgstr ""
"ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -207,7 +207,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -227,13 +227,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "¾éĹ"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "¤ä¤äÀŤ«"
@@ -245,7 +245,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n"
@@ -258,8 +258,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸°¤ò¸¡º÷¤¹¤ë"
@@ -315,9 +315,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n"
@@ -333,138 +333,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×: %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "¡Ö%s¡×¤Ç¿®Íѥ쥳¡¼¥É¤Î¸¡º÷¥¨¥é¡¼: %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d)¤¬%s¤Ç¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "ÈëÌ©¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ¥¹¥­¥Ã¥×: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO´Ä¶­ÊÑ¿ô¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
@@ -480,51 +469,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹ \n"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹ \n"
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹ \n"
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔÀµ¤Ç¤¹"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "¥­¥ã¥ó¥»¥ë"
@@ -564,7 +553,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -577,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -587,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -599,19 +588,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -655,12 +644,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[¥æ¡¼¥¶¡¼ID¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]"
@@ -753,6 +742,16 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1157,13 +1156,13 @@ msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n"
msgid "can't open `%s'\n"
msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó\n"
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1430,22 +1429,22 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%s¤Ç¤¹\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "¸ø³«Éû¸°%s¤Ë¤¿¤¤¤¹¤ëÈëÌ©Éû¸°¤¬¤¢¤ê¤Þ¤»¤ó - ̵»ë\n"
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "Éû¸°%s¤ò¼ç¸°%s¤ËÂåÍѤ·¤Þ¤¹\n"
-#: g10/getkey.c:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1461,27 +1460,27 @@ msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®"
msgid "|[file]|make a clear text signature"
msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "ʬΥ½ð̾¤òºîÀ®"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "°Å¹æ²½¤Ë¤ÏÂоΰŹæË¡¤Î¤ß¤ò»ÈÍÑ"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "¥Ç¡¼¥¿¤òÉü¹æ (´ûÄê)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "½ð̾¤ò¸¡¾Ú"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "¸°¤Î°ìÍ÷"
@@ -1493,11 +1492,11 @@ msgstr "¸°¤È½ð̾¤Î°ìÍ÷"
msgid "list and check key signatures"
msgstr "¸°½ð̾¤Î¸¡ºº¤È°ìÍ÷"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "¸°¤È»ØÌæ¤Î°ìÍ÷"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "ÈëÌ©¸°¤Î°ìÍ÷"
@@ -1533,11 +1532,11 @@ msgstr "¼º¸ú¾ÚÌÀ½ñ¤òÀ¸À®"
msgid "export keys"
msgstr "¸°¤ò½ñ¤­½Ð¤¹"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à"
@@ -1573,12 +1572,12 @@ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
msgid "|algo [files]|print message digests"
msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤òɽ¼¨"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1588,35 +1587,35 @@ msgstr ""
"¥ª¥×¥·¥ç¥ó:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr ""
"½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n"
"¤ò»ÈÍÑ"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n"
"(0¤ÏÈó°µ½Ì)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "̵Êѹ¹"
@@ -1632,7 +1631,7 @@ msgstr "¸·Ì©¤ÊOpenPGP¤Î¿¶Éñ¤òºÎÍÑ"
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x¸ß´¹¤Î¥á¥Ã¥»¡¼¥¸¤òÀ¸À®"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1641,7 +1640,7 @@ msgstr ""
"(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n"
"¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1679,7 +1678,7 @@ msgstr ""
"½ð̾¡¢¸¡ºº¡¢°Å¹æ²½¤äÉü¹æ\n"
"´ûÄê¤ÎÁàºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1707,7 +1706,7 @@ msgstr "°µ½Ì: "
msgid "usage: gpg [options] "
msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "ÂÐΩ¤¹¤ë¥³¥Þ¥ó¥É\n"
@@ -1831,6 +1830,11 @@ msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤Îȿž"
msgid "show expiration dates during signature listings"
msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1967,7 +1971,7 @@ msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n"
@@ -2007,11 +2011,11 @@ msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æË¡¤¬É¬ÍפǤ¹\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n"
@@ -2239,7 +2243,7 @@ msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹"
msgid "make timestamp conflicts only a warning"
msgstr "Æü»þ¤ÎÌ·½â¤ò·Ù¹ð¤À¤±¤Ë¤·¤Þ¤¹"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr ""
"|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n"
@@ -3759,7 +3763,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "ºîÀ®: %s"
@@ -3776,7 +3780,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "Ëþλ: %s"
@@ -3812,12 +3816,12 @@ msgstr ""
"¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n"
"¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "¼º¸ú"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "Ëþλ"
@@ -4670,178 +4674,178 @@ msgstr "%lu¸Ä¤Î¸°¤ò¥­¥ã¥Ã¥·¥åºÑ (%lu¸Ä¤Î½ð̾)\n"
msgid "%s: keyring created\n"
msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
"·Ù¹ð: ¸°¥µ¡¼¥Ð¡¼¤Î¥ª¥×¥·¥ç¥ó¡Ö%s¡×¤Ï¡¢¤³¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï»È¤¨¤Þ¤»¤ó\n"
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "disabled"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "ÈÖ¹æ(s)¡¢N)¼¡¡¢¤Þ¤¿¤ÏQ)Ãæ»ß¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ >"
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥×¥í¥È¥³¥ë¤Ç¤¹ (us %d!=handler %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "¸°¡È%s¡É¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "¸°¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "¸°%s¤ò%s¤«¤é¥µ¡¼¥Ð¡¼%s¤ËÍ×µá\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "¸°%s¤ò%s¤ËÍ×µá\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "¸°%s¤ò%s¥µ¡¼¥Ð¡¼%s¤ØÁ÷¿®\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "¸°%s¤ò%s¤ØÁ÷¿®\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¢¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "·Ù¹ð: ÊÌÈÇ (%s) ¤ÎGnuPG¤Î¸°¥µ¡¼¥Ð¡¼¡¦¥Ï¥ó¥É¥é\n"
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "¸°¥µ¡¼¥Ð¡¼¤ÏVERSION¤òÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤¬¤¢¤ê¤Þ¤»¤ó (¥ª¥×¥·¥ç¥ó--keyserver¤ò»È¤¤¤Þ¤·¤ç¤¦)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr "¤³¤Î¹½ÃۤǤϡ¢³°Éô¸°¥µ¡¼¥Ð¡¼¤Î¸Æ½Ð¤·¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×ÍѤΥϥó¥É¥é¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "Áàºî¡Ö%s¡×¤Ï¡¢¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s¤Ï¡¢¥Ï¥ó¥É¥é%dÈǤò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¿¥¤¥à¥¢¥¦¥È\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎÆâÉô¥¨¥é¡¼\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "¸°¥µ¡¼¥Ð¡¼ÄÌ¿®¥¨¥é¡¼: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "¡È%s¡É¸°ID¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤Ð¤·¤Þ¤¹\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1Ëܤθ°¤ò%s¤«¤é²óÉü\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%dËܤθ°¤ò%s¤«¤é²óÉü\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -5184,16 +5188,16 @@ msgstr "¿·¤·¤¤¹½À®¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr "·Ù¹ð: ¡Ö%s¡×¤Î¥ª¥×¥·¥ç¥ó¤Ïµ¯Æ°¤·¤Æ¤¤¤ë´Ö¡¢Í­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "·Ù¹ð: ÀøºßŪ¤Ë·õÆݤÊÂоΰŹ沽¥»¥Ã¥·¥ç¥ó¸°¤Ç¤¹\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "·¿%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n"
@@ -5781,7 +5785,7 @@ msgstr "¼å¤¤¸°¤¬¤Ç¤­¤Þ¤·¤¿ - ºÆ¼Â¹Ô\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d²ó»î¤ß¤Þ¤·¤¿!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6332,7 +6336,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "¡Ö%s¡×¤«¤é¡Ö%s¡×¤Ø¤Î°ÜÆ°¤Ë¼ºÇÔ: %s\n"
@@ -6554,7 +6558,7 @@ msgstr "%s¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó - ̵¸ú¤ÊOpenPGP¥«¡¼¥É?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n"
@@ -6595,21 +6599,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "̵¸ú¤Ê64¿Êʸ»ú%02X¤ò¤È¤Ð¤·¤Þ¤·¤¿\n"
@@ -6633,180 +6637,186 @@ msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "ÈëÌ©¸°¤Î½ñ½Ð¤·¤Ï¶Ø»ß¤Ç¤¹\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "¸°¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "Ãí°Õ: ¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "ÉÔÀµ¤Ê¾ÚÌÀ½ñ¤Ç¤¹"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "°Ê²¼¤Ë¸°¤¬¤¢¤ê¤Þ¤¹: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "ºîÀ®¤µ¤ì¤¿½ð̾¤Î¸¡ºº¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "¼º¸ú¾ÚÌÀ½ñ¤òÀ¸À®"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "¤³¤Î¸°¤ÏËþλ¤Ç¤¹!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA¤Î»ØÌæ: "
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "ºîÀ®¤µ¤ì¤¿½ð̾¤Î¸¡ºº¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "½ð̾¤ò¸¡¾Ú"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA¤Ç¤Ï160¥Ó¥Ã¥È¤Î¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¤Î»ÈÍѤ¬É¬ÍפǤ¹\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[̤ÀßÄê]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "¥¨¥é¡¼: ̵¸ú¤Ê±þÅú¡£\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "¥¨¥é¡¼: ̵¸ú¤Ê±þÅú¡£\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6821,7 +6831,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "¸½¹Ô¸°¾ðÊó¤Î¼èÆÀ¥¨¥é¡¼: %s\n"
@@ -6908,7 +6918,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "ÈëÌ©¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "¸°¥Ö¥í¥Ã¥¯¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
@@ -6933,200 +6943,200 @@ msgstr "¸°¥Ö¥í¥Ã¥¯¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
msgid "no valid recipients given\n"
msgstr "(ÀâÌÀ¤Ï¤¢¤ê¤Þ¤»¤ó)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "ÈëÌ©¸°¤Î°ìÍ÷"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "ÉÔÀµ¤Ê¾ÚÌÀ½ñ¤Ç¤¹"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "¸ø³«¸°Îؤ«¤é¸°·²¤òºï½ü"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "ÉÔÀµ¤Ê¾ÚÌÀ½ñ¤Ç¤¹"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "ÉÔÀµ¤Ê¾ÚÌÀ½ñ¤Ç¤¹"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Ø¸°¤ÎÄɲÃ"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
#, fuzzy
msgid "use the default key as default recipient"
msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¼è¿Í¤È¤·¤Æ¤â¤¦ÀßÄêºÑ¤ß¤Ç¤¹\n"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "½ð̾¤Î¼º¸ú"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "̤ÃΤΰŹ楢¥ë¥´¥ê¥º¥à¤Ç¤¹"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "̤ÃΤΰµ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7137,45 +7147,40 @@ msgstr ""
"½ð̾¡¢¸¡ºº¡¢°Å¹æ²½¤äÉü¹æ\n"
"´ûÄê¤ÎÁàºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "¡Ö%s¡×¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "¡Ö%s¡×¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "À¸À®¤¹¤ë¸°¤Î·¿¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n"
@@ -7185,21 +7190,21 @@ msgstr "À¸À®¤¹¤ë¸°¤Î·¿¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n"
msgid "total number processed: %lu\n"
msgstr " ½èÍý¿ô¤Î¹ç·×: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "¼º¸ú¾ÚÌÀ½ñ¤òÀ¸À®"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "ÄÌÈ֤μèÆÀ¥¨¥é¡¼: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
@@ -7218,12 +7223,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "¸°ÎØ¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "»ØÌæ¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "¸°¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -7243,17 +7248,17 @@ msgstr "ÄÌÈ֤μèÆÀ¥¨¥é¡¼: %s\n"
msgid "error storing certificate: %s\n"
msgstr "ÄÌÈ֤μèÆÀ¥¨¥é¡¼: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "¿·¤·¤¤PIN¤Î¼èÆÀ¥¨¥é¡¼: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
@@ -7326,103 +7331,107 @@ msgstr "¡È%s¡É¤«¤é¤ÎÀµ¤·¤¤½ð̾"
msgid " aka"
msgstr " ÊÌ̾¡È%s¡É"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¡Ö%s¡×\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "¸°¤ÎÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "¡Ö%s¡×¤Ç¿®Íѥ쥳¡¼¥É¤Î¸¡º÷¥¨¥é¡¼: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7450,31 +7459,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7538,7 +7551,7 @@ msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
msgid "error allocating enough memory: %s\n"
msgstr "¸°ÎØ¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7548,166 +7561,169 @@ msgstr ""
"@¥³¥Þ¥ó¥É:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "Éü¹æ¤ËÀ®¸ù\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "Éü¹æ¤ËÀ®¸ù\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [¥Õ¥¡¥¤¥ë̾]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "¡Ö%s¡×¤Îfstat¤¬%s¤Ç¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "¡Ö%s¡×¤Ç¥¨¥é¡¼: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "±ó³Ö¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤Ï¡¢¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "¸°¥Ö¥í¥Ã¥¯¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ÊݸîÍ×Ìó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA¤Ç¤Ï160¥Ó¥Ã¥È¤Î¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¤Î»ÈÍѤ¬É¬ÍפǤ¹\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
diff --git a/po/nb.po b/po/nb.po
index 375202a17..3fbd7de8c 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -92,8 +92,8 @@ msgstr "kan ikke opprette «%s»: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke åpne «%s»: %s\n"
@@ -192,13 +192,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "endre passfrasen"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -207,7 +207,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "endre passfrasen"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -227,13 +227,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "fyldig output"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "være noenlunde stille"
@@ -245,7 +245,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "leser valg fra «%s»\n"
@@ -258,8 +258,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "søke etter nøkler på en nøkkelserver"
@@ -315,9 +315,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
@@ -333,137 +333,126 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil «%s»\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil «%s»: %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra «%s»\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "kan ikke opprette katalogen «%s»: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke opprette «%s»: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, 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:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skriver hemmelig nøkkel til «%s»\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "katalogen «%s» ble opprettet\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "kan ikke opprette katalogen «%s»: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "oppdatering av hemmelig mislyktes: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: hoppet over: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr ""
@@ -479,48 +468,48 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Bruksmåte: gpg [valg] [filer] (-h for hjelp)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "ugyldig passfrase"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "cancel|cancel"
@@ -560,7 +549,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "feil ved lesing av «%s»: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -573,7 +562,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -583,7 +572,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -595,19 +584,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "ja"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -651,12 +640,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "feil ved lesing av «%s»: %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "feil ved lesing av nøkkelblokk: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[Brukerid ikke funnet]"
@@ -746,6 +735,16 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1148,13 +1147,13 @@ msgstr "--output virker ikke for denne kommandoen\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1427,22 +1426,22 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1458,27 +1457,27 @@ msgstr "|[fil]|lage en signatur"
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|lage en klartekstsignatur"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "lage en adskilt signatur"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "kryptere data"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "kryptering med bare symmetrisk cipher"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "dekryptere data (standard)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "bekrefte en signatur"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "liste nøkler"
@@ -1490,11 +1489,11 @@ msgstr "liste nøkler og signaturer"
msgid "list and check key signatures"
msgstr "vise og sjekke nøkkelsignaturer"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "liste nøkler og fingeravtrykk"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "liste hemmelige nøkler"
@@ -1530,11 +1529,11 @@ msgstr "generere et opphevingssertifikat"
msgid "export keys"
msgstr "eksportere nøkler"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "eksportere nøkler til en nøkkelserver"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importere nøkler fra en nøkkelserver"
@@ -1570,12 +1569,12 @@ msgstr "oppdatere tillitsdatabasen"
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skrive meldingsdigester"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1585,31 +1584,31 @@ msgstr ""
"Valg:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "lage ASCII-beskyttet output"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAVN|kryptere for NAVN"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "bruke denne brukeriden for signering eller dekryptering"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "bruk som outputfil"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "ikke gjør noen endringer"
@@ -1625,7 +1624,7 @@ msgstr "bruk streng OpenPGP-oppførsel"
msgid "generate PGP 2.x compatible messages"
msgstr "generere PGP 2.x-kompatible meldinger"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1633,7 +1632,7 @@ msgstr ""
"@\n"
"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1671,7 +1670,7 @@ msgstr ""
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1699,7 +1698,7 @@ msgstr "Kompresjon: "
msgid "usage: gpg [options] "
msgstr "bruksmåte: gpg [valg] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
@@ -1829,6 +1828,11 @@ msgstr "vise navnet til nøkkelknippene i nøkkellister"
msgid "show expiration dates during signature listings"
msgstr ""
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1962,7 +1966,7 @@ msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
@@ -2002,11 +2006,11 @@ msgstr "du må bruke filer (og ikke en pipe) når --pgp2 er påslått\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
@@ -2235,7 +2239,7 @@ msgstr "hent nøklene fra dette nøkkelknippet"
msgid "make timestamp conflicts only a warning"
msgstr "la konflikter mellom tidsstempler bare være en advarsel"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
@@ -3645,7 +3649,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "opprettet: %s"
@@ -3662,7 +3666,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "utgår: %s"
@@ -3696,12 +3700,12 @@ msgid ""
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "opphevet"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "utgått"
@@ -4557,177 +4561,177 @@ msgstr "%lu nøkler cachet (%lu signaturer)\n"
msgid "%s: keyring created\n"
msgstr ""
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "utkoblet"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nøkkelen «%s» ble ikke funnet på nøkkelserveren\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "nøkkelen ble ikke funnet på nøkkelserver\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "ber om nøkkel %s fra %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "søke etter navn fra %s server %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr "søker etter navn fra %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr ""
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "søke etter «%s» fra %s server %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "søker etter «%s» fra %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "ingen handling for nøkkelserver!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "nøkkelserver sendte ikke VERSION\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "nøkkelserver svarte ikke tidsnok\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "intern feil ved nøkkelserver\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "kommunikasjonsfeil med nøkkelserver: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "oppfrisker 1 nøkkel fra %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "oppfrisker %d nøkler fra %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ADVARSEL: klarte ikke å parse URI %s\n"
@@ -5070,16 +5074,16 @@ msgstr "ny konfigurasjonsfil «%s» ble opprettet\n"
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:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -5666,7 +5670,7 @@ msgstr ""
"kan ikke unngå svak nøkkel for symmetrisk krypteringsalgorime; prøvde %d "
"ganger!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6210,7 +6214,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "signering mislyktes: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "omdøping fra «%s» til «%s» mislyktes: %s\n"
@@ -6430,7 +6434,7 @@ msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "leser valg fra «%s»\n"
@@ -6471,21 +6475,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "hoppet over ugyldig radix64-tegn %02x\n"
@@ -6508,179 +6512,185 @@ msgstr ""
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr ""
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "Kan ikke åpne «%s»: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "klarte ikke å lagre nøkkelen: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
msgid "certificate has been revoked"
msgstr ""
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "ugyldig sertifikat"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Nøkkel tilgjengelig ved: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "sleting av nøkkelblokk mislyktes: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "generere et opphevingssertifikat"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Denne nøkkelen er utgått!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA-fingeravtrykk: "
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "omdøping fra «%s» til «%s» mislyktes: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "bekrefte en signatur"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "nei"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[ikke satt]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Feil: ugyldig respons.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Feil: ugyldig respons.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6695,7 +6705,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "feil ved henting av nåværende nøkkelinfo: %s\n"
@@ -6782,7 +6792,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "feil ved lesing av nøkkelblokk: %s\n"
@@ -6807,199 +6817,199 @@ msgstr "sleting av nøkkelblokk mislyktes: %s\n"
msgid "no valid recipients given\n"
msgstr "ingen gyldige adressater\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "feil ved skriving av nøkkelknippet «%s»: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[fil]|lage en signatur"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[fil]|lage en klartekstsignatur"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "liste hemmelige nøkler"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "ugyldig sertifikat"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "fjerne nøkler fra det offentlige nøkkelknippet"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "ugyldig sertifikat"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "ugyldig sertifikat"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "endre passfrasen"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "lage ASCII-beskyttet output"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
#, fuzzy
msgid "use the default key as default recipient"
msgstr "hoppet over: offentlig nøkkel allerede satt som standard mottaker\n"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "sjekke signaturer"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "hent nøklene fra dette nøkkelknippet"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "Trenger den hemmelige nøkkelen for å gjøre dette.\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAVN|kryptere for NAVN"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "ukjent kryptoalgoritme"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s signatur, digestalgoritme %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "ukjent kompresjonsalgoritme"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Bruksmåte: gpg [valg] [filer] (-h for hjelp)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7010,44 +7020,39 @@ msgstr ""
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "bruksmåte: gpg [valg] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "kan ikke opprette «%s»: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan ikke aksere «%s»: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
msgid "key generation is not available from the commandline\n"
msgstr ""
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7057,21 +7062,21 @@ msgstr "Vennligst velg hvilken type nøkkel du vil generere:\n"
msgid "total number processed: %lu\n"
msgstr "Totalt antall behandlet: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "generere et opphevingssertifikat"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "feil ved lesing av «%s»: %s\n"
@@ -7090,12 +7095,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "nøkkelknippet «%s» ble opprettet\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "klarte ikke å lagre fingeravtrykket: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "klarte ikke å lagre nøkkelen: %s\n"
@@ -7115,17 +7120,17 @@ msgstr "feil ved søking etter tillitspost i «%s»: %s\n"
msgid "error storing certificate: %s\n"
msgstr "feil ved henting av nåværende nøkkelinfo: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "feil ved lesing av «%s»: %s\n"
@@ -7198,103 +7203,107 @@ msgstr "God signatur fra «%s»"
msgid " aka"
msgstr " aka «%s»"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "avslutt"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Bruksmåte: gpg [valg] [filer] (-h for hjelp)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "for lang linje"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "ukjent valg «%s»\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "signering mislyktes: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "feil ved lesing av «%s»: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, 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:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7322,31 +7331,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7410,7 +7423,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7420,166 +7433,169 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "dekryptering mislyktes: %s\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "kryptere data"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [filnavn]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Bruksmåte: gpg [valg] [filer] (-h for hjelp)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "kan ikke opprette katalogen «%s»: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "feil ved skriving av nøkkelknippet «%s»: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "feil ved lesing av «%s»: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "feil med «%s»: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "fjernutføring av programmer er ikke støttet\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "kan ikke opprette «%s»: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "kan ikke opprette «%s»: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "sleting av nøkkelblokk mislyktes: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "kan ikke opprette sikkerhetskopifil «%s»: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "kan ikke opprette sikkerhetskopifil «%s»: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ikke støttet"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
diff --git a/po/pl.po b/po/pl.po
index 10831ddb7..dbc790641 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-06-23 15:54+0200\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -99,8 +99,8 @@ msgstr "nie mo¿na utworzyæ ,,%s'': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mo¿na otworzyæ ,,%s'': %s\n"
@@ -199,13 +199,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "zmiana has³a klucza"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -214,7 +214,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "zmiana has³a klucza"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -234,13 +234,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "z dodatkowymi informacjami"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "mniej komunikatóww"
@@ -252,7 +252,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
@@ -265,8 +265,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "szukanie kluczy na serwerze"
@@ -323,9 +323,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\n"
@@ -341,138 +341,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy¶lnego pliku opcji ,,%s''\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "b³±d tworzenia `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nie mo¿na utworzyæ katalogu ,,%s'': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nie mo¿na utworzyæ %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, 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:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "zapis zmian nie powiód³ siê: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisujê klucz tajny w '%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: katalog utworzony\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, 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:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu kluczy pominiêtych\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "z³y format zmiennej ¶rodowiskowej GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\n"
@@ -488,51 +477,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "niepoprawne has³o"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Anuluj"
@@ -572,7 +561,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "b³±d odczytu ,,%s'': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -585,7 +574,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -595,7 +584,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -607,19 +596,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "tak"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -663,12 +652,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "b³±d odczytu ,,%s'': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "b³±d tworzenia `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: nie znaleziono u¿ytkownika\n"
@@ -762,6 +751,16 @@ msgstr ""
msgid "cC"
msgstr "l"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1197,13 +1196,13 @@ msgstr "opcja --output nie dzia³a z tym poleceniem\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1483,22 +1482,22 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1514,27 +1513,27 @@ msgstr "|[plik]|z³o¿enie podpisu"
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|z³o¿enie podpisu pod dokumentem"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "z³o¿enie podpisu oddzielonego od dokumentu"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy¶lne)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "lista kluczy"
@@ -1547,11 +1546,11 @@ msgstr "lista kluczy i podpisów"
msgid "list and check key signatures"
msgstr "sprawdzenie podpisów kluczy"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisków"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
@@ -1587,11 +1586,11 @@ msgstr "tworzenie certyfikatu uniewa¿nienia klucza"
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
@@ -1627,12 +1626,12 @@ msgstr "uaktualnienie bazy zaufania"
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skróty wiadomo¶ci"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1642,31 +1641,31 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - bez)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "plik wyj¶ciowy"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
@@ -1682,7 +1681,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1690,7 +1689,7 @@ msgstr ""
"@\n"
"(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1729,7 +1728,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1757,7 +1756,7 @@ msgstr "Kompresji: "
msgid "usage: gpg [options] "
msgstr "wywo³anie: gpg [opcje]"
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
@@ -1893,6 +1892,11 @@ msgstr "okazanie, w którym zbiorze znajduje siê dany klucz"
msgid "show expiration dates during signature listings"
msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2035,7 +2039,7 @@ msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
@@ -2077,11 +2081,11 @@ msgstr "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n"
@@ -2316,7 +2320,7 @@ msgstr "pobieranie kluczy z tego zbioru"
msgid "make timestamp conflicts only a warning"
msgstr "nie traktowaæ konfliktu datowników jako b³êdu"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
@@ -3880,7 +3884,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "nie mo¿na utworzyæ %s: %s\n"
@@ -3897,7 +3901,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [wygasa :%s]"
@@ -3933,13 +3937,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[uniewa¿niony]"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4824,184 +4828,184 @@ msgstr "%lu kluczy (%lu podpisów)\n"
msgid "%s: keyring created\n"
msgstr "%s: zbiór kluczy utworzony\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "wy³kl"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "zapytanie o klucz %08lX w %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "b³±d serwera kluczy"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "b³±d serwera kluczy"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ pliku tymczasowego (%s) ,,%s'': %s.\n"
@@ -5348,18 +5352,18 @@ msgstr "nowy plik ustawieñ ,,%s'' zosta³ utworzony\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -5979,7 +5983,7 @@ msgstr ""
"brak mo¿liwo¶ci generacji dobrego klucza dla szyfru symetrycznego;\n"
"operacja by³a powtarzana %d razy!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6553,7 +6557,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "nie mo¿na otworzyæ pliku: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
@@ -6778,7 +6782,7 @@ msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "odczyt opcji z ,,%s''\n"
@@ -6822,21 +6826,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "niew³a¶ciwy znak formatu radix64: ,,%02x'', zosta³ pominiêty\n"
@@ -6860,190 +6864,195 @@ msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "nie mo¿na otworzyæ ,,%s'': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "zapisujê klucz tajny w '%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "UWAGA: klucz zosta³ uniewa¿niony"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Poprawny certyfikat"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Klucz dostêpny w: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "sprawdzenie z³o¿onego podpisu nie powiod³o siê: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Poprawny certyfikat"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "b³±d przy odczycie certyfikatu: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
#, fuzzy
msgid "certificate not yet valid"
msgstr "Poprawne uniewa¿nienie certyfikatu"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "b³±d przy odczycie certyfikatu: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
"Brak certyfikatów o niezdefiniowanym poziomie zaufania.\n"
"\n"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Odcisk klucza:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
#, fuzzy
msgid "root certificate has now been marked as trusted\n"
msgstr ""
"Brak certyfikatów o niezdefiniowanym poziomie zaufania.\n"
"\n"
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Poprawne uniewa¿nienie certyfikatu"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
#, fuzzy
msgid "issuer certificate not found"
msgstr "Poprawne uniewa¿nienie certyfikatu"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "sprawdzenie podpisu"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-"Algorytm DSA wymaga u¿ycia algorytmu skrótu daj±cego 160-bitowy wynik.\n"
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "nie"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "nieznany"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "b³±d: niew³a¶ciwy odcisk klucza\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "b³±d: niew³a¶ciwy odcisk klucza\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7058,7 +7067,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "b³±d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
@@ -7145,7 +7154,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "b³±d odczytu bloku kluczy: %s\n"
@@ -7170,191 +7179,191 @@ msgstr "usuniêcie bloku klucza nie powiod³o siê: %s\n"
msgid "no valid recipients given\n"
msgstr "(nie podano)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "b³±d podczas tworzenia has³a: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "b³±d zapisu zbioru kluczy '%': %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[plik]|z³o¿enie podpisu"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[plik]|z³o¿enie podpisu pod dokumentem"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "lista kluczy prywatnych"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "Poprawne uniewa¿nienie certyfikatu"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Poprawny certyfikat"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Poprawny certyfikat"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "zmiana has³a klucza"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "opakowanie ASCII pliku wynikowego"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "domy¶lny klucz jest domy¶lnym adresatem"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "bez odwo³añ do terminala"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "wymuszenie trzeciej wersji formatu podpisów"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "do szyfrowania bêdzie u¿ywany MDC"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "tryb wsadowy: ¿adnych pytañ"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "dodanie zbioru kluczy do u¿ywanych"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "dodanie zbioru kluczy tajnych do u¿ywanych"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|ustawienie NAZWA jako domy¶lnego klucza prywatnego"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAZWA| strona kodowa wy¶wietlanego tekstu"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|wymuszenie algorytmu szyfruj±cego NAZWA"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|wymuszenie algorytmu skrótu NAZWA"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|wymuszenie algorytmu kompresji N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Wywo³anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7365,45 +7374,40 @@ msgstr ""
"podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
"domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "sposób u¿ycia: gpgm [opcje]"
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, 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:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "zapis do '%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nie mo¿na zamkn±æ ,,%s'': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Proszê wybraæ rodzaj klucza:\n"
@@ -7413,21 +7417,21 @@ msgstr "Proszê wybraæ rodzaj klucza:\n"
msgid "total number processed: %lu\n"
msgstr "Ogó³em przetworzonych kluczy: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Poprawny certyfikat"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "b³±d podczas tworzenia has³a: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "b³±d odczytu ,,%s'': %s\n"
@@ -7446,12 +7450,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "zbiór kluczy ,,%s'' zosta³ utworzony\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
@@ -7471,17 +7475,17 @@ msgstr "b³±d podczas tworzenia has³a: %s\n"
msgid "error storing certificate: %s\n"
msgstr "b³±d podczas tworzenia has³a: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "un? problem przy sprawdzaniu uniewa¿nienia: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "b³±d podczas tworzenia has³a: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "b³±d odczytu ,,%s'': %s\n"
@@ -7554,104 +7558,108 @@ msgstr "Poprawny podpis z³o¿ony przez \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "wyj¶cie"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "linia zbyt d³uga\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "nieznany domy¶lny adresat ,,%s''\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, 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:473
+#: tools/gpg-connect-agent.c:487
#, 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:746
+#: tools/gpg-connect-agent.c:797
#, 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:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "b³±d przy wysy³aniu do ,,%s'': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
#, fuzzy
msgid "Options useful for debugging"
msgstr "umo¿liwienie pe³nego ¶ledzenia programu"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7679,31 +7687,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|ALG|wymuszenie algorytmu szyfruj±cego ALG dla has³a"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7767,7 +7780,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7777,166 +7790,170 @@ msgstr ""
"@Polecenia:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "odszyfrowanie poprawne\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "odszyfrowanie poprawne\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [plik]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "Nie wolno u¿ywaæ %s z %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, 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:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "nie mo¿na utworzyæ katalogu ,,%s'': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "nie mo¿na otworzyæ %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "b³±d zapisu zbioru kluczy '%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "b³±d odczytu ,,%s'': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "b³±d odczytu ,,%s'': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "odwo³ania do zewnêtrznych programów s± wy³±czone\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "nie mo¿na utworzyæ %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "nie mo¿na utworzyæ %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: nie znaleziono u¿ytkownika %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "zapis zmian nie powiód³ siê: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "usuniêcie bloku klucza nie powiod³o siê: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "zapis zmian nie powiód³ siê: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "zapis zmian nie powiód³ siê: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "zapis zmian nie powiód³ siê: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nie mo¿na utworzyæ ,,%s'': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nie mo¿na utworzyæ ,,%s'': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algorytm ochrony %d%s nie jest obs³ugiwany\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "Algorytm DSA wymaga u¿ycia algorytmu skrótu daj±cego 160-bitowy wynik.\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8728,9 +8745,6 @@ msgstr "algorytm ochrony %d%s nie jest obs³ugiwany\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|ALG|wymuszenie algorytmu skrótu has³a ALG"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|ALG|wymuszenie algorytmu szyfruj±cego ALG dla has³a"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "usuniêcie numerów kluczy adresatów z szyfrogramów"
diff --git a/po/pt.po b/po/pt.po
index aa50313eb..391c252db 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
@@ -92,8 +92,8 @@ msgstr "impossível criar `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
@@ -192,13 +192,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muda a frase secreta"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -207,7 +207,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -227,13 +227,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detalhado"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
@@ -245,7 +245,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
@@ -258,8 +258,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "procurar chaves num servidor de chaves"
@@ -316,9 +316,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
@@ -334,138 +334,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opções `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler opções de `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: impossível criar directoria: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossível criar %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualização falhou: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directoria criada\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossível criar directoria: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "actualização da chave secreta falhou: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, 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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variável de ambiente GPG_AGENT_INFO inválida\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, 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"
@@ -481,51 +470,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Por favor digite a frase secreta \n"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "frase secreta incorrecta"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "cancelado pelo utilizador\n"
@@ -565,7 +554,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -578,7 +567,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -588,7 +577,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -600,19 +589,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "sim"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -656,12 +645,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erro ao criar `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[Utilizador não encontrado]"
@@ -756,6 +745,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1189,13 +1188,13 @@ msgstr "--output não funciona para este comando\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1474,22 +1473,22 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1505,27 +1504,27 @@ msgstr "|[ficheiro]|fazer uma assinatura"
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "cifrar dados"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra simétrica"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "decifrar dados (acção por omissão)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "listar as chaves"
@@ -1538,11 +1537,11 @@ msgstr "listar as chaves e as assinaturas"
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impressões digitais"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "listar as chaves secretas"
@@ -1578,11 +1577,11 @@ msgstr "gerar um certificado de revogação"
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor de chaves"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importar chaves de um servidor de chaves"
@@ -1618,12 +1617,12 @@ msgstr "actualizar a base de dados de confiança"
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1633,35 +1632,35 @@ msgstr ""
"Opções:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "criar saída com armadura ascii"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifrar para NOME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "usar modo de texto canônico"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "usar como ficheiro de saída"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "não fazer alterações"
@@ -1677,7 +1676,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1685,7 +1684,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1723,7 +1722,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1751,7 +1750,7 @@ msgstr "Compressão: "
msgid "usage: gpg [options] "
msgstr "uso: gpg [opções] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
@@ -1875,6 +1874,11 @@ msgstr "mostrar em que porta-chave a chave está"
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2017,7 +2021,7 @@ msgstr "%s:%d: opções de exportação inválidas\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
@@ -2058,11 +2062,11 @@ msgstr ""
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado é inválido\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
@@ -2300,7 +2304,7 @@ msgstr "Remover esta chave do porta-chaves?"
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informações de estado para o\n"
@@ -3866,7 +3870,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossível criar %s: %s\n"
@@ -3883,7 +3887,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[expira: %s]"
@@ -3919,13 +3923,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "revkey"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4803,184 +4807,184 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, 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:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opções de exportação inválidas\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chave `%s' não encontrada: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chave `%s' não encontrada: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "a pedir a chave %08lX de %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, 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:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opções de exportação inválidas\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "A geração de chaves falhou: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -5333,16 +5337,16 @@ msgstr "criado um novo ficheiro de configuração `%s'\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -5956,7 +5960,7 @@ msgstr ""
"impossível evitar chave fraca para criptografia simétrica;\n"
"tentei %d vezes!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6529,7 +6533,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "impossível abrir %s: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
@@ -6754,7 +6758,7 @@ msgstr "nenhum dado OpenPGP válido encontrado.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "a ler opções de `%s'\n"
@@ -6798,21 +6802,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracter radix64 inválido %02x ignorado\n"
@@ -6836,180 +6840,186 @@ msgstr "a versão %d do protocolo gpg-agent não é suportada\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, 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:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "a escrever chave privada para `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTA: a chave foi revogada"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "certificado incorrecto"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Nenhuma ajuda disponível"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "verificação da assinatura criada falhou: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "gerar um certificado de revogação"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Esta chave expirou!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "mostra impressão digital"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "verificação da assinatura criada falhou: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verificar uma assinatura"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA necessita de utilização de uma algoritmo de dispersão de 160 bit\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "não"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "versão desconhecida"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "%s: versão de ficheiro inválida %d\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "%s: versão de ficheiro inválida %d\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7026,7 +7036,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@ -7113,7 +7123,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "chave `%s' não encontrada: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
@@ -7138,195 +7148,195 @@ msgstr "remoção do bloco de chave falhou: %s\n"
msgid "no valid recipients given\n"
msgstr "resposta do agente inválida\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "a escrever para `%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[ficheiro]|fazer uma assinatura"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "listar as chaves secretas"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "certificado incorrecto"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "remover chaves do porta-chaves público"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "certificado incorrecto"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "certificado incorrecto"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "criar saída com armadura ascii"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usar NOME como destinatário por omissão"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "usar a chave por omissão como destinatário por omissão"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "forçar assinaturas v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "sempre usar um MDC para cifrar"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "modo não-interactivo: nunca perguntar"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "assumir não para a maioria das perguntas"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr ""
"adicionar este porta-chaves\n"
"à lista de porta-chaves"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "adicionar este porta-chaves secreto à lista"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omissão"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|usar algoritmo de compressão N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7337,45 +7347,40 @@ msgstr ""
"assina, verifica, cifra ou decifra\n"
"a operação por omissão depende dos dados de entrada\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpg [opções] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "impossível ligar a `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "a escrever para `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossível fechar `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, 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:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7385,21 +7390,21 @@ msgstr "Por favor selecione o tipo de chave desejado:\n"
msgid "total number processed: %lu\n"
msgstr "Número total processado: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "gerar um certificado de revogação"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7418,12 +7423,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "porta-chaves `%s' criado\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@ -7443,17 +7448,17 @@ msgstr "erro na criação da frase secreta: %s\n"
msgid "error storing certificate: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema ao verificar revogação: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7526,103 +7531,107 @@ msgstr "Assinatura correcta de \""
msgid " aka"
msgstr " ou \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "sair"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "frase secreta demasiado longa\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7650,31 +7659,38 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, 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:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7738,7 +7754,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7748,165 +7764,169 @@ msgstr ""
"@Comandos:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "decifragem correcta\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "decifragem correcta\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nome_do_ficheiro]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s não é permitido com %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "impossível abrir %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "%s: impossível criar directoria: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "impossível abrir %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr ""
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "impossível criar %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "impossível criar %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "actualização falhou: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "actualização falhou: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "actualização falhou: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "actualização falhou: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "impossível criar `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "impossível criar `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritmo de protecção %d%s não é suportado\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "DSA necessita de utilização de uma algoritmo de dispersão de 160 bit\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8644,11 +8664,6 @@ msgstr "algoritmo de protecção %d%s não é suportado\n"
#~ "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
#~ "para frases secretas"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr ""
-#~ "|NOME|usar algoritmo de criptografia NOME para\n"
-#~ "frases secretas"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "eliminar campo keyid dos pacotes cifrados"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 60b755055..23a9bfe50 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -96,8 +96,8 @@ msgstr "impossível criar %s: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
@@ -197,13 +197,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muda a frase secreta"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -212,7 +212,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -232,13 +232,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detalhado"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
@@ -250,7 +250,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
@@ -263,8 +263,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "exportar chaves para um servidor"
@@ -320,9 +320,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
@@ -338,137 +338,126 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de opções `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo opções de `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, fuzzy, c-format
msgid "error creating `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: impossível criar diretório: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossível criar %s: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "atualização falhou: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: diretório criado\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "atualização da chave secreta falhou: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves ignoradas\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, fuzzy, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "algoritmo de proteção %d não é suportado\n"
@@ -484,51 +473,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Por favor digite a frase secreta"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Por favor digite a frase secreta"
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "frase secreta incorreta"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
msgid "cancelled\n"
msgstr ""
@@ -567,7 +556,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -580,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -590,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -602,19 +591,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "sim"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -658,12 +647,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "%s: usuário não encontrado\n"
@@ -756,6 +745,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1193,13 +1192,13 @@ msgstr ""
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
@@ -1474,22 +1473,22 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1505,29 +1504,29 @@ msgstr "|[arquivo]|fazer uma assinatura"
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "criptografar dados"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr ""
"criptografar apenas com criptografia\n"
"simétrica"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "descriptografar dados (padrão)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "listar as chaves"
@@ -1540,11 +1539,11 @@ msgstr "listar as chaves e as assinaturas"
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impressões digitais"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "listar as chaves secretas"
@@ -1582,11 +1581,11 @@ msgstr "gerar um certificado de revogação"
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
@@ -1624,12 +1623,12 @@ msgstr "atualizar o banco de dados de confiabilidade"
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1639,35 +1638,35 @@ msgstr ""
"Opções:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "criar saída com armadura ascii"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|criptografar para NOME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "usar modo de texto canônico"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "usar como arquivo de saída"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "não fazer alterações"
@@ -1683,13 +1682,13 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1727,7 +1726,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1756,7 +1755,7 @@ msgstr "Comentário: "
msgid "usage: gpg [options] "
msgstr "uso: gpg [opções] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
@@ -1880,6 +1879,11 @@ msgstr "alterna entre listagem de chave secreta e pública"
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2022,7 +2026,7 @@ msgstr "AVISO: `%s' é um arquivo vazio\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
@@ -2062,11 +2066,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado não é válido\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
@@ -2312,7 +2316,7 @@ msgstr "Deletar esta chave do chaveiro? "
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr ""
"|DA|escrever informações de estado para o\n"
@@ -3806,7 +3810,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossível criar %s: %s\n"
@@ -3823,7 +3827,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr "A chave expira em %s\n"
@@ -3857,13 +3861,13 @@ msgid ""
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "revkey"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4751,184 +4755,184 @@ msgstr "listar as chaves e as assinaturas"
msgid "%s: keyring created\n"
msgstr "%s: chaveiro criado\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "a URL de política dada é inválida\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "chaveiro inválido"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "usuário `%s' não encontrado: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "usuário `%s' não encontrado: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "impossível escrever para o chaveiro: %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "impossível escrever para o chaveiro: %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "exportar chaves para um servidor"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "lendo opções de `%s'\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "exportar chaves para um servidor"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "lendo opções de `%s'\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "chaveiro inválido"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "erro geral"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "erro geral"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "enumeração de chaves secretas falhou: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, 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:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "impossível escrever para o chaveiro: %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "impossível escrever para o chaveiro: %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "%s: novo arquivo de opções criado\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "%s: novo arquivo de opções criado\n"
@@ -5279,16 +5283,16 @@ msgstr "%s: novo arquivo de opções criado\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr ""
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -5907,7 +5911,7 @@ msgstr ""
"impossível evitar chave fraca para criptografia simétrica;\n"
"%d tentativas!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6470,7 +6474,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "impossível abrir arquivo: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
@@ -6695,7 +6699,7 @@ msgstr "nenhum dado OpenPGP válido encontrado.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "lendo opções de `%s'\n"
@@ -6739,21 +6743,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caractere radix64 inválido %02x ignorado\n"
@@ -6776,189 +6780,195 @@ msgstr "algoritmo de proteção %d não é suportado\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "algoritmo de proteção %d não é suportado\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "escrevendo certificado privado para `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "chave %08lX: a chave foi revogada!\n"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "Certificado correto"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Nenhuma ajuda disponível"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "leitura de registro de assinatura falhou: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "Certificado correto"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, fuzzy, c-format
msgid "certificate with invalid validity: %s"
msgstr "erro de leitura do certificado: %s\n"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
#, fuzzy
msgid "certificate not yet valid"
msgstr "Certificado de revogação válido"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "erro de leitura do certificado: %s\n"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
#, fuzzy
msgid "root certificate is not marked trusted"
msgstr ""
"Nenhum certificado com confiança indefinida encontrado.\n"
"\n"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Impressão digital:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
#, fuzzy
msgid "root certificate has now been marked as trusted\n"
msgstr ""
"Nenhum certificado com confiança indefinida encontrado.\n"
"\n"
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "leitura de registro de assinatura falhou: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
#, fuzzy
msgid "certificate chain too long\n"
msgstr "Certificado de revogação válido"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
#, fuzzy
msgid "issuer certificate not found"
msgstr "Certificado de revogação válido"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verificar uma assinatura"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "não"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "versão desconhecida"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "erro: impressão digital inválida\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "erro: impressão digital inválida\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6974,7 +6984,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -7062,7 +7072,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "usuário `%s' não encontrado: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7087,193 +7097,193 @@ msgstr "enumeração de blocos de chaves falhou: %s\n"
msgid "no valid recipients given\n"
msgstr "nenhum endereço válido\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "erro na escrita do chaveiro `%': %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[arquivo]|fazer uma assinatura"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "listar as chaves secretas"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "Certificado de revogação válido"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "remover a chave do chaveiro público"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "Certificado correto"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "Certificado correto"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "criar saída com armadura ascii"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usar NOME como destinatário padrão"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "usar a chave padrão como destinatário padrão"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "forçar assinaturas v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "sempre usar um MDC para criptografar"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "modo não-interativo: nunca perguntar"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "assumir não para a maioria das perguntas"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "adicionar este chaveiro à lista de chaveiros"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "adicionar este chaveiro secreto à lista"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta padrão"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|usar algoritmo de compressão N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpgm [opções] [arquivos] (-h para ajuda)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7284,44 +7294,39 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a operação padrão depende dos dados de entrada\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "Uso: gpgm [opções] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "escrevendo para `%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
msgid "key generation is not available from the commandline\n"
msgstr ""
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7331,21 +7336,21 @@ msgstr "Por favor selecione o tipo de chave desejado:\n"
msgid "total number processed: %lu\n"
msgstr "Número total processado: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "Certificado correto"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7364,12 +7369,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "%s: chaveiro criado\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
@@ -7389,17 +7394,17 @@ msgstr "erro na criação da frase secreta: %s\n"
msgid "error storing certificate: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7473,104 +7478,108 @@ msgid " aka"
msgstr " ou \""
# INICIO MENU
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "sair"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "linha muito longa\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatário padrão desconhecido `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "enumeração de blocos de chaves falhou: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro na leitura de `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilitar depuração completa"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7598,31 +7607,38 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, 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:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7686,7 +7702,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7696,161 +7712,161 @@ msgstr ""
"@Comandos:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "descriptografia correta\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "descriptografia correta\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nome_do_arquivo]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s não é permitido com %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, 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:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "%s: impossível criar diretório: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "impossível abrir %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr ""
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "impossível criar %s: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "impossível criar %s: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, fuzzy, c-format
msgid "could not fork: %s\n"
msgstr "%s: usuário não encontrado: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "atualização falhou: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "enumeração de blocos de chaves falhou: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "atualização falhou: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "atualização falhou: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "atualização falhou: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "impossível criar %s: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "impossível criar %s: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritmo de proteção %d não é suportado\n"
@@ -8586,11 +8602,6 @@ msgstr "algoritmo de proteção %d não é suportado\n"
#~ "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
#~ "para frases secretas"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr ""
-#~ "|NOME|usar algoritmo de criptografia NOME para\n"
-#~ "frases secretas"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr ""
#~ "eliminar o campo keyid dos pacotes\n"
diff --git a/po/ro.po b/po/ro.po
index 01a8587c7..be32720f1 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -94,8 +94,8 @@ msgstr "nu pot crea `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nu pot deschide `%s': %s\n"
@@ -195,13 +195,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "schimbã fraza-parolã"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -210,7 +210,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "schimbã fraza-parolã"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -230,13 +230,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "locvace"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "fii oarecum mai tãcut"
@@ -248,7 +248,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FIªIER|încarcã modulul extensie FIªIER"
@@ -261,8 +261,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cautã pentru chei pe un server de chei"
@@ -318,9 +318,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "Raportaþi bug-uri la <gnupg-bugs@gnu.org>.\n"
@@ -336,138 +336,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "fiºier opþiuni `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc opþiuni din `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "eroare la creearea `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a eºuat: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "scriu cheia secretã în `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "director `%s' creat\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) a eºuat în %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a eºuat: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: sãritã: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil în aceastã sesiune\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent versiune protocol %d nu este suportat\n"
@@ -483,36 +472,36 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
@@ -520,17 +509,17 @@ msgid ""
msgstr ""
"Vã rugãm introduceþi fraza-parolã; aceasta este o propoziþie secretã \n"
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "frazã-parolã incorectã"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "eroare la crearea frazei-parolã: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "anulatã"
@@ -570,7 +559,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -583,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -593,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -605,19 +594,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "da"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -661,12 +650,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "eroare la citire `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "eroare la creearea `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[ID utilizator nu a fost gãsit]"
@@ -759,6 +748,16 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1164,13 +1163,13 @@ msgstr "--output nu merge pentru aceastã comandã\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1447,22 +1446,22 @@ msgstr ""
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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1478,27 +1477,27 @@ msgstr "|[fiºier]|creazã o semnãturã"
msgid "|[file]|make a clear text signature"
msgstr "|[fiºier]|creazã o semnãturã text în clar"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "creazã o semnãturã detaºatã"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "cifreazã datele"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "cifreazã numai cu cifru simetric"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "decripteazã datele (implicit)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verificã o semnãturã"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "enumerã chei"
@@ -1510,11 +1509,11 @@ msgstr "enumerã chei ºi semnãturi"
msgid "list and check key signatures"
msgstr "enumerã ºi verificã semnãturile cheii"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "enumerã chei ºi amprente"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "enumerã chei secrete"
@@ -1550,11 +1549,11 @@ msgstr "genereazã un certificat de revocare"
msgid "export keys"
msgstr "exportã chei"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportã chei pentru un server de chei"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importã chei de la un server de chei"
@@ -1590,12 +1589,12 @@ msgstr "actualizeazã baza de date de încredere"
msgid "|algo [files]|print message digests"
msgstr "|algo [fiºiere]|afiºeazã rezumate mesaje"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1605,31 +1604,31 @@ msgstr ""
"Opþiuni:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "creazã ieºire în armurã ascii"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NUME|cifrare pentru NUME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|seteazã nivel de compresie N (0 deactiveazã)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "foloseºte modul text canonic"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "foloseºte ca fiºier ieºire"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
@@ -1645,7 +1644,7 @@ msgstr "foloseºte comportament strict OpenPGP"
msgid "generate PGP 2.x compatible messages"
msgstr "genereazã mesaje compatibile cu PGP 2.x"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1653,7 +1652,7 @@ msgstr ""
"@\n"
"(Aratã pagina man pentru o listã completã a comenzilor ºi opþiunilor)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1691,7 +1690,7 @@ msgstr ""
"sign, check, encrypt sau decrypt\n"
"operaþiunea implicitã depinde de datele de intrare\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1719,7 +1718,7 @@ msgstr "Compresie: "
msgid "usage: gpg [options] "
msgstr "folosire: gpg [opþiuni] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "comenzi în conflict\n"
@@ -1859,6 +1858,11 @@ msgstr "aratã cãruia dintre inelele de chei îi aparþine o cheie enumeratã"
msgid "show expiration dates during signature listings"
msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1998,7 +2002,7 @@ msgstr "%s:%d: opþiuni verificare invalide\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n"
@@ -2043,11 +2047,11 @@ msgstr ""
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
@@ -2277,7 +2281,7 @@ msgstr "ia cheile de pe acest inel de chei"
msgid "make timestamp conflicts only a warning"
msgstr "dã numai un avertisment la conflicte de timestamp"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informaþii de stare în acest FD"
@@ -3806,7 +3810,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "creatã: %s"
@@ -3823,7 +3827,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "expirã: %s"
@@ -3860,12 +3864,12 @@ msgstr ""
"corectã dacã nu reporniþi programul.\n"
#
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "revocatã"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "expiratã"
@@ -4728,182 +4732,182 @@ msgstr "%lu chei puse în cache (%lu semnãturi)\n"
msgid "%s: keyring created\n"
msgstr "%s: inelul de chei creat\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "Introduceþi URL-ul serverului de chei preferat: "
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "deactivat(ã)"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
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:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, 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:911
+#: g10/keyserver.c:918
#, 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:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "cheia nu a fost gãsitã pe serverul de chei\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "cer cheia %s de la serverul %s %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "cer cheia %s de la %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "caut \"%s\" de pe serverul %s %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "caut \"%s\" de pe %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "trimit cheia %s serverului %s %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "caut \"%s\" de pe serverul %s %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "caut \"%s\" de pe %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "nici o acþiune pentru serverul de chei!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosiþi opþiunea --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, 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:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s nu suportã versiunea de manipulator (handler) %d\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "serverul de chei a epuizat timpul de aºteptare (timed out)\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "eroare internã server de chei\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "eroare de comunicare server de chei: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nu este un ID de cheie: sãrit\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "reactualizez 1 cheie de la %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "reactualizez %d chei de la %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -5249,18 +5253,18 @@ 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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
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:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -5868,7 +5872,7 @@ msgstr "cheie slabã creatã - reîncerc\n"
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
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6433,7 +6437,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "nu pot deschide fiºierul: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a eºuat: %s\n"
@@ -6654,7 +6658,7 @@ msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "citesc opþiuni din `%s'\n"
@@ -6698,21 +6702,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracter radix64 invalid %02X sãrit\n"
@@ -6736,180 +6740,186 @@ msgstr "gpg-agent versiune protocol %d nu este suportat\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agent versiune protocol %d nu este suportat\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "Nu pot deschide `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "exportul cheilor secrete nu este permis\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "am eºuat sã stochez cheia: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "NOTÃ: cheia a fost revocatã"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "certificat incorect"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Cheie disponibilã la: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "verificarea semnãturii create a eºuat: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "genereazã un certificat de revocare"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Aceastã cheie a expirat!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "Amprenta CA: "
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "verificarea semnãturii create a eºuat: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verificã o semnãturã"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA necesitã folosirea unui algoritm cu hash de 160 biþi\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "nu"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[nesetat(ã)]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Eroare: rãspuns invalid.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Eroare: rãspuns invalid.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6925,7 +6935,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eroare la obþinerea informaþiei pentru cheia curentã: %s\n"
@@ -7012,7 +7022,7 @@ msgstr ""
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:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "eroare la citire keyblock: %s\n"
@@ -7037,192 +7047,192 @@ msgstr "stergere keyblock a eºuat: %s\n"
msgid "no valid recipients given\n"
msgstr "(Nici o descriere datã)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "eroare la crearea frazei-parolã: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: eroare scriere înregistrare dir: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[fiºier]|creazã o semnãturã"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[fiºier]|creazã o semnãturã text în clar"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "enumerã chei secrete"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "certificat incorect"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "ºterge chei de pe inelul de chei public"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "certificat incorect"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "certificat incorect"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "adaugã o cheie la un smartcard"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "schimbã fraza-parolã"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "creazã ieºire în armurã ascii"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NUME|foloseºte NUME ca destinatar implicit"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "foloseºte cheia implicitã ca destinatar implicit"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "nu folosi deloc terminalul"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "forþeazã semnãturi v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "foloseºte întotdeauna un MDC pentru cifrare"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "modul batch: nu întreba niciodatã"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "presupune da la cele mai multe întrebãri"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "presupune nu la cele mai multe întrebãri"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "adaugã acest inel de chei la lista inelelor de chei"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "adaugã acest inel de chei secret la listã"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NUME|foloseºte NUME ca cheie secretã implicitã"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|foloseºte acest server de chei pentru a cãuta chei"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NUME|seteazã charset-ul pentru terminal ca NUME"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FIªIER|încarcã modulul extensie FIªIER"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NUME|foloseºte algoritm cifrare NUME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NUME|foloseºte algoritm rezumat mesaj NUME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|foloseºte algoritm compresie N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Folosire: gpg [opþiuni] [fiºiere] (-h pentru ajutor)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7233,45 +7243,40 @@ msgstr ""
"sign, check, encrypt sau decrypt\n"
"operaþiunea implicitã depinde de datele de intrare\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "folosire: gpg [opþiuni] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "nu mã pot conecta la `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent nu este disponibil în aceastã sesiune\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7281,21 +7286,21 @@ msgstr "Vã rugãm selectaþi tipul de cheie de generat:\n"
msgid "total number processed: %lu\n"
msgstr "Numãr total procesate: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "genereazã un certificat de revocare"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "eroare la obþinerea numãrului serial: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@ -7314,12 +7319,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "inelul de chei `%s' creat\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "am eºuat sã stochez amprenta: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "am eºuat sã stochez cheia: %s\n"
@@ -7339,17 +7344,17 @@ msgstr "eroare la obþinerea numãrului serial: %s\n"
msgid "error storing certificate: %s\n"
msgstr "eroare la obþinerea numãrului serial: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? probleme la verificare revocãrii: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "eroare la obþinere noului PIN: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@ -7422,103 +7427,107 @@ msgstr "Semnãturã bunã din \"%s\""
msgid " aka"
msgstr " aka \"%s\""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "terminã"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "linie prea lungã"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "opþiune necunoscutã `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "semnarea a eºuat: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "citirea cheii publice a eºuat: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7546,31 +7555,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NUME|foloseºte algoritm cifrare NUME pentru fraza-parolã"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7634,7 +7648,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7644,166 +7658,169 @@ msgstr ""
"@Comenzi:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "decriptare OK\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "decriptare OK\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [nume_fiºier]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Folosire: gpg [opþiuni] [fiºiere] (-h pentru ajutor)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s nu este permis cu %s!\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, 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:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "nu pot deschide %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "eroare în `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "nu este suportatã execuþia nici unui program la distanþã\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "nu pot crea `%s': %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "nu pot crea `%s': %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "actualizarea a eºuat: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "stergere keyblock a eºuat: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "actualizarea a eºuat: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "actualizarea a eºuat: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "actualizarea a eºuat: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nu pot deschide fiºierul: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nu pot crea fiºier de rezervã `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA necesitã folosirea unui algoritm cu hash de 160 biþi\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8247,9 +8264,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|NUME|foloseºte algoritm rezumat mesaj NUME pentru fraza-parolã"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NUME|foloseºte algoritm cifrare NUME pentru fraza-parolã"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr "ignorã câmp keyid pentru pachete cifrate"
diff --git a/po/ru.po b/po/ru.po
index 9bb85a382..3689afa64 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2006-11-07 19:31+0300\n"
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -84,8 +84,8 @@ msgstr "не могу Ñоздать `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "не могу открыть `%s': %s\n"
@@ -182,12 +182,12 @@ msgstr "Введите фразу-пароль\n"
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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
msgid "Please re-enter this passphrase"
msgstr "Повторно введите фразу-пароль:"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr "не Ñовпало, попробуйте еще раз"
@@ -195,7 +195,7 @@ msgstr "не Ñовпало, попробуйте еще раз"
msgid "Please enter the new passphrase"
msgstr "Введите новую фразу-пароль"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
msgid ""
"@Options:\n"
@@ -213,13 +213,13 @@ msgid "run in daemon mode (background)"
msgstr "запуÑк в режиме демона (background)"
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "подробно"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "уменьшить количеÑтво выводимой информации"
@@ -231,7 +231,7 @@ msgstr "вывод результатов в sh-Ñтиле"
msgid "csh-style command output"
msgstr "вывод результатов в csh-Ñтиле"
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|взÑÑ‚ÑŒ параметры из FILE"
@@ -243,8 +243,8 @@ msgstr "не отÑоединÑÑ‚ÑŒÑÑ Ð¾Ñ‚ конÑоли"
msgid "do not grab keyboard and mouse"
msgstr "не перехватывать ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¼Ñ‹ÑˆÐ¸ и клавиатуры"
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "иÑпользовать файл журнала Ð´Ð»Ñ Ñервера"
@@ -296,9 +296,9 @@ msgstr "разрешить ÑмулÑцию ssh-агента"
msgid "|FILE|write environment settings also to FILE"
msgstr "|FILE|Ñохранить ÑоÑтоÑние в файл"
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
msgid "Please report bugs to <"
msgstr "О найденных ошибках Ñообщайте <"
@@ -314,137 +314,126 @@ msgstr ""
"СинтакÑиÑ: gpg-agent [параметры] [команда [аргументы]]\n"
"Управление закрытыми ключами Ð´Ð»Ñ GnuPG\n"
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr "выход за безопаÑный предел памÑти при раÑпределении %lu байтов"
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr "выход за границы при раÑпределении %lu байтов"
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "запрошен недупуÑтимый уровень отладки `%s'\n"
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
-#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
-msgstr "libcrypt Ñлишком Ñтарой верÑии (требуетÑÑ %s, обнаружено %s)\n"
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#, fuzzy, c-format
+msgid "%s is too old (need %s, have %s)\n"
+msgstr "libksba Ñлишком уÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ°Ñ (требуетÑÑ %s, имеетÑÑ %s)\n"
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗÐМЕЧÐÐИЕ: файл конфигурации `%s' не обнаружен\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "параметры конфигурации из файла `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "не могу Ñоздать каталог `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr "Ð¸Ð¼Ñ Ñокета Ñлишком длинное\n"
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу Ñоздать Ñокет: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "ошибка ÑвÑÐ·Ñ‹Ð²Ð½Ð¸Ñ Ñокета Ñ `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, c-format
msgid "listening on socket `%s'\n"
msgstr "Ñлушаем Ñокет `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "Ñоздан каталог `%s'\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "невозможно иÑпользовать `%s' как домашний каталог\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s: оÑтановлен\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
msgid "no gpg-agent running in this session\n"
msgstr "нет gpg-agent доÑтупого Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ ÑеÑÑии\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "протокол gpg-agent верÑии %d не поддерживаетÑÑ\n"
@@ -462,11 +451,11 @@ msgstr ""
"СинтакÑиÑ: gpg-preset-passphrase [параметры] KEYGRIP\n"
"Кеширование паролей\n"
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "ИÑпользование: gpg-protect-tool [параметры] (-h Ð´Ð»Ñ Ð¿Ð¾Ð´Ñказки)\n"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
#, fuzzy
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
@@ -475,21 +464,21 @@ msgstr ""
"СинтакÑиÑ: gpg-protect-tool [параметры] [аргументы]\n"
"ИнÑтрумент Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼Ð¸ ключами\n"
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Введите фразу-пароль Ð´Ð»Ñ Ð´Ð¾Ñтупа к PKCS#12 объекту."
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Введите фразу-пароль Ð´Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ нового PKCS#12 объекта."
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr "Введите фразу-пароль Ð´Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ импортированных в GnuPG объектов."
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@ -497,16 +486,16 @@ msgstr ""
"Введите фразу-пароль или PIN\n"
"необходимые Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ операции."
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
msgid "Passphrase:"
msgstr "Фраза-пароль:"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "ошибка запроÑа ввода фразы-паролÑ: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
msgid "cancelled\n"
msgstr "отменено\n"
@@ -545,7 +534,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ `%s', Ñтрока %d: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÑпиÑка доверÑемых корневых Ñертификатов\n"
@@ -558,7 +547,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -570,7 +559,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr "Подтверждаю"
@@ -582,7 +571,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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -591,11 +580,11 @@ msgstr ""
"ДейÑтвительно абÑолютно доверÑÑ‚ÑŒ%%0A \"%s\"%%0Aкорректно подпиÑанным "
"Ñертификатам пользователÑ?"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "Yes"
msgstr "Да"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr "Ðет"
@@ -639,12 +628,12 @@ msgstr "ошибка запуÑка `%s': позможно не уÑтановл
msgid "error running `%s': terminated\n"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ `%s': прервано\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, c-format
msgid "error creating socket: %s\n"
msgstr ""
-#: common/http.c:1667
+#: common/http.c:1665
msgid "host not found"
msgstr "хоÑÑ‚ не найден"
@@ -733,6 +722,16 @@ msgstr ""
msgid "cC"
msgstr ""
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr "выход за безопаÑный предел памÑти при раÑпределении %lu байтов"
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr "выход за границы при раÑпределении %lu байтов"
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1137,13 +1136,13 @@ msgstr "--output не работает Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды\n"
msgid "can't open `%s'\n"
msgstr "не могу открыть `%s'\n"
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1411,22 +1410,22 @@ msgstr ""
"Дефектный ключ %s признан пригодным ÑоглаÑно параметра --allow-non-"
"selfsigned-uid\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "нет Ñекретного подключа Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ подключа %s - игнорируем\n"
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "иÑпользую подклключ %s вмеÑто главного ключа %s\n"
-#: g10/getkey.c:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1442,27 +1441,27 @@ msgstr "|[файл]|Ñоздать подпиÑÑŒ к файлу"
msgid "|[file]|make a clear text signature"
msgstr "|[файл]|Ñоздать прозрачную подпиÑÑŒ к файлу"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "Ñоздать отделенную подпиÑÑŒ"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "зашифровать данные"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "зашифровать только Ñимметричным шифром"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "раÑшифровать данные (по умолчанию)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "проверить подпиÑÑŒ"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "вывеÑти ÑпиÑок ключей"
@@ -1474,11 +1473,11 @@ msgstr "вывеÑти ÑпиÑок ключей и подпиÑей"
msgid "list and check key signatures"
msgstr "вывеÑти и проверить подпиÑи ключей"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "вывеÑти ÑпиÑок ключей и их отпечатков"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "вывеÑти ÑпиÑок Ñекретных ключей"
@@ -1514,11 +1513,11 @@ msgstr "Ñоздать Ñертификат отзыва"
msgid "export keys"
msgstr "ÑкÑпортировать ключи"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "ÑкÑпортировать ключи на Ñервер ключей"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "импортировать ключи Ñ Ñервера ключей"
@@ -1554,12 +1553,12 @@ msgstr "обновить таблицу доверий"
msgid "|algo [files]|print message digests"
msgstr "|algo [файлы]|вывеÑти Ñ…Ñши файлов"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr "запуÑк в режиме Ñервера"
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1569,31 +1568,31 @@ msgstr ""
"Параметры:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "вывод в ASCII формате"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|зашифровать Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ NAME"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "иÑпользовать данный User ID Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ð½Ð¸Ñ Ð¸ раÑшифрованиÑ"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|уÑтановить уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ N (0 без ÑжатиÑ)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "иÑпользовать каноничеÑкий текÑтовый режим"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "вывод в указанный файл"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "не делать никаких изменений"
@@ -1609,7 +1608,7 @@ msgstr "Ñтрого Ñледовать Ñтандарту OpenPGP"
msgid "generate PGP 2.x compatible messages"
msgstr "Ñоздает Ñообщение ÑовмеÑтимым Ñ PGP 2.x"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1617,7 +1616,7 @@ msgstr ""
"@\n"
"(См. документацию Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ полного Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ и параметрами)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1655,7 +1654,7 @@ msgstr ""
"ПодпиÑи и их проверка, зашифрование и раÑшифрование\n"
"дейÑтвие по умолчанию завиÑит от входных данных\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1683,7 +1682,7 @@ msgstr "Ðлгоритмы ÑжатиÑ: "
msgid "usage: gpg [options] "
msgstr "иÑпользование: gpg [параметры] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "неÑовмеÑтимые команды\n"
@@ -1813,6 +1812,11 @@ msgstr "печатать Ð¸Ð¼Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ† ключей в ÑпиÑке клю
msgid "show expiration dates during signature listings"
msgstr "печатать даты иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² ÑпиÑке подпиÑей"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr "libcrypt Ñлишком Ñтарой верÑии (требуетÑÑ %s, обнаружено %s)\n"
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1947,7 +1951,7 @@ msgstr "%s:%d: недопуÑтимый ÑпиÑок auto-key-locate\n"
msgid "invalid auto-key-locate list\n"
msgstr "недопуÑтимый ÑпиÑок auto-key-locate\n"
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "Ð’ÐИМÐÐИЕ: возможно Ñоздание файла дампа памÑти программы!\n"
@@ -1988,11 +1992,11 @@ msgstr "Следует иÑпользовать файлы (а не каналы
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "Ð´Ð»Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² режиме --pgp2 требуетÑÑ ÑˆÐ¸Ñ„Ñ€ IDEA\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрованиÑ\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-функциÑ\n"
@@ -2223,7 +2227,7 @@ msgstr "иÑпользуютÑÑ ÐºÐ»ÑŽÑ‡Ð¸ из Ñтой таблицы клюÑ
msgid "make timestamp conflicts only a warning"
msgstr "при неÑоответÑтвии отметки времени - только предупреждением"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить инфромацию в файл Ñ Ð´ÐµÑкриптором FD"
@@ -3726,7 +3730,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "Ñоздан: %s"
@@ -3743,7 +3747,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "годен до: %s"
@@ -3779,12 +3783,12 @@ msgstr ""
"Учтите, что показанные Ñтепени доÑтоверноÑти могут быть неверными,\n"
"пока программа не будет перезапущена.\n"
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "отозван"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "проÑрочен Ñ"
@@ -4635,177 +4639,177 @@ msgstr "%lu ключей закешированно (%lu подпиÑей)\n"
msgid "%s: keyring created\n"
msgstr "%s: таблица ключей Ñоздана\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr "включать отозванные ключи в резутатах поиÑка"
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr "Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸ при поиÑке по Key ID"
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr "не удалÑÑ‚ÑŒ временные файлы поÑле иÑпользованиÑ"
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr "автоматичеÑки получать ключи при проверке подпиÑей"
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
msgid "honor the preferred keyserver URL set on the key"
msgstr "введите URL предпочтаемого Ñервера ключей: "
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
"Ð’ÐИМÐÐИЕ: параметр Ñервера ключей `%s' не иÑпользуетÑÑ Ð½Ð° данной платформе\n"
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Введите чиÑло(а), N) Следующий или Q) Выход> "
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ \"%s\" не найден на Ñервере ключей\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "ключ не найден на Ñервере ключей\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "запрашиваю ключ %s Ñ %s Ñервера %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "получение ключа %s Ñ %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "поиÑк по именам %s на Ñервере %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr "поиÑк по именам на %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "отправлÑÑŽ ключ %s на %s Ñервер %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "поиÑк \"%s\" на %s Ñервере %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "поиÑк \"%s\" на %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr ""
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "Ð’ÐИМÐÐИЕ: обработчик Ñервера ключей от другой верÑии GnuPG (%s)\n"
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "Ñервер ключей не приÑлал VERSION\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы Ñерверы ключей (иÑпользуйте --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr "Ð´Ð°Ð½Ð½Ð°Ñ Ñборка не поддерживает внешние вызовы Ð´Ð»Ñ Ñервера ключей.\n"
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "нет обработчика Ð´Ð»Ñ Ñхемы Ñервера ключей `%s'\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "дейÑтвие `%s' не поддерживаетÑÑ Ñхемой Ñервера ключей `%s'\n"
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s не поддерживает верÑию обработчика %d\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "превышено Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ñервера ключей\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "ошибка Ñервера ключей\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "ошибка ÑвÑзи Ñ Ñервером ключей: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" не идентификатор ключа: пропущен\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Ð’ÐИМÐÐИЕ: невозможно обновить ключ %s Ñ %s: %s\n"
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "обновление 1 ключа из %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "обновление %d ключей из %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Ð’ÐИМÐÐИЕ: невозможно загрузить ÑÑылку %s: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "Ð’ÐИМÐÐИЕ: невозможно проанализировать ÑÑылку %s\n"
@@ -5152,18 +5156,18 @@ msgstr "Ñоздан новый файл наÑтроек `%s'\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr "Ð’ÐИМÐÐИЕ: параметры в `%s' еще не активны при Ñтом запуÑке\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "не могу иÑпользовать алгоритм Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ключом %d\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"Ð’ÐИМÐÐИЕ: потенциально небезопаÑный ÑеанÑовый ключ, зашифрованный "
"Ñимметричным шифром\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "подпакет типа %d имеет выÑтавленный критичеÑкий бит\n"
@@ -5762,7 +5766,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"невозможно избежать Ñлабого ключа Ð´Ð»Ñ Ñимметричного шифра; %d попыток!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA тебует размер хеша кратного 8 битам\n"
@@ -6324,7 +6328,7 @@ msgstr "преобразование из `%s' в `%s' недоÑтупно\n"
msgid "iconv_open failed: %s\n"
msgstr ""
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "Ñбой Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ `%s' в `%s': %s\n"
@@ -6546,7 +6550,7 @@ msgstr "нет доÑтупа %s - неработоÑпоÑÐ¾Ð±Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
msgid "read options from file"
msgstr "получение параметров конфигурации из файла"
@@ -6586,22 +6590,22 @@ msgstr ""
"СинтакÑиÑ: scdaemon [параметры] [команда [аргументы]]\n"
"Демон Ñмарткарт Ð´Ð»Ñ GnuPG\n"
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
"ИÑпользуйте параметр `--daemon' Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð² фоновом режиме\n"
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr "обработчик fd %d запущен\n"
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "обработчик fd %d оÑтановлен\n"
-#: sm/base64.c:323
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "недопуÑтимый Ñимвол radix64 %02X пропущен\n"
@@ -6624,169 +6628,175 @@ msgstr "протокол dirmngr верÑии %d не поддерживаетÑ
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "не могу подÑоединитьÑÑ Ðº dirmngr - пытаемÑÑ Ð¾Ñ‚ÐºÐ°Ñ‚Ð¸Ñ‚ÑŒÑÑ Ð½Ð°Ð·Ð°Ð´\n"
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr "критичное дополнение Ñертификата %s не поддерживаетÑÑ"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr "издатель Ñертификата не помечен как CA"
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr "Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½Ð½Ð°Ñ ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾Ð¹ политика без наÑтроенных политик"
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, c-format
msgid "failed to open `%s': %s\n"
msgstr "не могу открыть `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr "замечание: не критичные политики Ñертификана не позволÑÑŽÑ‚ÑÑ"
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
msgid "certificate policy not allowed"
msgstr "политика Ñертификата не дозволена"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr "чиÑло Ñовпавших издателей: %d\n"
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
msgid "failed to allocated keyDB handle\n"
msgstr ""
-#: sm/certchain.c:667
+#: sm/certchain.c:678
msgid "certificate has been revoked"
msgstr "Ñертификат был отозван"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
msgid "no CRL found for certificate"
msgstr "не найдена CRL Ð´Ð»Ñ Ñертификата"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
msgid "the available CRL is too old"
msgstr "доÑÑ‚Ð¿ÑƒÐ½Ð°Ñ CRL Ñлишком Ñтара"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr "проверьте, что \"dirmngr\" уÑтановлен корректно\n"
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, c-format
msgid "checking the CRL failed: %s"
msgstr "Ñбой проверки CRL: %s"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
msgid "no issuer found in certificate"
msgstr "не найден издатель в Ñертификате"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "Ñертификат недоÑтоверный: %s"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr "Ñертификат еще не доÑтоверен"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
msgid "certificate has expired"
msgstr "Ñертификат проÑрочен"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr "ÑамоподпиÑанный\tÑертификат имеет ПЛОХУЮ подпиÑÑŒ"
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr "корневой Ñертификат не помечен доверÑемым"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, c-format
msgid "fingerprint=%s\n"
msgstr "отпечаток=%s\n"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr "корневой Ñертификат теперь помечен доверÑемым\n"
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr "в gpg-agent Ð½ÐµÐ»ÑŒÐ·Ñ Ñделать Ñертификат доверÑемым интерактивно\n"
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
"Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ ÑеÑÑии запрещено делать Ñертификат доверÑемым интерактивно\n"
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, c-format
msgid "checking the trust list failed: %s\n"
msgstr "Ñбой проверки ÑпиÑка доверий: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr "цепочка Ñертификации Ñлишком длиннаÑ\n"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr "не найден издатель Ñертификата"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
msgid "certificate has a BAD signature"
msgstr "Ñертификат имеет ПЛОХУЮ подпиÑÑŒ"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr "найдено еще одно ÑоответÑтвие CA Ñертификата - Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ¸"
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "цепочка Ñертификации длиннее дозволенной CA (%d)"
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA требует иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ 160 битной Ñ…Ñш-функции\n"
+#: sm/certcheck.c:103
+#, fuzzy, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr "ключ DSA %s иÑпользует небезопаÑный (%u бит) хеш\n"
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr "(Ñто MD2 алгоритм)\n"
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
msgid "none"
msgstr "нет"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
msgid "[none]"
msgstr "[нет]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
msgid "[Error - invalid encoding]"
msgstr "[Ошибка - недопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°]"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr "[Ошибка - Ðет имени]"
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
msgid "[Error - invalid DN]"
msgstr "[Ошибка - недопуÑтимый DN]"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6801,7 +6811,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr "не задана применимоÑÑ‚ÑŒ ключа - подразумеваем вÑе\n"
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ применимоÑти ключа: %s\n"
@@ -6888,7 +6898,7 @@ msgstr "(Ñто не похоже не зашифрованное Ñообщен
msgid "certificate `%s' not found: %s\n"
msgstr "Ñертификат `%s' не найден: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, c-format
msgid "error locking keybox: %s\n"
msgstr "ошибка блокировки keybox: %s\n"
@@ -6912,181 +6922,181 @@ msgstr "удаление Ñертификата \"%s\" неудачно: %s\n"
msgid "no valid recipients given\n"
msgstr "не заданы получатели\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ файла: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "ошибка запиÑи во временный файл: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
msgid "|[FILE]|make a signature"
msgstr "|[файл]|Ñоздать подпиÑÑŒ"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
msgid "|[FILE]|make a clear text signature"
msgstr "|[файл]|Ñоздать прозрачную подпиÑÑŒ"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
msgid "list external keys"
msgstr "вывеÑти ÑпиÑок внешних ключей"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
msgid "list certificate chain"
msgstr "вывеÑти ÑпиÑок правил Ñертификатов"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
msgid "remove key from the public keyring"
msgstr "удалить ключ из таблицы открытых ключей"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
msgid "import certificates"
msgstr "импорт Ñертификатов"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
msgid "export certificates"
msgstr "ÑкÑпорт Ñертификатов"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr "зарегиÑтрировать Ñмарткарту"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr "передать команду dirmngr"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr "вызываем gpg-protect-tool"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
msgid "change a passphrase"
msgstr "Ñменить фразу-пароль"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
msgid "create base-64 encoded output"
msgstr "вывод в BASE64"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr "предполагаем получение в формате PEM"
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr "предполагаем получение в формате BASE64"
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr "предполагаем получение в двоичном формате"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr "иÑпользуем ÑиÑтемный dirmngr, еÑли доÑтупен"
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr "не ÑверÑÑ‚ÑŒ Ñ CRL"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr "проверка дейÑтвительноÑти иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ OCSP"
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr "|N|чиÑло включаемых Ñертификатов"
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|взÑÑ‚ÑŒ информацию о политиках из FILE"
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr "не проверÑÑ‚ÑŒ политики Ñертификата"
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr "запроÑить пропущенных издаталей Ñертификатов"
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|иÑпользовать NAME как Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾ умолчанию"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "иÑпользовать ключ по умолчанию как Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾ умолчанию"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "не иÑпользовать терминал ÑовÑем"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ v3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "вÑегда иÑпользовать MDC Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "пакетный режим: ничего не запрашивать"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "предполагать Да на большинÑтво вопроÑов"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "предполагать Ðет на большинÑтво вопроÑов"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "добавить данную таблицу ключей в ÑпиÑок таблиц ключей"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "добавить данную таблицу Ñекретных ключей в ÑпиÑок"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|иÑпользовать NAME как Ñекретный ключ по умолчанию"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|иÑпользовать данный Ñервер ключей Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка ключей"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|уÑтановить кодировку терминала в NAME"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|уÑтановить уровень отладки в LEVEL"
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FILE|загрузить модуль Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ FILE"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|иÑпользовать алгоритм ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ NAME"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|иÑпользовать хеш-функцию NAME"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|иÑпользовать алгоритм ÑÐ¶Ð°Ñ‚Ð¸Ñ N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "ИÑпользование: gpgsm [параметры] [файлы] (-h Ð´Ð»Ñ Ð¿Ð¾Ð´Ñказки)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7097,44 +7107,39 @@ msgstr ""
"протокол\n"
"Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾ умолчанию завиÑит от входных данных\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
msgid "usage: gpgsm [options] "
msgstr "иÑпользование: gpgsm [параметры] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "не могу зашифровать Ð´Ð»Ñ `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr "libksba Ñлишком уÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ°Ñ (требуетÑÑ %s, имеетÑÑ %s)\n"
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr "Ð’ÐИМÐÐИЕ: выполнÑемÑÑ Ñ Ð¿Ð¾Ð´Ð´ÐµÐ»Ð°Ð½Ð½Ñ‹Ð¼ ÑиÑтемным временем: "
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "невозможно подпиÑать иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr "Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ вÑÑ‘ еще не реализована\n"
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent недоÑтупен в данной ÑеÑÑии\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "Выберите тип Ñоздаваемого ключа:\n"
@@ -7144,20 +7149,20 @@ msgstr "Выберите тип Ñоздаваемого ключа:\n"
msgid "total number processed: %lu\n"
msgstr "вÑего обработано: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
msgid "error storing certificate\n"
msgstr "ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñертификата\n"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr "ошибка базовой проверки Ñертификата - не импортирован\n"
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, c-format
msgid "error importing certificate: %s\n"
msgstr "ошибка Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñертификата: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, c-format
msgid "error reading input: %s\n"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð°: %s\n"
@@ -7176,11 +7181,11 @@ msgstr "возможно Ñледует запуÑтить gpg-agent ÑпервÐ
msgid "keybox `%s' created\n"
msgstr "Ñоздан keybox `%s'\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
msgid "failed to get the fingerprint\n"
msgstr "Ñбой Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¿ÐµÑ‡Ð°Ñ‚ÐºÐ°\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
msgid "failed to allocate keyDB handle\n"
msgstr ""
@@ -7199,17 +7204,17 @@ msgstr ""
msgid "error storing certificate: %s\n"
msgstr "ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñертификата: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñохраненных флагов: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, c-format
msgid "error storing flags: %s\n"
msgstr "ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð»Ð°Ð³Ð¾Ð²: %s\n"
@@ -7282,31 +7287,35 @@ msgstr "ДейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ от"
msgid " aka"
msgstr " aka"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
msgid "quiet"
msgstr ""
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "ИÑпользование: gpg-connect-agent [параметры] (-h Ð´Ð»Ñ Ð¿Ð¾Ð´Ñказки)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
@@ -7314,70 +7323,70 @@ msgstr ""
"СинтакÑиÑ: gpg-connect-agent: [параметры]\n"
"СвÑзываетÑÑ Ñ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð½Ñ‹Ð¼ агентом и отcылает команды\n"
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
msgid "line too long - skipped\n"
msgstr "Ñтрока Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ - пропущено\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, c-format
msgid "unknown command `%s'\n"
msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, c-format
msgid "sending line failed: %s\n"
msgstr "Ñбой отправки Ñтроки: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, c-format
msgid "receiving line failed: %s\n"
msgstr "Ñбой Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñтроки: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, c-format
msgid "error sending %s command: %s\n"
msgstr "ошибка отправки %s команды: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, c-format
msgid "error sending standard options: %s\n"
msgstr "ошибка отправки Ñтандартных параметров: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr "Параметры контролирующие вывод диагноÑтики"
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr "Параметры контролирующие конфигурацию"
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr "Параметры полезные Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|ÑохранÑÑ‚ÑŒ журнал режима Ñервера в FILE"
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr "Параметры контролирующие безопаÑноÑÑ‚ÑŒ"
@@ -7407,31 +7416,35 @@ msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñерверов ключей"
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr "не проверÑÑ‚ÑŒ CRLd Ð´Ð»Ñ ÐºÐ¾Ñ€Ð½ÐµÐ²Ñ‹Ñ… Ñертификатов"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr "Параметры контрролирующие формат вывода"
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr "ÐаÑтройки HTTP Ñерверов"
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr "иÑпользовать ÑиÑтемные наÑтройки HTTP проки"
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr "ÐаÑтройки LDAP Ñерверов"
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr "ÐаÑтройки OCSP"
@@ -7494,7 +7507,7 @@ msgstr "Команды админиÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ разрешенÑ
msgid "error allocating enough memory: %s\n"
msgstr "ошибка раÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñти: %s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
msgid ""
"@\n"
"Commands:\n"
@@ -7504,35 +7517,35 @@ msgstr ""
"Команды:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
msgid "decryption modus"
msgstr "режим раÑшифрованиÑ"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
msgid "encryption modus"
msgstr "режим зашифровываниÑ"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
msgid "program filename"
msgstr ""
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr "файл Ñекретного ключа (требуетÑÑ)"
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr "ввод имени файла (stdin по умолчанию)"
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "ИÑпользование: symcryptrun [параметры] (-h Ð´Ð»Ñ Ð¿Ð¾Ð´Ñказки)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
@@ -7542,122 +7555,125 @@ msgstr ""
"[параметры...] COMMAND [файл-иÑточник]\n"
"Вызывает проÑтой инÑтрумент шифрованиÑ\n"
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s над %s прервано, ÑÑ‚Ð°Ñ‚ÑƒÑ %i\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "Ñбой %s над %s, ÑÑ‚Ð°Ñ‚ÑƒÑ %i\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "невозможно Ñоздание временного каталога `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "невозможно открытие %s на запиÑÑŒ: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, c-format
msgid "error writing to %s: %s\n"
msgstr "ошибка запиÑи в %s: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, c-format
msgid "error reading from %s: %s\n"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· %s: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, c-format
msgid "error closing %s: %s\n"
msgstr "ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ %s: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr "не задан параметр --program\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr "поддерживаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ параметры --decrypt и --encrypt\n"
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr "не задан параметр --keyfile\n"
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, c-format
msgid "could not create pipe: %s\n"
msgstr ""
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, c-format
msgid "could not create pty: %s\n"
msgstr ""
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, c-format
msgid "execv failed: %s\n"
msgstr ""
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, c-format
msgid "select failed: %s\n"
msgstr ""
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, c-format
msgid "read failed: %s\n"
msgstr ""
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, c-format
msgid "pty read failed: %s\n"
msgstr ""
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, c-format
msgid "waitpid failed: %s\n"
msgstr ""
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr "потомок завершилÑÑ, ÑÑ‚Ð°Ñ‚ÑƒÑ %i\n"
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr ""
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr ""
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr "Ñледует задать %s либо %s\n"
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr "не задан клаÑÑ\n"
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, c-format
msgid "class %s is not supported\n"
msgstr "клаÑÑ %s не поддерживаетÑÑ\n"
+
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA требует иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ 160 битной Ñ…Ñш-функции\n"
diff --git a/po/sk.po b/po/sk.po
index c26fb1dd9..51427fac1 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -88,8 +88,8 @@ msgstr "nemô¾em vytvori» `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemô¾em otvori» `%s': %s\n"
@@ -188,13 +188,13 @@ 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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "zmeni» heslo"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "zmeni» heslo"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -223,13 +223,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "s dodatoènými informáciami"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "by» o trochu tich¹í"
@@ -241,7 +241,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|SÚBOR|nahra» roz¹irujúci modul SÚBOR"
@@ -254,8 +254,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "vyhµada» kµúèe na serveri kµúèov"
@@ -311,9 +311,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
@@ -331,138 +331,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "súbor s mo¾nos»ami `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "èítam mo¾nosti z `%s'\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "chyba pri vytváraní `%s': %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nemô¾em vytvori» adresár `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nemô¾em vytvori»: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisujem tajný kµúè do `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: adresár vytvorený\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, 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:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, 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:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: preskoèené: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto sedení dostupný\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
@@ -478,51 +467,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, 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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, 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:1210
+#: agent/protect-tool.c:1196
#, 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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, 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:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "nesprávne heslo"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "Zru¹i»"
@@ -562,7 +551,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "chyba pri èítaní `%s': %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -575,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -585,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -597,19 +586,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "ano"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -653,12 +642,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "chyba pri èítaní `%s': %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "chyba pri vytváraní `%s': %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[User id not found]"
@@ -752,6 +741,16 @@ msgstr ""
msgid "cC"
msgstr "c"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1185,13 +1184,13 @@ msgstr "--output pre tento príkaz nefunguje\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1473,22 +1472,22 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1504,27 +1503,27 @@ msgstr "|[súbor]|vytvori» podpis"
msgid "|[file]|make a clear text signature"
msgstr "|[súbor]|vytvori» podpis v èitateµnom dokumente"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "vytvori» podpis oddelený od dokumentu"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "¹ifrova» dáta"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "¹ifrovanie len so symetrickou ¹ifrou"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "de¹ifrova» dáta (implicitne)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "verifikova» podpis"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "vypísa» zoznam kµúèov"
@@ -1537,11 +1536,11 @@ msgstr "vypísa» zoznam kµúèov a podpisov"
msgid "list and check key signatures"
msgstr "skontrolova» podpisy kµúèov"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "vypísa» zoznam kµúèov a fingerprintov"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "vypísa» zoznam tajných kµúèov"
@@ -1577,11 +1576,11 @@ msgstr "vytvori» revokaèný certifikát"
msgid "export keys"
msgstr "exportova» kµúèe"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportova» kµúèe na server kµúèov"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importova» kµúèe zo servera kµúèov"
@@ -1617,12 +1616,12 @@ msgstr "aktualizova» databázu dôvery"
msgid "|algo [files]|print message digests"
msgstr "|algo [súbory]|vypí¹ hash"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1632,35 +1631,35 @@ msgstr ""
"Mo¾nosti:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "vytvor výstup zakódovaný pomocou ASCII"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|MENO|¹ifrova» pre MENO"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "pou¾i» kánonický textový mód"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "pou¾i» ako výstupný súbor"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "nevykona» ¾iadne zmeny"
@@ -1676,7 +1675,7 @@ msgstr ""
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1685,7 +1684,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1725,7 +1724,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1753,7 +1752,7 @@ msgstr "Kompresia: "
msgid "usage: gpg [options] "
msgstr "pou¾itie: gpg [mo¾nosti] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "konfliktné príkazy\n"
@@ -1880,6 +1879,11 @@ msgstr "uká¾ v ktorom súbore kµúèov je vypísaný kµúè"
msgid "show expiration dates during signature listings"
msgstr "V súbore tajných kµúèov chýba zodpovedajúci podpis\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2022,7 +2026,7 @@ msgstr "%s:%d: neplatný parameter pre export\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n"
@@ -2064,11 +2068,11 @@ msgstr "v móde --pgp2 musíte pou¾i» súbor (nie rúru).\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný ¹ifrovací algoritmus je neplatný\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
@@ -2306,7 +2310,7 @@ msgstr "Zmaza» tento kµúè zo súboru kµúèov? "
msgid "make timestamp conflicts only a warning"
msgstr "konflikt èasového razítka"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|zapísa» informácie o stave do tohto FD"
@@ -3874,7 +3878,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nemô¾em vytvori»: %s\n"
@@ -3891,7 +3895,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [platnos» skonèí: %s]"
@@ -3927,13 +3931,13 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
#, fuzzy
msgid "revoked"
msgstr "[revokované]"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
#, fuzzy
msgid "expired"
@@ -4807,184 +4811,184 @@ msgstr "%lu kµúèov skontrolovaných (%lu podpisov)\n"
msgid "%s: keyring created\n"
msgstr "%s: súbor kµúèov (keyring) vytvorený\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
#, fuzzy
msgid "disabled"
msgstr "disable"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatný parameter pre export\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "kµúè `%s' nebol nájdený: %s\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "kµúè `%s' nebol nájdený: %s\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "vyhµadávam \"%s\" na HKP serveri %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, 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:1385
+#: g10/keyserver.c:1392
#, 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:1388
+#: g10/keyserver.c:1395
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "vyhµadávam \"%s\" na HKP serveri %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
#, fuzzy
msgid "no keyserver action!\n"
msgstr "neplatný parameter pre export\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
#, fuzzy
msgid "keyserver timed out\n"
msgstr "chyba servera kµúèov"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
#, fuzzy
msgid "keyserver internal error\n"
msgstr "chyba servera kµúèov"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "nepodarilo sa prija» kµúè zo servera: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "po¾adujem kµúè %08lX z %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VAROVANIE: nemô¾em vymaza» doèasný súbor (%s) `%s': %s\n"
@@ -5337,17 +5341,17 @@ msgstr "vytvorený nový konfiguraèný súbor `%s'\n"
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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"VAROVANIE: pravdepodobne nebezpeèný symetricky ¹ifrovaný kµúè sedenia\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d má nastavený kritický bit\n"
@@ -5960,7 +5964,7 @@ 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
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6533,7 +6537,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "nemo¾no otvori» súbor: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@ -6760,7 +6764,7 @@ msgstr "nenájdené ¾iadne platné dáta vo formáte OpenPGP.\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "èítam mo¾nosti z `%s'\n"
@@ -6804,21 +6808,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "neplatný znak vo formáte radix64 %02x bol preskoèený\n"
@@ -6842,180 +6846,186 @@ msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "nemô¾em otvori» `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "zapisujem tajný kµúè do `%s'\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "nemô¾em inicializova» databázu dôvery: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "POZNÁMKA: kµúè bol revokovaný"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "nesprávny certifikát"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "Kµúè k dispozícii na: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "vytvori» revokaèný certifikát"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "Platnos» kµúèa vypr¹ala!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "vypísa» fingerprint"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "verifikova» podpis"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA po¾aduje pou¾itie 160 bitového hashovacieho algoritmu\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "nie"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "neznáme"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "chyba: neplatný odtlaèok\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "chyba: neplatný odtlaèok\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -7030,7 +7040,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, 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"
@@ -7117,7 +7127,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "kµúè `%s' nebol nájdený: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "chyba pri èítaní bloku kµúèa: %s\n"
@@ -7142,197 +7152,197 @@ msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n"
msgid "no valid recipients given\n"
msgstr "(®iadny popis)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "zapisujem do '%s'\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[súbor]|vytvori» podpis"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[súbor]|vytvori» podpis v èitateµnom dokumente"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "vypísa» zoznam tajných kµúèov"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "nesprávny certifikát"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "odstráni» kµúè zo súboru verejných kµúèov"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "nesprávny certifikát"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "nesprávny certifikát"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "zmeni» heslo"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "vytvor výstup zakódovaný pomocou ASCII"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|MENO|pou¾i» MENO ako implicitného adresáta"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr ""
"pou¾i» implicitný kµúè ako implicitného\n"
" adresáta"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "vôbec nepou¾íva» terminál"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "vynúti» podpisy verzie 3"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "na ¹ifrovanie v¾dy pou¾i» MDC"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "dávkový re¾im: nikdy sa na niè nepýta»"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "automaticky odpoveda» áno na väè¹inu otázok"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "automaticky odpoveda» NIE na väè¹inu otázok"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
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:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "prida» tento súbor tajných kµúèov do zoznamu"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|MENO|pou¾i MENO ako implicitný tajný kµúè"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
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:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|SÚBOR|nahra» roz¹irujúci modul SÚBOR"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ALG|pou¾i» ¹ifrovací algoritmus ALG"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ALG|pou¾i» hashovací algoritmus ALG"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|pou¾i» kompresný algoritmus N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Pou¾itie: gpg [mo¾nosti] [súbory] (-h pre pomoc)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7343,45 +7353,40 @@ msgstr ""
"podpísa», overi», ¹ifrova» alebo de¹ifrova»\n"
"implicitné operácie závisia od vstupných dát\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "pou¾itie: gpg [mo¾nosti] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "nemô¾em sa pripoji» k `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "zapisujem do '%s'\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nemô¾em zavrie» `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent nie je v tomto sedení dostupný\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7391,21 +7396,21 @@ msgstr "Prosím, vyberte druh kµúèa, ktorý chcete:\n"
msgid "total number processed: %lu\n"
msgstr "Celkovo spracovaných kµúèov: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "vytvori» revokaèný certifikát"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "chyba pri èítaní `%s': %s\n"
@@ -7424,12 +7429,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "súbor kµúèov (keyring) `%s' vytvorený\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, 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:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "nemô¾em inicializova» databázu dôvery: %s\n"
@@ -7449,17 +7454,17 @@ msgstr "chyba pri vytváraní hesla: %s\n"
msgid "error storing certificate: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problém overenia revokácie: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "chyba pri èítaní `%s': %s\n"
@@ -7532,103 +7537,107 @@ msgstr "Dobrý podpis od \""
msgid " aka"
msgstr " alias \""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "ukonèi»"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, 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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "riadok je príli¹ dlhý\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "neznámy implicitný adresát `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7656,31 +7665,36 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|ALG|pou¾i» ¹ifrovací algoritmus ALG pre heslá"
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7744,7 +7758,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:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7754,166 +7768,169 @@ msgstr ""
"@Príkazy:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "de¹ifrovanie o.k.\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "de¹ifrovanie o.k.\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [meno súboru]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Pou¾itie: gpg [mo¾nosti] [súbory] (-h pre pomoc)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, 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:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "nemo¾no otvori» súbor: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "nemô¾em vytvori» adresár `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, fuzzy, c-format
msgid "could not open %s for writing: %s\n"
msgstr "nemo¾no otvori» %s: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, 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:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "chyba pri èítaní `%s': %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "chyba pri èítaní `%s': %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "¾iadne vzialené vykonávanie programu nie je podporované\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "%s: nemô¾em vytvori»: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "%s: nemô¾em vytvori»: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "aktualizácia zlyhala: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "nemô¾em vytvori» `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "nemô¾em vytvori» `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ochranný algoritmus %d%s nie je podporováný\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA po¾aduje pou¾itie 160 bitového hashovacieho algoritmu\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
@@ -8682,9 +8699,6 @@ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
#~ msgstr "|ALG|pou¾i» hashovací algoritmus ALG pre heslá"
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|ALG|pou¾i» ¹ifrovací algoritmus ALG pre heslá"
-
#~ msgid "throw keyid field of encrypted packets"
#~ msgstr ""
#~ "zahodi» identifikátor kµúèa zo ¹ifrovaných\n"
diff --git a/po/sv.po b/po/sv.po
index 5276e5474..eb6a5797d 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2007-02-17 13:13+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -107,8 +107,8 @@ msgstr "kan inte skapa \"%s\": %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte öppna \"%s\": %s\n"
@@ -208,12 +208,12 @@ msgstr "Ange ny lösenfras"
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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
msgid "Please re-enter this passphrase"
msgstr "Ange denna lösenfras igen"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr "stämmer inte överens - försök igen"
@@ -222,7 +222,7 @@ 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:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
msgid ""
"@Options:\n"
@@ -240,13 +240,13 @@ msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "utförlig"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "var något tystare"
@@ -258,7 +258,7 @@ msgstr "sh-liknande kommandoutdata"
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
@@ -270,8 +270,8 @@ msgstr "frigör inte från konsollen"
msgid "do not grab keyboard and mouse"
msgstr "fånga inte tangentbord och mus"
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "använd en loggfil för servern"
@@ -324,9 +324,9 @@ msgstr "aktivera ssh-agent-emulering"
msgid "|FILE|write environment settings also to FILE"
msgstr "|FIL|skriv miljöinställningar även till FIL"
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
msgid "Please report bugs to <"
msgstr "Rapportera fel till <"
@@ -342,137 +342,126 @@ msgstr ""
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
-#: agent/gpg-agent.c:311
-#, 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"
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr "slut på kärna vid allokering av %lu byte"
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
-#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
-msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#, 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:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fel när \"%s\" skapades: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: kan inte skapa katalog: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr "namnet på uttaget är för långt\n"
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "fel när \"%s\" bands till uttag: %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, c-format
msgid "listening on socket `%s'\n"
msgstr "lyssnar på uttaget \"%s\"\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "katalogen \"%s\" skapades\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() misslyckades för \"%s\": %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "kan inte använda \"%s\" som hemkatalog\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, 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:1509
+#: agent/gpg-agent.c:1466
#, 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:1526
+#: agent/gpg-agent.c:1483
#, 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:1531
+#: agent/gpg-agent.c:1488
#, 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:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select misslyckades: %s - väntar 1 s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
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:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "GPG-Agent protokoll version %d stöds inte\n"
@@ -491,11 +480,11 @@ msgstr ""
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@ -503,22 +492,22 @@ msgstr ""
"Syntax: gpg-protect-tool [flaggor] [argument]\n"
"Underhållsverktyg för hemliga nycklar\n"
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
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:1210
+#: agent/protect-tool.c:1196
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:1213
+#: agent/protect-tool.c:1199
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:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@ -526,16 +515,16 @@ msgstr ""
"Ange lösenfrasen eller PIN-koden som\n"
"behövs för att färdigställa denna åtgärd."
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
msgid "Passphrase:"
msgstr "Lösenfras:"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, 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:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
msgid "cancelled\n"
msgstr "avbruten\n"
@@ -574,7 +563,7 @@ msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
msgid "error reading `%s', line %d: %s\n"
msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr "fel vid inläsning av betrodda rotcertifikat\n"
@@ -587,7 +576,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -599,7 +588,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr "Korrekt"
@@ -611,7 +600,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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -620,11 +609,11 @@ msgstr ""
"Litar du förbehållslöst på%%0A \"%s\"%%0Aatt korrekt certifiera "
"användarcertifikat?"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr "Nej"
@@ -669,12 +658,12 @@ msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
msgid "error running `%s': terminated\n"
msgstr "fel vid körning av \"%s\": avslutades\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, c-format
msgid "error creating socket: %s\n"
msgstr "fel när uttag skapades: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
msgid "host not found"
msgstr "värden hittades inte"
@@ -764,6 +753,16 @@ msgstr "oO"
msgid "cC"
msgstr "aAsS"
+#: common/miscellaneous.c:73
+#, 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
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr "slut på kärna vid allokering av %lu byte"
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1176,13 +1175,13 @@ msgstr "--output kan inte användas för detta kommando\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1456,22 +1455,22 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1487,28 +1486,28 @@ msgstr "|[fil]|skapa en signatur"
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|skapa en klartextsignatur"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "kryptera data"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
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:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "validera en signatur"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "lista nycklar"
@@ -1520,11 +1519,11 @@ msgstr "lista nycklar och signaturer"
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "lista hemliga nycklar"
@@ -1560,11 +1559,11 @@ msgstr "generera ett spärrcertifikat"
msgid "export keys"
msgstr "exportera nycklar"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "importera nycklar från en nyckelserver"
@@ -1600,13 +1599,13 @@ msgstr "uppdatera tillitsdatabasen"
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skriv ut kontrollsummor"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
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:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1616,31 +1615,31 @@ msgstr ""
"Flaggor:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|NAMN|kryptera för NAMN"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "använd som fil för utdata"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "gör inga ändringar"
@@ -1658,7 +1657,7 @@ 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:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1666,7 +1665,7 @@ msgstr ""
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1707,7 +1706,7 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1735,7 +1734,7 @@ msgstr "Komprimering: "
msgid "usage: gpg [options] "
msgstr "användning: gpg [flaggor] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
@@ -1865,6 +1864,11 @@ msgstr "visa nyckelringens namn i nyckellistningar"
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
+#: g10/gpg.c:1835
+#, 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:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -2000,7 +2004,7 @@ 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:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
@@ -2043,11 +2047,11 @@ msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
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:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
@@ -2290,7 +2294,7 @@ msgstr "ta nycklarna från denna nyckelring "
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:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
@@ -3835,7 +3839,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "skapat: %s"
@@ -3852,7 +3856,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "går ut: %s"
@@ -3888,12 +3892,12 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "spärrad"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "utgånget"
@@ -4770,178 +4774,178 @@ msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr "inkludera spärrade nycklar i sökresultatet"
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr "inkludera undernycklar vid sökning efter nyckel-id"
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
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:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr "ta inte bort temporärfiler efter de använts"
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr "hämta automatiskt nycklar vid validering av signaturer"
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
msgid "honor the preferred keyserver URL set on the key"
msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
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:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "inaktiverad"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "nyckeln hittades inte på nyckelservern\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "begär nyckeln %s från %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr "söker efter namn från %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "skickar nycken %s till %s-servern %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "skickar nyckeln %s till %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, 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:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "söker efter \"%s\" från %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "ingen nyckelserveråtgärd!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "nyckelserver skickade inte VERSION\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, 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:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "tidsgräns överstigen för nyckelserver\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "internt fel i nyckelserver\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "kommunikationsfel mot nyckelserver: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "uppdaterar 1 nyckel från %s\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "uppdaterar %d nycklar från %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, 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:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VARNING: kunde inte tolka uri:n %s\n"
@@ -5295,16 +5299,16 @@ 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:192
+#: g10/parse-packet.c:193
#, 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:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, 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"
@@ -5924,7 +5928,7 @@ msgstr ""
"kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
"%d gånger!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
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"
@@ -6519,7 +6523,7 @@ msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
msgid "iconv_open failed: %s\n"
msgstr "iconv_open misslyckades: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
@@ -6741,7 +6745,7 @@ msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
msgid "run in multi server mode (foreground)"
msgstr "kör i multiserverläge (förgrund)"
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
msgid "read options from file"
msgstr "läs inställningar från fil"
@@ -6781,22 +6785,22 @@ msgstr ""
"Syntax: scdaemon [flaggor] [kommando [argument]]\n"
"Smartkortsdemon för GnuPG\n"
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
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:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr "hanterare för fd %d startad\n"
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "hanterare för fd %d avslutad\n"
# överhoppad eller hoppades över?
-#: sm/base64.c:323
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
@@ -6819,168 +6823,174 @@ msgstr "dirmngr-protokoll version %d stöds inte\n"
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:165
+#: sm/certchain.c:176
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr "kritiska certifikattillägget %s stöds inte"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr "utfärdarens certifikat är inte markerat som en CA"
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr "kritisk markerad policy utan konfigurerade policier"
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, c-format
msgid "failed to open `%s': %s\n"
msgstr "misslyckades med att öppna \"%s\": %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
msgid "certificate policy not allowed"
msgstr "certifikatpolicy tillåts inte"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr "slår upp utfärdare på extern plats\n"
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr "antal utfärdare som matchar: %d\n"
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
msgid "failed to allocated keyDB handle\n"
msgstr "misslyckades med att allokera keyDB-hanterare\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
msgid "certificate has been revoked"
msgstr "certifikatet har spärrats"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
msgid "no CRL found for certificate"
msgstr "ingen spärrlista hittades för certifikatet"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
msgid "the available CRL is too old"
msgstr "den tillgängliga spärrlistan är för gammal"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr "se till att \"dirmngr\" är korrekt installerat\n"
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, c-format
msgid "checking the CRL failed: %s"
msgstr "kontroll mot spärrlistan misslyckades: %s"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
msgid "no issuer found in certificate"
msgstr "ingen utfärdare hittades i certifikatet"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "certifikat med felaktig giltighetstid: %s"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr "certifikatet är ännu inte giltigt"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
msgid "certificate has expired"
msgstr "certifikatet har gått ut"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr "självsignerat certifikat har en FELAKTIG signatur"
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr "rotcertifikatet har inte markerats som betrott"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, c-format
msgid "fingerprint=%s\n"
msgstr "fingeravtryck=%s\n"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr "rotcertifikatet har nu markerats som betrott\n"
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
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:976
+#: sm/certchain.c:1007
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:986
+#: sm/certchain.c:1017
#, c-format
msgid "checking the trust list failed: %s\n"
msgstr "kontroll mot tillitslistan misslyckades: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr "certifikatkedjan är för lång\n"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr "utfärdarens certifikat hittades inte"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
msgid "certificate has a BAD signature"
msgstr "certifikatet har en FELAKTIG signatur"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
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:1139
+#: sm/certchain.c:1170
#, 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:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA kräver användning av en 160-bitars hashalgoritm\n"
+#: sm/certcheck.c:103
+#, 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:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr "(det här är MD2-algoritmen)\n"
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
msgid "none"
msgstr "ingen"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
msgid "[none]"
msgstr "[ingen]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
msgid "[Error - invalid encoding]"
msgstr "[Fel - ogiltig kodning]"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr "[Fel - slut på kärna]"
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr "[Fel - Inget namn]"
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
msgid "[Error - invalid DN]"
msgstr "[Fel - ogiltigt DN]"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6995,7 +7005,7 @@ msgstr ""
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:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
@@ -7084,7 +7094,7 @@ msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
msgid "certificate `%s' not found: %s\n"
msgstr "certifikatet \"%s\" hittades inte: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, c-format
msgid "error locking keybox: %s\n"
msgstr "fel vid låsning av nyckelskåp: %s\n"
@@ -7108,182 +7118,182 @@ msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
msgid "no valid recipients given\n"
msgstr "inga giltiga mottagare angavs\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "fel när temporärfil skapades: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "fel vid skrivning till temporärfil: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
msgid "|[FILE]|make a signature"
msgstr "|[FIL]|skapa en signatur"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
msgid "|[FILE]|make a clear text signature"
msgstr "|[FIL]|skapa en klartext-signatur"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
msgid "list external keys"
msgstr "lista externa nycklar"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
msgid "list certificate chain"
msgstr "lista certifikatkedja"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
msgid "remove key from the public keyring"
msgstr "ta bort nyckel från den publika nyckelringen"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
msgid "import certificates"
msgstr "importera certifikat"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
msgid "export certificates"
msgstr "exportera certifikat"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr "registrera ett smartkort"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr "skicka ett kommando till dirmngr"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr "starta gpg-protect-tool"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
msgid "change a passphrase"
msgstr "ändra en lösenfras"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
msgid "create base-64 encoded output"
msgstr "skapa base-64-kodat utdata"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr "anta att inmatning är i PEM-format"
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr "anta att inmatning är i base-64-format"
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr "anta att inmatning är i binärformat"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr "använd systemets dirmngr om tillgängligt"
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr "kontrollera aldrig mot spärrlista"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr "kontrollera giltigheten med OCSP"
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr "|N|antal certifikat att inkludera"
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr "|FIL|hämta policyinformation från FIL"
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr "kontrollera inte certifikatpolicier"
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr "hämta saknade utfärdarcertifikat"
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|NAMN|använd NAMN som standardmottagare"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "använd standardnyckeln som standardmottagare"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "använd inte terminalen alls"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "tvinga v3-signaturer"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "använd alltid en MDC för kryptering"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "satsläge: fråga aldrig"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "anta ja på de flesta frågorna"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "anta nej på de flesta frågorna"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "lägg till denna nyckelring till listan över nyckelringar"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "lägg till denna hemliga nyckelring till listan"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
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:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|FIL|läs in tilläggsmodulen FIL"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMN|använd chifferalgoritmen NAMN"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|använd komprimeringsalgoritmen N"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
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:523
+#: sm/gpgsm.c:527
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7293,43 +7303,38 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
"standardåtgärden beror på inmatningsdata\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
msgid "usage: gpgsm [options] "
msgstr "användning: gpgsm [flaggor] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "kan inte kryptera till \"%s\": %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr "libksba är för gammal (behöver %s, har %s)\n"
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan inte signera med \"%s\": %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr "det här kommandot har ännu inte implementerats\n"
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
msgid "key generation is not available from the commandline\n"
msgstr "nyckelgenerering är inte tillgänglig från kommandoraden\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7339,20 +7344,20 @@ msgstr "använd skriptet \"%s\" för att generera en ny nyckel\n"
msgid "total number processed: %lu\n"
msgstr "totalt antal behandlade: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
msgid "error storing certificate\n"
msgstr "fel vid lagring av certifikat\n"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, c-format
msgid "error importing certificate: %s\n"
msgstr "fel vid import av certifikat: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, c-format
msgid "error reading input: %s\n"
msgstr "fel vid läsning av indata: %s\n"
@@ -7371,11 +7376,11 @@ msgstr "du kanske vill starta gpg-agent först\n"
msgid "keybox `%s' created\n"
msgstr "nyckelskåpet \"%s\" skapat\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
msgid "failed to get the fingerprint\n"
msgstr "misslyckades med att få fingeravtrycket\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
msgid "failed to allocate keyDB handle\n"
msgstr "misslyckades med att allokera keyDB-hanterare\n"
@@ -7394,17 +7399,17 @@ msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
msgid "error storing certificate: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, c-format
msgid "error storing flags: %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
@@ -7487,31 +7492,35 @@ msgstr "Korrekt signatur från"
msgid " aka"
msgstr " även känd som"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
msgid "quiet"
msgstr "tyst"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr "skriv ut data hexkodat"
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr "kör Assuan-servern som angivits på kommandoraden"
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr "använd inte utökat anslutningsläge"
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
@@ -7519,70 +7528,70 @@ msgstr ""
"Syntax: gpg-connect-agent [flaggor]\n"
"Anslut till en körande agent och skicka kommandon\n"
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, 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:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
msgid "line too long - skipped\n"
msgstr "raden är för lång - hoppades över\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
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:457
+#: tools/gpg-connect-agent.c:471
#, c-format
msgid "unknown command `%s'\n"
msgstr "okänt kommando \"%s\"\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, c-format
msgid "sending line failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, c-format
msgid "receiving line failed: %s\n"
msgstr "mottagande rad misslyckades: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, c-format
msgid "error sending %s command: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, c-format
msgid "error sending standard options: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr "Flaggor som kontrollerar diagnosutdata"
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr "Flaggor som kontrollerar konfigurationen"
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr "Flaggor användbara för felsökning"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv serverlägesloggar till FIL"
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr "Flaggor som kontrollerar säkerheten"
@@ -7612,31 +7621,35 @@ msgstr "Konfiguration för nyckelservrar"
msgid "allow PKA lookups (DNS requests)"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr "kontrollera inte spärrlistor för rotcertifikat"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr "Flaggor som kontrollerar formatet på utdata"
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr "Konfiguration för HTTP-servrar"
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr "använd systemets HTTP-proxyinställningar"
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration av LDAP-servrar som ska användas"
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr "Konfiguration för OCSP"
@@ -7699,7 +7712,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:173
+#: tools/symcryptrun.c:154
msgid ""
"@\n"
"Commands:\n"
@@ -7709,35 +7722,35 @@ msgstr ""
"Kommandon:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
msgid "decryption modus"
msgstr "dekrypteringsmodus"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
msgid "encryption modus"
msgstr "krypteringsmodus"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr "verktygsklass (confucius)"
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
msgid "program filename"
msgstr "programfilnamn"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr "hemlig nyckelfil (krävs)"
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr "filnamn för inmatning (standardvärde är standard in)"
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
@@ -7747,128 +7760,131 @@ msgstr ""
"[flaggor...] KOMMANDO [inmatningsfil]\n"
"Anropa ett enkelt symmetriskt krypteringsverktyg\n"
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s på %s avbröts med status %i\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, c-format
msgid "%s on %s failed with status %i\n"
msgstr "%s på %s misslyckades med status %i\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "kunde inte öppna %s för skrivning: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, c-format
msgid "error writing to %s: %s\n"
msgstr "fel vid skrivning till %s: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, c-format
msgid "error reading from %s: %s\n"
msgstr "fel vid läsning från %s: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, c-format
msgid "error closing %s: %s\n"
msgstr "fel vid stängning av %s: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr "flaggan --program angavs inte\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr "endast --decrypt och --encrypt stöds\n"
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr "flaggan --keyfile angavs inte\n"
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr "kan inte allokera argumentvektor\n"
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, c-format
msgid "could not create pipe: %s\n"
msgstr "kunde inte skapa rör: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, c-format
msgid "could not create pty: %s\n"
msgstr "kunde inte skapa pty: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr "kunde inte grena process: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, c-format
msgid "execv failed: %s\n"
msgstr "execv misslyckades: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, c-format
msgid "select failed: %s\n"
msgstr "val misslyckades: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, c-format
msgid "read failed: %s\n"
msgstr "läsning misslyckades: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty-läsning misslyckades: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid misslyckades: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr "barnprocess avbröts med status %i\n"
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "kan inte allokera infilssträng: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "kan inte allokera utfilssträng: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr "antingen %s eller %s måste anges\n"
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr "ingen klass tillhandahölls\n"
# Skyddssammandraget låter underligt
# Kontrollsumma?
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, c-format
msgid "class %s is not supported\n"
msgstr "klassen %s stöds inte\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA kräver användning av en 160-bitars hashalgoritm\n"
+
#~ msgid "Usage: sc-copykeys [options] (-h for help)\n"
#~ msgstr "Användning: sc-copykeys [flaggor] (-h för hjälp)\n"
diff --git a/po/tr.po b/po/tr.po
index bc6be36e1..57a5229e5 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2006-11-04 03:45+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -87,8 +87,8 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
@@ -185,12 +185,12 @@ msgstr "Anahtar parolasını giriniz\n"
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:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
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:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr "aynı değiller - tekrar deneyin"
@@ -198,7 +198,7 @@ msgstr "aynı değiller - tekrar deneyin"
msgid "Please enter the new passphrase"
msgstr "Lütfen yeni anahtar parolasını girin"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
msgid ""
"@Options:\n"
@@ -216,13 +216,13 @@ msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ayrıntılı"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
@@ -234,7 +234,7 @@ msgstr "sh tarzı komut çıktısı"
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
@@ -246,8 +246,8 @@ msgstr "konsoldan kopulmaz"
msgid "do not grab keyboard and mouse"
msgstr "klavye ve fare gaspedilmez"
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "sunucu için bir günlük dosyası kullanılır"
@@ -299,9 +299,9 @@ msgstr "ssh-agent öykünümü etkinleşir"
msgid "|FILE|write environment settings also to FILE"
msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
msgid "Please report bugs to <"
msgstr "Yazılım hatalarını lütfen <"
@@ -317,137 +317,126 @@ msgstr ""
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
-#: agent/gpg-agent.c:311
-#, 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ı"
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
-#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
-msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#, 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:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, 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:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "`%s' oluÅŸturulurken hata: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "`%s' dizini oluşturulamıyor: %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr "soketin ismi çok uzun\n"
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, c-format
msgid "listening on socket `%s'\n"
msgstr "`%s' soketi dinlemede\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "dizin `%s' oluÅŸturuldu\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, 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:1402
+#: agent/gpg-agent.c:1359
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "`%s' ev dizini olarak kullanılamıyor\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, 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:1509
+#: agent/gpg-agent.c:1466
#, 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:1526
+#: agent/gpg-agent.c:1483
#, 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:1531
+#: agent/gpg-agent.c:1488
#, 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:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, 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:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
@@ -465,11 +454,11 @@ msgstr ""
"Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
"Parola arabelleği bakımcısı\n"
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
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:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@ -477,16 +466,16 @@ msgstr ""
"Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
"Gizli anahtar bakım aracı\n"
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
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:1210
+#: agent/protect-tool.c:1196
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:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@ -494,7 +483,7 @@ msgstr ""
"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
"giriniz."
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@ -502,16 +491,16 @@ msgstr ""
"Lütfen bu işlemi tamamlamak için gereken\n"
"PIN'i veya anahtar parolasını giriniz."
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
msgid "Passphrase:"
msgstr "Anahtar Parolası:"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "anahtar parolası sorulurken hata: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
msgid "cancelled\n"
msgstr "iptal edildi\n"
@@ -550,7 +539,7 @@ msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
msgid "error reading `%s', line %d: %s\n"
msgstr "`%s' okunurken %d. satırda hata: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
@@ -563,7 +552,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -575,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr "DoÄŸru"
@@ -587,7 +576,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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -596,11 +585,11 @@ msgstr ""
"Kullanıcı sertifikalarının%%0A \"%s\"%%0Aile doğru olarak onaylanacağından "
"son derece emin misiniz?"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "Yes"
msgstr "Evet"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr "Hayır"
@@ -644,12 +633,12 @@ msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
msgid "error running `%s': terminated\n"
msgstr "`%s' çalışırken hata: sonlandırıldı\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, c-format
msgid "error creating socket: %s\n"
msgstr "soket oluÅŸturulurken hata: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
msgid "host not found"
msgstr "konak yok"
@@ -738,6 +727,16 @@ msgstr "tT"
msgid "cC"
msgstr "iÄ°"
+#: common/miscellaneous.c:73
+#, 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
+#, 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
#, c-format
msgid "armor: %s\n"
@@ -1142,13 +1141,13 @@ msgstr "--output seçeneği bu komutla çalışmaz\n"
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:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1420,23 +1419,23 @@ 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:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, 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:2621
+#: g10/getkey.c:2624
#, 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:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1452,27 +1451,27 @@ msgstr "|[dosya]|bir imza yapar"
msgid "|[file]|make a clear text signature"
msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "veriyi ÅŸifreler"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik ÅŸifre ile ÅŸifreler"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "bir imzayı doğrular"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "anahtarları listeler"
@@ -1484,11 +1483,11 @@ msgstr "anahtarları ve imzaları listeler"
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
@@ -1524,11 +1523,11 @@ msgstr "bir yürürlükten kaldırma sertifikası üretir"
msgid "export keys"
msgstr "anahtarları gönderir"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "anahtarları bir anahtar sunucusundan indirir"
@@ -1564,12 +1563,12 @@ msgstr "güvence veritabanını günceller"
msgid "|algo [files]|print message digests"
msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
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:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1579,31 +1578,31 @@ msgstr ""
"Seçenekler:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|İSİM|İSİM için şifreleme yapar"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
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:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
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:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "çıktı dosyası olarak kullanılır"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
@@ -1619,7 +1618,7 @@ msgstr "kesin OpenPGP davranışı etkin olur"
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x uyumlu iletiler üretilir"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1627,7 +1626,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:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1667,7 +1666,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:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1695,7 +1694,7 @@ msgstr "Sıkıştırma: "
msgid "usage: gpg [options] "
msgstr "kullanımı: gpg [seçenekler] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
@@ -1820,6 +1819,11 @@ msgstr "anahtar listelerinde anahtarlık ismini gösterir"
msgid "show expiration dates during signature listings"
msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
+#: g10/gpg.c:1835
+#, 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:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1959,7 +1963,7 @@ msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
@@ -1999,11 +2003,11 @@ msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özümleme algoritması geçersiz\n"
@@ -2232,7 +2236,7 @@ msgstr "anahtarlar bu anahtarlıktan alınır"
msgid "make timestamp conflicts only a warning"
msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
@@ -3768,7 +3772,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "oluÅŸturuldu: %s"
@@ -3785,7 +3789,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "son kullanma tarihi: %s"
@@ -3821,12 +3825,12 @@ 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:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "zamanaşımına uğradı"
@@ -4702,178 +4706,178 @@ msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
msgid "%s: keyring created\n"
msgstr "%s: anahtarlık oluşturuldu\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
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:67
+#: g10/keyserver.c:74
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:69
+#: g10/keyserver.c:76
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:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr "geçici dosyaları kullandıktan sonra silmez"
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
msgid "honor the preferred keyserver URL set on the key"
msgstr "tercihli anahtar sunucusunun adresini adrese atar"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
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:145
+#: g10/keyserver.c:152
#, 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:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "iptal edildi"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, 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:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "anahtar, anahtar sunucusunda yok\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, 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:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, 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:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr "%s içindeki isimler aranıyor\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, 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:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, 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:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "bir anahtar sunucusu eylemi yok!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, 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:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "anahtar sunucusu VERSION göndermiyor\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
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:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, 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:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s %d sürümü eylemciyi desteklemiyor\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "anahtar sunucusu zamanaşımına uğradı\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "anahtar sunucusu iç hatası\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, 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:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 anahtar %s adresinden tazeleniyor\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d anahtar %s adresinden tazeleniyor\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
@@ -5219,16 +5223,16 @@ 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:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "%d genel anahtar algoritması kullanılamadı\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -5838,7 +5842,7 @@ msgstr ""
"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
"denendi!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
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"
@@ -6404,7 +6408,7 @@ msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
msgid "iconv_open failed: %s\n"
msgstr "iconv_open başarısız: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
@@ -6626,7 +6630,7 @@ msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
msgid "run in multi server mode (foreground)"
msgstr "çoklu sunucu kipinde çalışır (önalanda)"
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
msgid "read options from file"
msgstr "seçenekler dosyadan okunur"
@@ -6666,23 +6670,23 @@ msgstr ""
"Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
"GnuPG için akıllı kart artalan süreci\n"
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
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:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %d için eylemci başlatıldı\n"
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %d için eylemci sonlandı\n"
-#: sm/base64.c:323
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "geçersiz radix64 karakteri %02x atlandı\n"
@@ -6705,168 +6709,174 @@ msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
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:165
+#: sm/certchain.c:176
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr "kritik sertifika eklentisi %s desteklenmiyor"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr "sertifikacı onu bir CA gibi imlememiş"
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, c-format
msgid "failed to open `%s': %s\n"
msgstr "`%s' açılamadı: %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
msgid "certificate policy not allowed"
msgstr "sertifika poliçesine izin verilmiyor"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr "harici bir sertifikacı arar\n"
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr "eşleşen sertifikacı sayısı: %d\n"
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
msgid "failed to allocated keyDB handle\n"
msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
msgid "certificate has been revoked"
msgstr "sertifika yürürlükten kaldırılmıştı"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
msgid "no CRL found for certificate"
msgstr "sertifika için bir CRL yok"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
msgid "the available CRL is too old"
msgstr "mevcut CRL çok eski"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
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:687
+#: sm/certchain.c:698
#, c-format
msgid "checking the CRL failed: %s"
msgstr "CRL sınaması başarısız: %s"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
msgid "no issuer found in certificate"
msgstr "sertifikacı kim belli değil"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr "geçersiz doğrulukla sertifika: %s"
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr "sertifika henüz geçersiz"
-#: sm/certchain.c:821
+#: sm/certchain.c:852
msgid "certificate has expired"
msgstr "sertifika kullanım süresi dolmuş"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr "kök sertifika güvenilir olarak imli değil"
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, c-format
msgid "fingerprint=%s\n"
msgstr "parmakizi=%s\n"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
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:970
+#: sm/certchain.c:1001
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:976
+#: sm/certchain.c:1007
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:986
+#: sm/certchain.c:1017
#, 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:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr "sertifika zinciri çok uzun\n"
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr "sertifikacı belli değil"
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
msgid "certificate has a BAD signature"
msgstr "sertifika KÖTÜ bir imzaya sahip"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
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:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA, 160 bitlik bir çittirim algoritması kullanılmasını gerektiriyor\n"
+#: sm/certcheck.c:103
+#, 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:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:113
+#, 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
msgid "(this is the MD2 algorithm)\n"
msgstr "(bu, MD2 algoritmasıdır)\n"
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
msgid "none"
msgstr "yok"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
msgid "[none]"
msgstr "[yok]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
msgid "[Error - invalid encoding]"
msgstr "[Hata - kodlama geçersiz]"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr "[Hata - nüve dışında]"
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr "[Hata - Adsız]"
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
msgid "[Error - invalid DN]"
msgstr "[Hata - DN geçersiz]"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6881,7 +6891,7 @@ msgstr ""
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:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
@@ -6968,7 +6978,7 @@ msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
msgid "certificate `%s' not found: %s\n"
msgstr "sertifika \"%s\" yok: %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, c-format
msgid "error locking keybox: %s\n"
msgstr "anahtar bloÄŸu kilitlenirken hata: %s\n"
@@ -6992,181 +7002,181 @@ msgstr "\"%s\" sertifikası silinemedi: %s\n"
msgid "no valid recipients given\n"
msgstr "geçerli alıcılar verilmedi\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "geçici dosya oluşturulurken hata: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "geçeci dosyaya yazma hatası: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
msgid "|[FILE]|make a signature"
msgstr "|[DOSYA]|bir imza yapar"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
msgid "|[FILE]|make a clear text signature"
msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
msgid "list external keys"
msgstr "harici anahtarları listeler"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
msgid "list certificate chain"
msgstr "sertifika zincirini listeler"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
msgid "remove key from the public keyring"
msgstr "anahtarları genel anahtarlıktan kaldırır"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
msgid "import certificates"
msgstr "sertifikaları ithal eder"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
msgid "export certificates"
msgstr "sertifikaları ihraç eder"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
msgid "register a smartcard"
msgstr "bir akıllı kartı kayda alır"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr "gpg-protect-tool'u çalıştırır"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
msgid "create base-64 encoded output"
msgstr "base-64 kodlu çıktı oluşturur"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr "girdinin PEM biçiminde olduğu kabul edilir"
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr "girdinin ikilik biçimde olduğu kabul edilir"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr "asla bir CRL sormaz"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr "doğruluğu OCSP kullarak sınar"
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr "|N|içerilecek sertifika sayısı"
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr "sertifika poliçeleri sınanmaz"
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr "kayıp sertifikacı sertifikalarını alır"
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
msgid "use the default key as default recipient"
msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr "terminali hiç kullanma"
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
msgid "force v3 signatures"
msgstr "v3 imzalarına zorlar"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr "şifreleme için daima bir MDC kullanılır"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr "soruların çoğunda cevap evet farzedilir"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr "soruların çoğunda cevap hayır farzedilir"
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
msgid "add this keyring to the list of keyrings"
msgstr "bu anahtarlığı anahtarlık listesine ekler"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
msgid "add this secret keyring to the list"
msgstr "bu gizli anahtarlığı listeye ekler"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
msgid "|NAME|set terminal charset to NAME"
msgstr "|Ä°SÄ°M|terminal karakter setini Ä°SÄ°M olarak ayarlar"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
msgid "|NAME|use cipher algorithm NAME"
msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
msgid "|NAME|use message digest algorithm NAME"
msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
msgid "|N|use compress algorithm N"
msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7176,44 +7186,39 @@ 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:617
+#: sm/gpgsm.c:621
msgid "usage: gpgsm [options] "
msgstr "kullanımı: gpgsm [seçenekler] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "`%s'e ÅŸifrelenemez: %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "`%s' kullanarak imzalanamıyor: %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr "bu komut henüz gerçeklenmedi\n"
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent bu oturumda kullanılamaz\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, 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"
@@ -7223,20 +7228,20 @@ msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
msgid "total number processed: %lu\n"
msgstr "iÅŸlenmiÅŸ toplam miktar: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
msgid "error storing certificate\n"
msgstr "sertifika saklanırken hata\n"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, c-format
msgid "error importing certificate: %s\n"
msgstr "sertifika ithal edilirken hata: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, c-format
msgid "error reading input: %s\n"
msgstr "girdi okunurken hata: %s\n"
@@ -7255,11 +7260,11 @@ msgstr "gpg-agent'ı önce başlatmak isteyebilirsiniz\n"
msgid "keybox `%s' created\n"
msgstr "`%s' anahtar bloÄŸu oluÅŸturuldu\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
msgid "failed to get the fingerprint\n"
msgstr "parmakizinin alınması başarısız oldu\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
msgid "failed to allocate keyDB handle\n"
msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
@@ -7278,17 +7283,17 @@ msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
msgid "error storing certificate: %s\n"
msgstr "serifika saklanırken hata: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, c-format
msgid "error storing flags: %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
@@ -7368,31 +7373,35 @@ msgstr "Buradaki imzeler iyi:"
msgid " aka"
msgstr " nam-ı diğer"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
msgid "quiet"
msgstr "sessiz"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr "veri çıktısını onaltılık kodlamayla basar"
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
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:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr "ek bağlantı kipi kullanılmaz"
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
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:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
@@ -7400,70 +7409,70 @@ 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:324
+#: tools/gpg-connect-agent.c:328
#, 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:333
+#: tools/gpg-connect-agent.c:337
#, 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:391
+#: tools/gpg-connect-agent.c:395
msgid "line too long - skipped\n"
msgstr "satır çok uzun - atlandı\n"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
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:457
+#: tools/gpg-connect-agent.c:471
#, c-format
msgid "unknown command `%s'\n"
msgstr "komut `%s' bilinmiyor\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, c-format
msgid "sending line failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, c-format
msgid "receiving line failed: %s\n"
msgstr "satır alımı başarısız: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, c-format
msgid "error sending %s command: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, c-format
msgid "error sending standard options: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr "Tanı çıktısını denetleyen seçenekler"
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr "Yapılandırmayı denetleyen seçenekler"
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr "Hata ayıklamaya elverişli seçenekler"
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr "Güvenliği denetleyen seçenekler"
@@ -7493,31 +7502,35 @@ msgstr "Anahtar sunucular için yapılandırma"
msgid "allow PKA lookups (DNS requests)"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr "kök sertifikalar için CRLler sınanmaz"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr "Çıktı biçimini denetleyen seçenekler"
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr "HTTP sunucuları için yapılandırma"
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr "sistemin HTTP vekil ayarları kullanılır"
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr "Kullanılacak LDAP sunucularının yapılandırması"
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr "OCSP için yapılandırma"
@@ -7580,7 +7593,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:173
+#: tools/symcryptrun.c:154
msgid ""
"@\n"
"Commands:\n"
@@ -7590,35 +7603,35 @@ msgstr ""
"Komutlar:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
msgid "decryption modus"
msgstr "şifre çözme kipi"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
msgid "encryption modus"
msgstr "ÅŸifreleme kipi"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr "araç sınıfı (Konfüçyüs)"
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
msgid "program filename"
msgstr "program dosyaismi"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr "gizli anahtar dosyası (gerekli)"
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr "girdi dosyası ismi (std girdi öntanımlı)"
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
@@ -7628,126 +7641,130 @@ msgstr ""
"[seçenekler...] KOMUT [girdi-dosyası]\n"
"Basit bir simetrik şifreleme aracı çalıştırır\n"
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, 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:320
+#: tools/symcryptrun.c:301
#, 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:346
+#: tools/symcryptrun.c:327
#, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr "%s yazmak için açılamadı: %s\n"
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, c-format
msgid "error writing to %s: %s\n"
msgstr "%s yazılırken hata: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, c-format
msgid "error reading from %s: %s\n"
msgstr "%s okunurken hata: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, c-format
msgid "error closing %s: %s\n"
msgstr "%s kapanırken hata: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
msgid "no --program option provided\n"
msgstr "--program diye bir seçenek yok\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr "--keyfile diye bir seçenek yok\n"
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, c-format
msgid "could not create pipe: %s\n"
msgstr "boru oluşturulamadı: %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, c-format
msgid "could not create pty: %s\n"
msgstr "pty oluşturulamadı: %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr "çatallanamadı: %s\n"
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, c-format
msgid "execv failed: %s\n"
msgstr "execv başarısız: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, c-format
msgid "select failed: %s\n"
msgstr "select başarısız: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, c-format
msgid "read failed: %s\n"
msgstr "read başarısız: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, c-format
msgid "pty read failed: %s\n"
msgstr "pty okuması başarısız: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, c-format
msgid "waitpid failed: %s\n"
msgstr "waitpid başarısız: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr "alt süreç %i durumu ile çıktı\n"
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "dosya içi dizge ayrılamıyor: %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "dosya dışı dizge ayrılamıyor: %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr "ya %s verilmeli ya da %s\n"
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr "hiç sınıf sağlanmamış\n"
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, c-format
msgid "class %s is not supported\n"
msgstr "%s sınıfı desteklenmiyor\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr ""
+#~ "DSA, 160 bitlik bir çittirim algoritması kullanılmasını gerektiriyor\n"
+
#~ msgid ">.\n"
#~ msgstr ""
#~ "> adresine,\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3b9c78996..b69077193 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -94,8 +94,8 @@ msgstr "无法建立‘%s’:%s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -194,13 +194,13 @@ msgstr ""
"您需è¦ä¸€ä¸ªå¯†ç æ¥ä¿æŠ¤æ‚¨çš„ç§é’¥ã€‚\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密ç "
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "更改密ç "
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -229,13 +229,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "详细模å¼"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "å°½é‡å‡å°‘æ示信æ¯"
@@ -247,7 +247,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读å–选项\n"
@@ -260,8 +260,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥æœåŠ¡å™¨ä¸Šæœå¯»å¯†é’¥"
@@ -317,9 +317,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
@@ -337,138 +337,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注æ„:没有默认é…置文件‘%s’\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "é…置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读å–选项\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时å‘生错误:%s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败:%s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在将ç§é’¥å†™è‡³`%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "已创建目录‘%s’\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错:%s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "æ›´æ–°ç§é’¥å¤±è´¥ï¼š%s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次èˆè¯ä¸­æ— æ³•ä½¿ç”¨\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境å˜é‡æ ¼å¼é”™è¯¯\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "ä¸æ”¯æŒ gpg-agent å议版本 %d\n"
@@ -484,51 +473,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密ç ï¼šè¿™æ˜¯ä¸€ä¸ªç§˜å¯†çš„å¥å­ \n"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密ç ï¼šè¿™æ˜¯ä¸€ä¸ªç§˜å¯†çš„å¥å­ \n"
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密ç ï¼šè¿™æ˜¯ä¸€ä¸ªç§˜å¯†çš„å¥å­ \n"
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密ç "
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生æˆå¯†ç çš„时候å‘生错误:%s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "å·²å–消"
@@ -568,7 +557,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "读å–‘%s’时出错:%s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -581,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -591,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -603,19 +592,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -659,12 +648,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "读å–‘%s’时出错:%s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "建立‘%s’时å‘生错误:%s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[找ä¸åˆ°ç”¨æˆ·æ ‡è¯†]"
@@ -756,6 +745,16 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1157,13 +1156,13 @@ msgstr "--output 在这个命令中ä¸èµ·ä½œç”¨\n"
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1424,22 +1423,22 @@ msgstr "自动获å–‘%s’,通过 %s\n"
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的ç§é’¥â€•â€•å¿½ç•¥\n"
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用å­é’¥ %s 而éžä¸»é’¥ %s\n"
-#: g10/getkey.c:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1455,27 +1454,27 @@ msgstr "|[文件å]|生æˆä¸€ä»½ç­¾å"
msgid "|[file]|make a clear text signature"
msgstr "|[文件å]|生æˆä¸€ä»½æ˜Žæ–‡ç­¾å"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "生æˆä¸€ä»½åˆ†ç¦»çš„ç­¾å"
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "加密数æ®"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "解密数æ®(默认)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "验è¯ç­¾å"
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "列出密钥"
@@ -1487,11 +1486,11 @@ msgstr "列出密钥和签å"
msgid "list and check key signatures"
msgstr "列出并检查密钥签å"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "列出ç§é’¥"
@@ -1527,11 +1526,11 @@ msgstr "生æˆä¸€ä»½åŠé”€è¯ä¹¦"
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "把密钥导出到æŸä¸ªå…¬é’¥æœåŠ¡å™¨ä¸Š"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "从公钥æœåŠ¡å™¨ä¸Šå¯¼å…¥å¯†é’¥"
@@ -1567,12 +1566,12 @@ msgstr "更新信任度数æ®åº“"
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打å°æŠ¥æ–‡æ•£åˆ—值"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1582,31 +1581,31 @@ msgstr ""
"选项:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "è¾“å‡ºç» ASCII å°è£…"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|æŸç”²|为收件者“æŸç”²â€åŠ å¯†"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识æ¥ç­¾å或解密"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示ä¸åŽ‹ç¼©)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "使用标准的文本模å¼"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "ä¸åšä»»ä½•æ”¹å˜"
@@ -1622,7 +1621,7 @@ msgstr "行为严格éµå¾ª OpenPGP 定义"
msgid "generate PGP 2.x compatible messages"
msgstr "生æˆä¸Ž PGP 2.x 兼容的报文"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1630,7 +1629,7 @@ msgstr ""
"@\n"
"(请å‚考在线说明以获得所有命令和选项的完整清å•)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1670,7 +1669,7 @@ msgstr ""
"ç­¾åã€æ£€æŸ¥ã€åŠ å¯†æˆ–解密\n"
"默认的æ“作ä¾è¾“入数æ®è€Œå®š\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1698,7 +1697,7 @@ msgstr "压缩:"
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "冲çªçš„指令\n"
@@ -1818,6 +1817,11 @@ msgstr "列出密钥时显示钥匙环的å称"
msgid "show expiration dates during signature listings"
msgstr "列出签å时显示过期日期"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1951,7 +1955,7 @@ msgstr "%s:%d:无效的 auto-key-locate 清å•\n"
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清å•\n"
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程åºå¯èƒ½ä¼šåˆ›å»ºæ ¸å¿ƒå†…存转储ï¼\n"
@@ -1991,11 +1995,11 @@ msgstr "å¯ç”¨ --pgp2 时您应该åªä½¿ç”¨æ–‡ä»¶ï¼Œè€Œéžç®¡é“\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†æŠ¥æ–‡éœ€è¦ IDEA 算法\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
@@ -2223,7 +2227,7 @@ msgstr "从这个钥匙环里å–用密钥"
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|FD|把状æ€ä¿¡æ¯å†™å…¥æ–‡ä»¶æ述符 FD"
@@ -3685,7 +3689,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
@@ -3702,7 +3706,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
@@ -3736,12 +3740,12 @@ msgid ""
"unless you restart the program.\n"
msgstr "请注æ„,在您é‡å¯ç¨‹åºä¹‹å‰ï¼Œæ˜¾ç¤ºçš„密钥有效性未必正确,\n"
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "å·²åŠé”€"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "已过期"
@@ -4591,176 +4595,176 @@ msgstr "缓存了 %lu 把密钥(%lu 份签å)\n"
msgid "%s: keyring created\n"
msgstr "%s:钥匙环已建立\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr "在æœç´¢ç»“果中包å«å·²åŠé”€çš„密钥"
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr "按钥匙å·æœç´¢æ—¶åŒ…å«å­é’¥"
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr "å‘公钥æœåŠ¡å™¨è¾…助程åºä¼ é€’æ•°æ®æ—¶ä½¿ç”¨ä¸´æ—¶æ–‡ä»¶"
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr "ä¸åˆ é™¤ä½¿ç”¨è¿‡çš„临时文件"
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr "验è¯ç­¾å时自动下载密钥"
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
msgid "honor the preferred keyserver URL set on the key"
msgstr "使用密钥中指定的首选公钥æœåŠ¡å™¨ URL"
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "获å–密钥时使用密钥上的 PKA 记录"
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告:公钥æœåŠ¡å™¨é€‰é¡¹â€˜%s’在此平å°ä¸Šæ²¡æœ‰è¢«ä½¿ç”¨\n"
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "å·²ç¦ç”¨"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥æœåŠ¡å™¨åè®®(us %d!=handler %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥â€œ%sâ€\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s æœåŠ¡å™¨ %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "在 %s æœåŠ¡å™¨ %s 上æœç´¢åå­—\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, c-format
msgid "searching for names from %s\n"
msgstr "在 %s 上æœç´¢åå­—\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s æœåŠ¡å™¨ %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s æœåŠ¡å™¨ %s 上\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s 上\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "公钥æœåŠ¡å™¨æ— åŠ¨ä½œï¼\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处ç†å…¬é’¥æœåŠ¡å™¨çš„程åºæ¥è‡ªä¸åŒç‰ˆæœ¬çš„ GnuPG (%s)\n"
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "公钥æœåŠ¡å™¨æœªå‘é€ VERSION\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥æœåŠ¡å™¨(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本ä¸æ”¯æŒå¤–部调用公钥æœåŠ¡å™¨\n"
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处ç†â€˜%s’公钥æœåŠ¡å™¨çš„程åº\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’æ“作ä¸ä¸ºâ€˜%s’公钥æœåŠ¡å™¨æ‰€æ”¯æŒ\n"
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s ä¸æ”¯æŒå¯¹ç‰ˆæœ¬ %d 的处ç†\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "公钥æœåŠ¡å™¨è¶…æ—¶\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "公钥æœåŠ¡å™¨å†…部错误\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥æœåŠ¡å™¨é€šè®¯é”™è¯¯ï¼š%s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼šè·³è¿‡\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "è­¦å‘Šï¼šæ— æ³•èŽ·å– URI %s:%s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ä¸èƒ½è§£æž URI %s\n"
@@ -5101,16 +5105,16 @@ msgstr "æ–°çš„é…置文件‘%s’已建立\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr "警告:在‘%s’里的选项于此次è¿è¡ŒæœŸé—´æœªè¢«ä½¿ç”¨\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "无法æ“作公钥算法 %d\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告:潜在ä¸å®‰å…¨çš„对称加密会è¯å¯†é’¥\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的å­åŒ…设定了关键ä½\n"
@@ -5694,7 +5698,7 @@ msgstr "建立了弱密钥――正在é‡è¯•\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "对称加密无法é¿å…生æˆå¼±å¯†é’¥ï¼›å·²ç»å°è¯• %d 次ï¼\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA 需è¦æ•£åˆ—值长度为 8 ä½çš„å€æ•°\n"
@@ -6236,7 +6240,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "ç­¾å时失败: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "将‘%s’é‡å‘½å为‘%s’时失败:%s\n"
@@ -6458,7 +6462,7 @@ msgstr "ä¸èƒ½å­˜å– %s――无效的 OpenPGP å¡ï¼Ÿ\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "从‘%s’读å–选项\n"
@@ -6499,21 +6503,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
@@ -6537,180 +6541,186 @@ msgstr "ä¸æ”¯æŒ gpg-agent å议版本 %d\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "ä¸æ”¯æŒ gpg-agent å议版本 %d\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "ä¸å…许导出ç§é’¥\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥:%s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "注æ„:密钥已被åŠé”€"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "è¯ä¹¦å·²æŸå"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "å¯ç”¨çš„密钥在:"
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签åæ—¶å‘生错误: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生æˆä¸€ä»½åŠé”€è¯ä¹¦"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已ç»è¿‡æœŸï¼"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹:"
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签åæ—¶å‘生错误: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验è¯ç­¾å"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA è¦æ±‚使用 160 ä½çš„散列算法\n"
+#: sm/certcheck.c:103
+#, fuzzy, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr "DSA 密钥 %s 使用ä¸å®‰å…¨çš„(%u ä½)的散列\n"
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[未设定]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "错误:无效的å“应。\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "错误:无效的å“应。\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6725,7 +6735,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "å–得当å‰å¯†é’¥ä¿¡æ¯æ—¶å‡ºé”™ï¼š%s\n"
@@ -6812,7 +6822,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "找ä¸åˆ°ç§é’¥â€œ%sâ€ï¼š%s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "读å–密钥区å—æ—¶å‘生错误:%s\n"
@@ -6837,200 +6847,200 @@ msgstr "删除密钥区å—时失败:%s\n"
msgid "no valid recipients given\n"
msgstr "(ä¸ç»™å®šæè¿°)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "生æˆå¯†ç çš„时候å‘生错误:%s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s:写入目录记录时出错:%s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[文件å]|生æˆä¸€ä»½ç­¾å"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[文件å]|生æˆä¸€ä»½æ˜Žæ–‡ç­¾å"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "列出ç§é’¥"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "è¯ä¹¦å·²æŸå"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "è¯ä¹¦å·²æŸå"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "è¯ä¹¦å·²æŸå"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "在智能å¡ä¸Šæ·»åŠ ä¸€æŠŠå¯†é’¥"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "更改密ç "
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "è¾“å‡ºç» ASCII å°è£…"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
#, fuzzy
msgid "use the default key as default recipient"
msgstr "已跳过:公钥已被设为默认收件者\n"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "检查签å"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "从这个钥匙环里å–用密钥"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "è¦æœ‰ç§é’¥æ‰èƒ½è¿™ä¹ˆåšã€‚\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|æŸç”²|为收件者“æŸç”²â€åŠ å¯†"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的对称加密算法"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s ç­¾å,散列算法 %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "未知的压缩算法"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7041,45 +7051,40 @@ msgstr ""
"ç­¾åã€æ£€æŸ¥ã€åŠ å¯†æˆ–解密\n"
"默认的æ“作ä¾è¾“入数æ®è€Œå®š\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "用法:gpg [选项] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存å–‘%s’:%s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent 在此次èˆè¯ä¸­æ— æ³•ä½¿ç”¨\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "请选择您è¦ä½¿ç”¨çš„密钥ç§ç±»ï¼š\n"
@@ -7089,21 +7094,21 @@ msgstr "请选择您è¦ä½¿ç”¨çš„密钥ç§ç±»ï¼š\n"
msgid "total number processed: %lu\n"
msgstr "åˆè®¡è¢«å¤„ç†çš„æ•°é‡ï¼š%lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "生æˆä¸€ä»½åŠé”€è¯ä¹¦"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "生æˆå¯†ç çš„时候å‘生错误:%s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "读å–‘%s’时出错:%s\n"
@@ -7122,12 +7127,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "钥匙环‘%s’已建立\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "无法存储指纹:%s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "无法存储密钥:%s\n"
@@ -7147,17 +7152,17 @@ msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
msgid "error storing certificate: %s\n"
msgstr "å–得当å‰å¯†é’¥ä¿¡æ¯æ—¶å‡ºé”™ï¼š%s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "获å–æ–° PIN 时出错:%s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "读å–‘%s’时出错:%s\n"
@@ -7230,103 +7235,107 @@ msgstr "完好的签å,æ¥è‡ªäºŽâ€œ%sâ€"
msgid " aka"
msgstr " 亦å³â€œ%sâ€"
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "列太长"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "ç­¾å时失败: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "读å–‘%s’时出错:%s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7354,31 +7363,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7442,7 +7455,7 @@ msgstr "ä¸å…许使用管ç†å‘˜å‘½ä»¤\n"
msgid "error allocating enough memory: %s\n"
msgstr "建立钥匙环‘%s’时å‘生错误:%s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7452,166 +7465,169 @@ msgstr ""
"@指令:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "解密æˆåŠŸ\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "解密æˆåŠŸ\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [文件å]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ä¸å¯ä¸Ž %s 并用\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "‘%s’的 fstat 在 %s 中出错:%s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "读å–‘%s’时出错:%s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "‘%s’中出错:%s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "ä¸æ”¯æŒè¿œç¨‹è°ƒç”¨\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "更新失败:%s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "删除密钥区å—时失败:%s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "更新失败:%s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "更新失败:%s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "更新失败:%s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "ä¸èƒ½åˆ›å»ºå¤‡ä»½æ–‡ä»¶â€˜%s’:%s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "ä¸èƒ½åˆ›å»ºå¤‡ä»½æ–‡ä»¶â€˜%s’:%s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ä¸æ”¯æŒä¿æŠ¤æ•£åˆ— %d\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA è¦æ±‚使用 160 ä½çš„散列算法\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4abbf104c..3e5e84c34 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-03-08 14:20+0100\n"
+"POT-Creation-Date: 2007-05-07 20:39+0200\n"
"PO-Revision-Date: 2005-07-29 09:49+0800\n"
"Last-Translator: Jedi <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -92,8 +92,8 @@ msgstr "無法建立 `%s': %s\n"
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
#: g10/plaintext.c:504 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:100 g10/verify.c:163 sm/gpgsm.c:1775
-#: sm/gpgsm.c:1812 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "無法開啟 `%s': %s\n"
@@ -192,13 +192,13 @@ msgstr ""
"妳需è¦ä¸€å€‹å¯†èªžä¾†ä¿è­·å¦³çš„ç§é‘°.\n"
"\n"
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密語"
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
-#: tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
+#: tools/symcryptrun.c:468
msgid "does not match - try again"
msgstr ""
@@ -207,7 +207,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "更改密語"
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -227,13 +227,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
-#: tools/gpgconf.c:69 tools/symcryptrun.c:185
+#: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
+#: tools/gpgconf.c:69 tools/symcryptrun.c:166
msgid "verbose"
msgstr "囉唆模å¼"
#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:339
msgid "be somewhat more quiet"
msgstr "盡é‡å®‰éœäº›"
@@ -245,7 +245,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "從 `%s' 讀å–é¸é …\n"
@@ -258,8 +258,8 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:338
-#: tools/symcryptrun.c:187
+#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "在æŸå€‹é‡‘鑰伺æœå™¨ä¸Šæœå°‹é‡‘é‘°"
@@ -315,9 +315,9 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:192 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
-#: tools/gpgconf.c:91 tools/symcryptrun.c:225
+#: agent/gpg-agent.c:247 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
#, fuzzy
msgid "Please report bugs to <"
msgstr "è«‹å‘ <gnupg-bugs@gnu.org> 回報程å¼ç‘•ç–µ.\n"
@@ -333,138 +333,127 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:311
-#, c-format
-msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:314
-#, c-format
-msgid "out of core while allocating %lu bytes"
-msgstr ""
-
-#: agent/gpg-agent.c:345 g10/gpg.c:931 scd/scdaemon.c:266 sm/gpgsm.c:646
+#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:521 agent/protect-tool.c:1073 g10/gpg.c:1835
-#: kbx/kbxutil.c:432 scd/scdaemon.c:358 sm/gpgsm.c:768
-#: tools/symcryptrun.c:1056
+#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
+#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
#, c-format
-msgid "libgcrypt is too old (need %s, have %s)\n"
+msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:615 g10/gpg.c:2035 scd/scdaemon.c:435 sm/gpgsm.c:865
+#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注æ„: 沒有é è¨­é¸é …檔 `%s'\n"
-#: agent/gpg-agent.c:620 agent/gpg-agent.c:1179 g10/gpg.c:2039
-#: scd/scdaemon.c:440 sm/gpgsm.c:869 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
+#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
#, c-format
msgid "option file `%s': %s\n"
msgstr "é¸é …檔 `%s': %s\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2046 scd/scdaemon.c:448 sm/gpgsm.c:876
+#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀å–é¸é …\n"
-#: agent/gpg-agent.c:949 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
#: g10/plaintext.c:164
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立 `%s' 時發生錯誤: %s\n"
-#: agent/gpg-agent.c:1239 agent/gpg-agent.c:1342 agent/gpg-agent.c:1346
-#: agent/gpg-agent.c:1382 agent/gpg-agent.c:1386 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:934
+#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
+#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:914
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "無法建立目錄 `%s': %s\n"
-#: agent/gpg-agent.c:1253 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 `%s': %s\n"
-#: agent/gpg-agent.c:1308 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
-#: agent/gpg-agent.c:1316 scd/scdaemon.c:1011
+#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失敗: %s\n"
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:1017
+#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在將ç§é‘°å¯«è‡³ `%s'\n"
-#: agent/gpg-agent.c:1350 agent/gpg-agent.c:1392 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "目錄 `%s' 已建立\n"
-#: agent/gpg-agent.c:1398
+#: agent/gpg-agent.c:1355
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 失敗於 %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1359
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "無法建立目錄 `%s': %s\n"
-#: agent/gpg-agent.c:1504
+#: agent/gpg-agent.c:1461
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1466
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1526
+#: agent/gpg-agent.c:1483
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1488
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1627 scd/scdaemon.c:1136
+#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "æ›´æ–°ç§é‘°å¤±æ•—: %s\n"
-#: agent/gpg-agent.c:1733 scd/scdaemon.c:1203
+#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: 已跳éŽ: %s\n"
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1711
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此階段無法使用\n"
-#: agent/gpg-agent.c:1764 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent å”定版本 %d 未被支æ´\n"
@@ -480,51 +469,51 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:146
+#: agent/protect-tool.c:151
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "用法: gpg [é¸é …] [檔案] (或用 -h 求助)"
-#: agent/protect-tool.c:148
+#: agent/protect-tool.c:153
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1193
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "請輸入密語; 這是一個秘密的å¥å­ \n"
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1196
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "請輸入密語; 這是一個秘密的å¥å­ \n"
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1199
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1218
+#: agent/protect-tool.c:1204
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "請輸入密語; 這是一個秘密的å¥å­ \n"
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
#, fuzzy
msgid "Passphrase:"
msgstr "錯誤的密語"
-#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "建立密語的時候發生錯誤: %s\n"
-#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
#, fuzzy
msgid "cancelled\n"
msgstr "å·²å–消"
@@ -564,7 +553,7 @@ msgstr ""
msgid "error reading `%s', line %d: %s\n"
msgstr "è®€å– `%s' 時發生錯誤: %s\n"
-#: agent/trustlist.c:355 agent/trustlist.c:394
+#: agent/trustlist.c:365 agent/trustlist.c:404
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -577,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:470
+#: agent/trustlist.c:480
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -587,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:479
+#: agent/trustlist.c:489
msgid "Correct"
msgstr ""
@@ -599,19 +588,19 @@ 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:499
+#: agent/trustlist.c:509
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:505
+#: agent/trustlist.c:515
msgid "No"
msgstr ""
@@ -655,12 +644,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "è®€å– `%s' 時發生錯誤: %s\n"
-#: common/http.c:1623
+#: common/http.c:1621
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "建立 `%s' 時發生錯誤: %s\n"
-#: common/http.c:1667
+#: common/http.c:1665
#, fuzzy
msgid "host not found"
msgstr "[找ä¸åˆ°ä½¿ç”¨è€… ID]"
@@ -752,6 +741,16 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:73
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
+
+#: common/miscellaneous.c:76
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
@@ -1152,13 +1151,13 @@ msgstr "--output 在這個命令中沒有作用\n"
msgid "can't open `%s'\n"
msgstr "無法開啟 `%s'\n"
-#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1714
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3403 g10/keyserver.c:1721
#: g10/revoke.c:228
#, 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:1728
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2357 g10/keyserver.c:1735
#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1423,22 +1422,22 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s å¯ä»¥è—‰ç”± --allow-non-selfsigned-uid 而生效\n"
-#: g10/getkey.c:2390 g10/keyedit.c:3723
+#: g10/getkey.c:2393 g10/keyedit.c:3723
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公鑰 %s 沒有相å°æ‡‰çš„ç§é‘° - 正在忽略\n"
-#: g10/getkey.c:2621
+#: g10/getkey.c:2624
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "正在使用次鑰 %s 來替æ›ä¸»é‘° %s\n"
-#: g10/getkey.c:2668
+#: g10/getkey.c:2671
#, 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:241 tools/gpgconf.c:56
+#: g10/gpg.c:369 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:56
msgid ""
"@Commands:\n"
" "
@@ -1454,27 +1453,27 @@ msgstr "|[檔案]|建立一份簽章"
msgid "|[file]|make a clear text signature"
msgstr "|[檔案]|建立一份明文簽章"
-#: g10/gpg.c:373 sm/gpgsm.c:245
+#: g10/gpg.c:373 sm/gpgsm.c:246
msgid "make a detached signature"
msgstr "建立一份分離å¼ç°½ç« "
-#: g10/gpg.c:374 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encrypt data"
msgstr "加密資料"
-#: g10/gpg.c:376 sm/gpgsm.c:247
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "encryption only with symmetric cipher"
msgstr "僅使用å°ç¨±å¼ç·¨å¯†æ³•ä¾†åŠ å¯†"
-#: g10/gpg.c:378 sm/gpgsm.c:248
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "decrypt data (default)"
msgstr "資料解密 (é è¨­)"
-#: g10/gpg.c:380 sm/gpgsm.c:249
+#: g10/gpg.c:380 sm/gpgsm.c:250
msgid "verify a signature"
msgstr "é©—è­‰æŸä»½ç°½ç« "
-#: g10/gpg.c:382 sm/gpgsm.c:251
+#: g10/gpg.c:382 sm/gpgsm.c:252
msgid "list keys"
msgstr "列出金鑰"
@@ -1486,11 +1485,11 @@ msgstr "列出金鑰和簽章"
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
-#: g10/gpg.c:386 sm/gpgsm.c:255
+#: g10/gpg.c:386 sm/gpgsm.c:256
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
-#: g10/gpg.c:387 sm/gpgsm.c:253
+#: g10/gpg.c:387 sm/gpgsm.c:254
msgid "list secret keys"
msgstr "列出ç§é‘°"
@@ -1526,11 +1525,11 @@ msgstr "產生一份撤銷憑證"
msgid "export keys"
msgstr "匯出金鑰"
-#: g10/gpg.c:398 sm/gpgsm.c:258
+#: g10/gpg.c:398 sm/gpgsm.c:259
msgid "export keys to a key server"
msgstr "把金鑰匯出至æŸå€‹é‡‘鑰伺æœå™¨ä¸Š"
-#: g10/gpg.c:399 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:260
msgid "import keys from a key server"
msgstr "從æŸå€‹é‡‘鑰伺æœå™¨ä¸ŠåŒ¯å…¥é‡‘é‘°"
@@ -1566,12 +1565,12 @@ msgstr "更新信任資料庫"
msgid "|algo [files]|print message digests"
msgstr "|演算法 [檔案]|å°å‡ºè¨Šæ¯æ‘˜è¦"
-#: g10/gpg.c:431 sm/gpgsm.c:263
+#: g10/gpg.c:431 sm/gpgsm.c:264
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:433 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
-#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:66 tools/symcryptrun.c:178
+#: 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
msgid ""
"@\n"
"Options:\n"
@@ -1581,31 +1580,31 @@ msgstr ""
"é¸é …:\n"
" "
-#: g10/gpg.c:435 sm/gpgsm.c:280
+#: g10/gpg.c:435 sm/gpgsm.c:281
msgid "create ascii armored output"
msgstr "建立以 ASCII å°è£éŽçš„輸出"
-#: g10/gpg.c:437 sm/gpgsm.c:290
+#: g10/gpg.c:437 sm/gpgsm.c:293
msgid "|NAME|encrypt for NAME"
msgstr "|åå­—|以「åå­—ã€ä½œç‚ºåŠ å¯†å°è±¡"
-#: g10/gpg.c:448 sm/gpgsm.c:326
+#: g10/gpg.c:448 sm/gpgsm.c:329
msgid "use this user-id to sign or decrypt"
msgstr "使用這個使用者 ID 來簽署或解密"
-#: g10/gpg.c:449 sm/gpgsm.c:329
+#: g10/gpg.c:449 sm/gpgsm.c:332
msgid "|N|set compress level N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示ä¸å£“縮)"
-#: g10/gpg.c:454 sm/gpgsm.c:331
+#: g10/gpg.c:454 sm/gpgsm.c:334
msgid "use canonical text mode"
msgstr "使用標準的文字模å¼"
-#: g10/gpg.c:468 sm/gpgsm.c:334 tools/gpgconf.c:68
+#: g10/gpg.c:468 sm/gpgsm.c:337 tools/gpgconf.c:68
msgid "use as output file"
msgstr "當作輸出檔案來使用"
-#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:71
+#: g10/gpg.c:481 kbx/kbxutil.c:84 sm/gpgsm.c:347 tools/gpgconf.c:71
msgid "do not make any changes"
msgstr "ä¸è¦åšä»»ä½•æ”¹è®Š"
@@ -1621,7 +1620,7 @@ msgstr "使用嚴謹的 OpenPGP 行為"
msgid "generate PGP 2.x compatible messages"
msgstr "產生 PGP 2.x 相容性訊æ¯"
-#: g10/gpg.c:554 sm/gpgsm.c:392
+#: g10/gpg.c:554 sm/gpgsm.c:395
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1629,7 +1628,7 @@ msgstr ""
"@\n"
"(è«‹åƒç…§ç·šä¸Šèªªæ˜Žé é¢ä¾†å–得所有命令和é¸é …的完整清單)\n"
-#: g10/gpg.c:557 sm/gpgsm.c:395
+#: g10/gpg.c:557 sm/gpgsm.c:398
msgid ""
"@\n"
"Examples:\n"
@@ -1667,7 +1666,7 @@ msgstr ""
"簽署, 檢查, 加密或解密\n"
"é è¨­çš„æ“作會ä¾è¼¸å…¥è³‡æ–™è€Œå®š\n"
-#: g10/gpg.c:782 sm/gpgsm.c:530
+#: g10/gpg.c:782 sm/gpgsm.c:534
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1695,7 +1694,7 @@ msgstr "壓縮: "
msgid "usage: gpg [options] "
msgstr "用法: gpg [é¸é …] "
-#: g10/gpg.c:1060 sm/gpgsm.c:682
+#: g10/gpg.c:1060 sm/gpgsm.c:686
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
@@ -1819,6 +1818,11 @@ msgstr "在ç§é‘°æ¸…單和公鑰清單間切æ›"
msgid "show expiration dates during signature listings"
msgstr "在ç§é‘°åœˆè£¡æ²’有一致的簽章\n"
+#: g10/gpg.c:1835
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
#: g10/gpg.c:1993
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
@@ -1955,7 +1959,7 @@ msgstr "%s:%d: 無效的驗證é¸é …\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2893 sm/gpgsm.c:1232
+#: g10/gpg.c:2893 sm/gpgsm.c:1236
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程å¼å¯èƒ½æœƒå‚¾å°å‡ºæ ¸å¿ƒæª”!\n"
@@ -1995,11 +1999,11 @@ msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而éžç®¡é“\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†è¨Šæ¯éœ€è¦ IDEA 編密法\n"
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1288
+#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
msgid "selected cipher algorithm is invalid\n"
msgstr "所é¸çš„編密演算法無效\n"
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1296
+#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
msgid "selected digest algorithm is invalid\n"
msgstr "所é¸çš„摘è¦æ¼”算法無效\n"
@@ -2227,7 +2231,7 @@ msgstr "從這個鑰匙圈裡å–用金鑰"
msgid "make timestamp conflicts only a warning"
msgstr "僅把時間戳å°çŸ›ç›¾è¦–為警告"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:370
msgid "|FD|write status info to this FD"
msgstr "|檔案æè¿°|把狀態資訊寫入此檔案æè¿°"
@@ -3714,7 +3718,7 @@ 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:516
+#: g10/keylist.c:194 g10/keyserver.c:523
#, c-format
msgid "created: %s"
msgstr "建立於: %s"
@@ -3733,7 +3737,7 @@ 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:522 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
#, c-format
msgid "expires: %s"
msgstr "éŽæœŸ: %s"
@@ -3769,12 +3773,12 @@ msgstr ""
"請注æ„顯示出來的金鑰有效性ä¸éœ€è¦æ›´æ­£,\n"
"除éžå¦³é‡æ–°åŸ·è¡Œç¨‹å¼.\n"
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:526
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "已撤銷"
-#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:530
+#: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "å·²éŽæœŸ"
@@ -4624,177 +4628,177 @@ msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
msgid "%s: keyring created\n"
msgstr "%s: 鑰匙圈已建立\n"
-#: g10/keyserver.c:66
+#: g10/keyserver.c:73
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:67
+#: g10/keyserver.c:74
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:69
+#: g10/keyserver.c:76
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:71
+#: g10/keyserver.c:78
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:75
+#: g10/keyserver.c:82
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:84
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "請輸入妳的å好金鑰伺æœå™¨ URL: "
-#: g10/keyserver.c:79
+#: g10/keyserver.c:86
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:145
+#: g10/keyserver.c:152
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告: 金鑰伺æœå™¨é¸é … `%s' 並未用於此平å°\n"
-#: g10/keyserver.c:528
+#: g10/keyserver.c:535
msgid "disabled"
msgstr "å·²ç¦ç”¨"
-#: g10/keyserver.c:729
+#: g10/keyserver.c:736
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "請輸入數字, N)ext, 或 Q)uit > "
-#: g10/keyserver.c:813 g10/keyserver.c:1435
+#: g10/keyserver.c:820 g10/keyserver.c:1442
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無效的金鑰伺æœå™¨å”定 (我們用 %d != ç¶“æ‰‹ç¨‹å¼ %d)\n"
-#: g10/keyserver.c:911
+#: g10/keyserver.c:918
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在金鑰伺æœå™¨ä¸Šæ‰¾ä¸åˆ°é‡‘é‘° \"%s\"\n"
-#: g10/keyserver.c:913
+#: g10/keyserver.c:920
msgid "key not found on keyserver\n"
msgstr "在金鑰伺æœå™¨ä¸Šæ‰¾ä¸åˆ°é‡‘é‘°\n"
-#: g10/keyserver.c:1154
+#: g10/keyserver.c:1161
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "正在請求金鑰 %s 自 %s 伺æœå™¨ %s\n"
-#: g10/keyserver.c:1158
+#: g10/keyserver.c:1165
#, c-format
msgid "requesting key %s from %s\n"
msgstr "正在請求金鑰 %s 自 %s\n"
-#: g10/keyserver.c:1182
+#: g10/keyserver.c:1189
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "正在æœå°‹ \"%s\" æ–¼ %s 伺æœå™¨ %s\n"
-#: g10/keyserver.c:1185
+#: g10/keyserver.c:1192
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "正在æœå°‹ \"%s\" æ–¼ %s\n"
-#: g10/keyserver.c:1338
+#: g10/keyserver.c:1345
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "éžé€é‡‘é‘° %s 至 %s 伺æœå™¨ %s\n"
-#: g10/keyserver.c:1342
+#: g10/keyserver.c:1349
#, c-format
msgid "sending key %s to %s\n"
msgstr "éžé€é‡‘é‘° %s 至 %s\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1392
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "正在æœå°‹ \"%s\" æ–¼ %s 伺æœå™¨ %s\n"
-#: g10/keyserver.c:1388
+#: g10/keyserver.c:1395
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "正在æœå°‹ \"%s\" æ–¼ %s\n"
-#: g10/keyserver.c:1395 g10/keyserver.c:1491
+#: g10/keyserver.c:1402 g10/keyserver.c:1498
msgid "no keyserver action!\n"
msgstr "沒有金鑰伺æœå™¨å‹•ä½œ!\n"
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1450
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告: 金鑰伺æœå™¨ç¶“æ‰‹ç¨‹å¼ (handler) 係來自ä¸åŒç‰ˆæœ¬çš„ GnuPG (%s)\n"
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1459
msgid "keyserver did not send VERSION\n"
msgstr "金鑰伺æœå™¨ä¸¦æœªé€å‡ºç‰ˆæœ¬ (VERSION)\n"
-#: g10/keyserver.c:1514 g10/keyserver.c:2042
+#: g10/keyserver.c:1521 g10/keyserver.c:2049
msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺æœå™¨ (使用 --keyserver é¸é …)\n"
-#: g10/keyserver.c:1520
+#: g10/keyserver.c:1527
msgid "external keyserver calls are not supported in this build\n"
msgstr "本版並ä¸æ”¯æ´å¤–部金鑰伺æœå™¨å«ç”¨\n"
-#: g10/keyserver.c:1532
+#: g10/keyserver.c:1539
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "沒有金鑰伺æœå™¨æ–¹æ¡ˆ (scheme) `%s' çš„ç¶“æ‰‹ç¨‹å¼ (handler)\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1544
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "動作 `%s' 並未被金鑰伺æœå™¨æ–¹æ¡ˆ (scheme) `%s' 所支æ´\n"
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1552
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 並ä¸æ”¯æ´ç¶“æ‰‹ç¨‹å¼ (handler) 版本 %d\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1559
msgid "keyserver timed out\n"
msgstr "金鑰伺æœå™¨é€¾æ™‚\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1564
msgid "keyserver internal error\n"
msgstr "金鑰伺æœå™¨å…§éƒ¨å‡ºéŒ¯\n"
-#: g10/keyserver.c:1566
+#: g10/keyserver.c:1573
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "金鑰伺æœå™¨é€šè¨Šå‡ºéŒ¯: %s\n"
-#: g10/keyserver.c:1591 g10/keyserver.c:1625
+#: g10/keyserver.c:1598 g10/keyserver.c:1632
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" 並éžé‡‘é‘° ID: 正跳éŽ\n"
-#: g10/keyserver.c:1884
+#: g10/keyserver.c:1891
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
-#: g10/keyserver.c:1906
+#: g10/keyserver.c:1913
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "正從 %s 更新 1 份金鑰\n"
-#: g10/keyserver.c:1908
+#: g10/keyserver.c:1915
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "正在更新 %d 份金鑰自 %s\n"
-#: g10/keyserver.c:1964
+#: g10/keyserver.c:1971
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
-#: g10/keyserver.c:1970
+#: g10/keyserver.c:1977
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
@@ -5137,16 +5141,16 @@ msgstr "新的設定檔 `%s' 被建立了\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr "警告: 在 `%s' 裡的é¸é …於這次執行期間並沒有被啟用\n"
-#: g10/parse-packet.c:192
+#: g10/parse-packet.c:193
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "無法æ“作公開金鑰演算法 %d\n"
-#: g10/parse-packet.c:762
+#: g10/parse-packet.c:798
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告: 以å¯èƒ½ä¸¦ä¸å®‰å…¨çš„å°ç¨±å¼åŠ å¯†éŽçš„階段金鑰\n"
-#: g10/parse-packet.c:1213
+#: g10/parse-packet.c:1249
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的å­å°åŒ…設定了關éµä½å…ƒ\n"
@@ -5735,7 +5739,7 @@ msgstr "建立了弱金鑰 - 正在é‡è©¦\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "無法é¿å…å°ç¨±å¼ç·¨å¯†æ³•çš„弱金鑰; 已經試了 %d 次了!\n"
-#: g10/seskey.c:229
+#: g10/seskey.c:229 sm/certcheck.c:91
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@ -6278,7 +6282,7 @@ msgstr ""
msgid "iconv_open failed: %s\n"
msgstr "簽署時失敗了: %s\n"
-#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "把 `%s' é‡æ–°æ–°å‘½æˆ `%s' 時失敗: %s\n"
@@ -6498,7 +6502,7 @@ msgstr "ç„¡æ³•å­˜å– %s - 無效的 OpenPGP å¡ç‰‡?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:113 sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:359
#, fuzzy
msgid "read options from file"
msgstr "從 `%s' 讀å–é¸é …\n"
@@ -6539,21 +6543,21 @@ msgid ""
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:684
+#: scd/scdaemon.c:664
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1032
+#: scd/scdaemon.c:1012
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1037
+#: scd/scdaemon.c:1017
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:323
+#: sm/base64.c:327
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "無效的 64 進ä½å­—符 %02x 被跳éŽäº†\n"
@@ -6577,180 +6581,186 @@ msgstr "gpg-agent å”定版本 %d 未被支æ´\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:165
+#: sm/certchain.c:176
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "gpg-agent å”定版本 %d 未被支æ´\n"
-#: sm/certchain.c:203
+#: sm/certchain.c:214
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:242
+#: sm/certchain.c:253
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:252
+#: sm/certchain.c:263
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "無法開啟 `%s': %s\n"
-#: sm/certchain.c:259 sm/certchain.c:288
+#: sm/certchain.c:270 sm/certchain.c:299
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:263 sm/certchain.c:292
+#: sm/certchain.c:274 sm/certchain.c:303
#, fuzzy
msgid "certificate policy not allowed"
msgstr "未被å…許匯出ç§é‘°\n"
-#: sm/certchain.c:403
+#: sm/certchain.c:414
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:423
+#: sm/certchain.c:434
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: 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
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "存放金鑰失敗: %s\n"
-#: sm/certchain.c:667
+#: sm/certchain.c:678
#, fuzzy
msgid "certificate has been revoked"
msgstr "請注æ„: 金鑰已經被撤銷了"
-#: sm/certchain.c:676
+#: sm/certchain.c:687
#, fuzzy
msgid "no CRL found for certificate"
msgstr "æ壞的憑證"
-#: sm/certchain.c:680
+#: sm/certchain.c:691
#, fuzzy
msgid "the available CRL is too old"
msgstr "å¯ç”¨çš„金鑰於: "
-#: sm/certchain.c:682
+#: sm/certchain.c:693
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:687
+#: sm/certchain.c:698
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "檢查已建立的簽章時發生錯誤: %s\n"
-#: sm/certchain.c:765
+#: sm/certchain.c:794
#, fuzzy
msgid "no issuer found in certificate"
msgstr "產生一份撤銷憑證"
-#: sm/certchain.c:792
+#: sm/certchain.c:823
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:808
+#: sm/certchain.c:839
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:821
+#: sm/certchain.c:852
#, fuzzy
msgid "certificate has expired"
msgstr "這把金鑰已經éŽæœŸäº†!"
-#: sm/certchain.c:864
+#: sm/certchain.c:895
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:963
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:978
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "憑證中心 (CA) 指紋: "
-#: sm/certchain.c:955
+#: sm/certchain.c:986
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:1001
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:976
+#: sm/certchain.c:1007
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:986
+#: sm/certchain.c:1017
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "檢查已建立的簽章時發生錯誤: %s\n"
-#: sm/certchain.c:1013 sm/import.c:158
+#: sm/certchain.c:1044 sm/import.c:159
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1025
+#: sm/certchain.c:1056
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1058
+#: sm/certchain.c:1089
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "é©—è­‰æŸä»½ç°½ç« "
-#: sm/certchain.c:1088
+#: sm/certchain.c:1119
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1139
+#: sm/certchain.c:1170
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certcheck.c:52
-msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA è¦æ±‚使用 160 ä½å…ƒçš„雜湊演算法\n"
+#: sm/certcheck.c:103
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr ""
+
+#: sm/certcheck.c:113
+#, c-format
+msgid "a %u bit hash is not valid for a %u bit %s key\n"
+msgstr ""
-#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
+#: sm/certcheck.c:250 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
-#: sm/certdump.c:68 sm/certdump.c:154
+#: sm/certdump.c:68 sm/certdump.c:151
#, fuzzy
msgid "none"
msgstr "no"
-#: sm/certdump.c:163
+#: sm/certdump.c:162
#, fuzzy
msgid "[none]"
msgstr "[未設定]"
-#: sm/certdump.c:536 sm/certdump.c:599
+#: sm/certdump.c:552 sm/certdump.c:597 sm/certdump.c:662 sm/certdump.c:715
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "錯誤: 無效的回應.\n"
-#: sm/certdump.c:544
+#: sm/certdump.c:560 sm/certdump.c:605
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:579
+#: sm/certdump.c:642 sm/certdump.c:698
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:604
+#: sm/certdump.c:667 sm/certdump.c:721
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "錯誤: 無效的回應.\n"
-#: sm/certdump.c:818
+#: sm/certdump.c:930
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for:\n"
@@ -6765,7 +6775,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:135 sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "å–å¾—ç¾ç”¨é‡‘鑰資訊時發生錯誤: %s\n"
@@ -6852,7 +6862,7 @@ msgstr ""
msgid "certificate `%s' not found: %s\n"
msgstr "找ä¸åˆ°ç§é‘° \"%s\": %s\n"
-#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1397 sm/keydb.c:1497
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "讀å–金鑰å€å¡Šæ™‚發生錯誤: %s\n"
@@ -6877,200 +6887,200 @@ msgstr "刪除金鑰å€å¡Šæ™‚失敗了: %s\n"
msgid "no valid recipients given\n"
msgstr "(沒有給定æè¿°)\n"
-#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#: sm/export.c:615 sm/export.c:631 sm/import.c:526 sm/import.c:551
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "建立密語的時候發生錯誤: %s\n"
-#: sm/export.c:569 sm/import.c:533
+#: sm/export.c:622 sm/import.c:534
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[檔案]|建立一份簽章"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[檔案]|建立一份明文簽章"
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list external keys"
msgstr "列出ç§é‘°"
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
#, fuzzy
msgid "list certificate chain"
msgstr "æ壞的憑證"
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
#, fuzzy
msgid "remove key from the public keyring"
msgstr "從公鑰鑰匙圈裡移去金鑰"
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
#, fuzzy
msgid "import certificates"
msgstr "æ壞的憑證"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:262
#, fuzzy
msgid "export certificates"
msgstr "æ壞的憑證"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
#, fuzzy
msgid "register a smartcard"
msgstr "加入æŸæŠŠé‡‘鑰至智慧å¡"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
#, fuzzy
msgid "change a passphrase"
msgstr "更改密語"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:283
#, fuzzy
msgid "create base-64 encoded output"
msgstr "建立以 ASCII å°è£éŽçš„輸出"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:287
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:289
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:291
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:296
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:297
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:304
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:307
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:310
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:313
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:317
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:321
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:323
#, fuzzy
msgid "use the default key as default recipient"
msgstr "已跳éŽ: 公鑰已經被設æˆé è¨­æ”¶ä»¶è€…\n"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:340
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:344
#, fuzzy
msgid "force v3 signatures"
msgstr "檢查簽章"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:345
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:351
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:352
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:354
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "從這個鑰匙圈裡å–用金鑰"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "è¦æœ‰ç§é‘°çº”能這麼åš.\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:358
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|åå­—|以「åå­—ã€ä½œç‚ºåŠ å¯†å°è±¡"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:377
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:383
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的編密演算法"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:385
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s 簽章, 摘è¦æ¼”算法 %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:387
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "未知的壓縮演算法"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:524
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpg [é¸é …] [檔案] (或用 -h 求助)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:527
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7081,45 +7091,40 @@ msgstr ""
"簽署, 檢查, 加密或解密\n"
"é è¨­çš„æ“作會ä¾è¼¸å…¥è³‡æ–™è€Œå®š\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:621
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "用法: gpg [é¸é …] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:702
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "無法連接至 `%s': %s\n"
-#: sm/gpgsm.c:773
-#, c-format
-msgid "libksba is too old (need %s, have %s)\n"
-msgstr ""
-
-#: sm/gpgsm.c:1249
+#: sm/gpgsm.c:1253
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1328
+#: sm/gpgsm.c:1332
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1346
+#: sm/gpgsm.c:1350
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "ç„¡æ³•å­˜å– `%s': %s\n"
-#: sm/gpgsm.c:1536
+#: sm/gpgsm.c:1542
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1601
+#: sm/gpgsm.c:1606
#, fuzzy
msgid "key generation is not available from the commandline\n"
msgstr "gpg-agent 在此階段無法使用\n"
-#: sm/gpgsm.c:1602
+#: sm/gpgsm.c:1607
#, fuzzy, c-format
msgid "please use the script \"%s\" to generate a new key\n"
msgstr "è«‹é¸æ“‡å¦³è¦ç”¢ç”Ÿçš„金鑰種類:\n"
@@ -7129,21 +7134,21 @@ msgstr "è«‹é¸æ“‡å¦³è¦ç”¢ç”Ÿçš„金鑰種類:\n"
msgid "total number processed: %lu\n"
msgstr "總共被處ç†çš„數é‡: %lu\n"
-#: sm/import.c:227
+#: sm/import.c:228
#, fuzzy
msgid "error storing certificate\n"
msgstr "產生一份撤銷憑證"
-#: sm/import.c:235
+#: sm/import.c:236
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:421 sm/import.c:453
+#: sm/import.c:422 sm/import.c:454
#, fuzzy, c-format
msgid "error importing certificate: %s\n"
msgstr "建立密語的時候發生錯誤: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#: sm/import.c:543 tools/gpg-connect-agent.c:388
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "è®€å– `%s' 時發生錯誤: %s\n"
@@ -7162,12 +7167,12 @@ msgstr ""
msgid "keybox `%s' created\n"
msgstr "鑰匙圈 `%s' 已建立\n"
-#: sm/keydb.c:1312 sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1380
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "存放指紋失敗: %s\n"
-#: sm/keydb.c:1319 sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1387
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "存放金鑰失敗: %s\n"
@@ -7187,17 +7192,17 @@ msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
msgid "error storing certificate: %s\n"
msgstr "å–å¾—ç¾ç”¨é‡‘鑰資訊時發生錯誤: %s\n"
-#: sm/keydb.c:1400
+#: sm/keydb.c:1408
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1409 sm/keydb.c:1497
+#: sm/keydb.c:1417 sm/keydb.c:1509
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "å–得新的個人識別碼 (PIN) 時出錯: %s\n"
-#: sm/keydb.c:1418 sm/keydb.c:1508
+#: sm/keydb.c:1429 sm/keydb.c:1520
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "è®€å– `%s' 時發生錯誤: %s\n"
@@ -7270,103 +7275,107 @@ msgstr "完好的簽章來自於 \"%s\""
msgid " aka"
msgstr " äº¦å³ \"%s\""
-#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:70 tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:61 tools/gpgconf.c:70 tools/symcryptrun.c:167
#, fuzzy
msgid "quiet"
msgstr "quit"
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:62
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:63
+msgid "decode received data lines"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:64
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:65
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:67
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:129
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "用法: gpg [é¸é …] [檔案] (或用 -h 求助)"
-#: tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:132
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:328
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:333
+#: tools/gpg-connect-agent.c:337
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:395
#, fuzzy
msgid "line too long - skipped\n"
msgstr "列太長"
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:399
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:471
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "未知的é¸é … `%s'\n"
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:479
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "簽署時失敗了: %s\n"
-#: tools/gpg-connect-agent.c:473
+#: tools/gpg-connect-agent.c:487
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "讀å–公鑰時失敗: %s\n"
-#: tools/gpg-connect-agent.c:746
+#: tools/gpg-connect-agent.c:797
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "è®€å– `%s' 時發生錯誤: %s\n"
-#: tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:806
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:720
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:743
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:750
+#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:758
+#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:684
+#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
msgid "Options controlling the security"
msgstr ""
@@ -7394,31 +7403,35 @@ msgstr ""
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:689
+#: tools/gpgconf-comp.c:669
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:692
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:736
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:772
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:779
+#: tools/gpgconf-comp.c:782
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:790
+#: tools/gpgconf-comp.c:793
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:795
+#: tools/gpgconf-comp.c:798
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:832
+#: tools/gpgconf-comp.c:835
msgid "Configuration for OCSP"
msgstr ""
@@ -7482,7 +7495,7 @@ msgstr "未å…許使用管ç†è€…指令\n"
msgid "error allocating enough memory: %s\n"
msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
-#: tools/symcryptrun.c:173
+#: tools/symcryptrun.c:154
#, fuzzy
msgid ""
"@\n"
@@ -7492,166 +7505,169 @@ msgstr ""
"@指令:\n"
" "
-#: tools/symcryptrun.c:175
+#: tools/symcryptrun.c:156
#, fuzzy
msgid "decryption modus"
msgstr "解密æˆåŠŸ\n"
-#: tools/symcryptrun.c:176
+#: tools/symcryptrun.c:157
#, fuzzy
msgid "encryption modus"
msgstr "解密æˆåŠŸ\n"
-#: tools/symcryptrun.c:180
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
msgstr ""
-#: tools/symcryptrun.c:181
+#: tools/symcryptrun.c:162
#, fuzzy
msgid "program filename"
msgstr "--store [檔å]"
-#: tools/symcryptrun.c:183
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
msgstr ""
-#: tools/symcryptrun.c:184
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
msgstr ""
-#: tools/symcryptrun.c:228
+#: tools/symcryptrun.c:209
#, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
msgstr "用法: gpg [é¸é …] [檔案] (或用 -h 求助)"
-#: tools/symcryptrun.c:231
+#: tools/symcryptrun.c:212
msgid ""
"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
"[options...] COMMAND [inputfile]\n"
"Call a simple symmetric encryption tool\n"
msgstr ""
-#: tools/symcryptrun.c:313
+#: tools/symcryptrun.c:294
#, fuzzy, c-format
msgid "%s on %s aborted with status %i\n"
msgstr "%s ä¸è¢«å…許跟 %s 併用\n"
-#: tools/symcryptrun.c:320
+#: tools/symcryptrun.c:301
#, fuzzy, c-format
msgid "%s on %s failed with status %i\n"
msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
-#: tools/symcryptrun.c:346
+#: tools/symcryptrun.c:327
#, fuzzy, c-format
msgid "can't create temporary directory `%s': %s\n"
msgstr "無法建立目錄 `%s': %s\n"
-#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
+#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
#, c-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tools/symcryptrun.c:414
+#: tools/symcryptrun.c:395
#, fuzzy, c-format
msgid "error writing to %s: %s\n"
msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
-#: tools/symcryptrun.c:421
+#: tools/symcryptrun.c:402
#, fuzzy, c-format
msgid "error reading from %s: %s\n"
msgstr "è®€å– `%s' 時發生錯誤: %s\n"
-#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
+#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
#, fuzzy, c-format
msgid "error closing %s: %s\n"
msgstr "在 `%s' 中出錯: %s\n"
-#: tools/symcryptrun.c:545
+#: tools/symcryptrun.c:526
#, fuzzy
msgid "no --program option provided\n"
msgstr "沒有已支æ´çš„é ç«¯ç¨‹å¼åŸ·è¡Œ\n"
-#: tools/symcryptrun.c:551
+#: tools/symcryptrun.c:532
msgid "only --decrypt and --encrypt are supported\n"
msgstr ""
-#: tools/symcryptrun.c:557
+#: tools/symcryptrun.c:538
msgid "no --keyfile option provided\n"
msgstr ""
-#: tools/symcryptrun.c:568
+#: tools/symcryptrun.c:549
msgid "cannot allocate args vector\n"
msgstr ""
-#: tools/symcryptrun.c:586
+#: tools/symcryptrun.c:567
#, fuzzy, c-format
msgid "could not create pipe: %s\n"
msgstr "無法建立 `%s': %s\n"
-#: tools/symcryptrun.c:593
+#: tools/symcryptrun.c:574
#, fuzzy, c-format
msgid "could not create pty: %s\n"
msgstr "無法建立 `%s': %s\n"
-#: tools/symcryptrun.c:609
+#: tools/symcryptrun.c:590
#, c-format
msgid "could not fork: %s\n"
msgstr ""
-#: tools/symcryptrun.c:637
+#: tools/symcryptrun.c:618
#, fuzzy, c-format
msgid "execv failed: %s\n"
msgstr "更新失敗: %s\n"
-#: tools/symcryptrun.c:666
+#: tools/symcryptrun.c:647
#, fuzzy, c-format
msgid "select failed: %s\n"
msgstr "刪除金鑰å€å¡Šæ™‚失敗了: %s\n"
-#: tools/symcryptrun.c:683
+#: tools/symcryptrun.c:664
#, fuzzy, c-format
msgid "read failed: %s\n"
msgstr "更新失敗: %s\n"
-#: tools/symcryptrun.c:735
+#: tools/symcryptrun.c:716
#, fuzzy, c-format
msgid "pty read failed: %s\n"
msgstr "更新失敗: %s\n"
-#: tools/symcryptrun.c:787
+#: tools/symcryptrun.c:768
#, fuzzy, c-format
msgid "waitpid failed: %s\n"
msgstr "更新失敗: %s\n"
-#: tools/symcryptrun.c:801
+#: tools/symcryptrun.c:782
#, c-format
msgid "child aborted with status %i\n"
msgstr ""
-#: tools/symcryptrun.c:856
+#: tools/symcryptrun.c:837
#, fuzzy, c-format
msgid "cannot allocate infile string: %s\n"
msgstr "無法建立備份檔案 `%s': %s\n"
-#: tools/symcryptrun.c:869
+#: tools/symcryptrun.c:850
#, fuzzy, c-format
msgid "cannot allocate outfile string: %s\n"
msgstr "無法建立備份檔案 `%s': %s\n"
-#: tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1025
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1045
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1052
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "ä¿è­·æ‘˜è¦ %d 未被支æ´\n"
+#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgstr "DSA è¦æ±‚使用 160 ä½å…ƒçš„雜湊演算法\n"
+
#, fuzzy
#~ msgid ".\n"
#~ msgstr "%s.\n"
diff --git a/scripts/compile b/scripts/compile
index b6e6dcb0f..1b1d23216 100755
--- a/scripts/compile
+++ b/scripts/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,92 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA..
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# 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
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
-# Usage statement added by Billy Biggs <vektor@dumbterm.net>.
-if [ -z $1 ]; then
- echo "Wrapper for compilers which do not understand '-c -o'."
- echo "usage: compile PROGRAM [ARGS]..."
- echo "'-o FOO.o' is removed from the args passed to the actual compile."
- exit 1
-fi
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
-prog=$1
-shift
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/config.guess b/scripts/config.guess
index a4929a979..c38553dc7 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-08-13'
+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
@@ -17,14 +17,15 @@ timestamp='2004-08-13'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA..
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# 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
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -54,7 +55,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -67,11 +68,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -105,7 +106,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -124,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -197,55 +198,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amd64:OpenBSD:*:*)
- echo x86_64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- luna88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -298,37 +267,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
*:OS400:*:*)
echo powerpc-ibm-os400
- exit 0 ;;
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -336,32 +311,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -370,10 +345,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -385,10 +360,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -399,40 +374,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -456,32 +431,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -497,29 +473,29 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -527,7 +503,7 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -542,14 +518,18 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -563,28 +543,28 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -646,9 +626,19 @@ EOF
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -656,11 +646,11 @@ EOF
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -688,152 +678,177 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:MSYS_NT-*:*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
+ x86:Interix*:[345]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[345]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit 0 ;;
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -850,8 +865,12 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -869,15 +888,22 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -891,7 +917,7 @@ EOF
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -899,25 +925,28 @@ EOF
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ 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
@@ -935,15 +964,15 @@ EOF
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -960,7 +989,7 @@ EOF
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
LIBC=gnu
#else
LIBC=gnuaout
@@ -970,16 +999,23 @@ EOF
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -987,27 +1023,27 @@ EOF
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
- i*86:syllable:*:*)
+ exit ;;
+ i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1015,15 +1051,16 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1041,73 +1078,73 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
+ exit ;;
M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1115,69 +1152,72 @@ EOF
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1185,22 +1225,25 @@ EOF
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1211,38 +1254,47 @@ EOF
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
- esac
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1274,7 +1326,7 @@ main ()
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1363,11 +1415,12 @@ main ()
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1376,22 +1429,22 @@ then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1402,7 +1455,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/scripts/config.sub b/scripts/config.sub
index ac6de9869..ad9f39571 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-06-24'
+timestamp='2006-02-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2004-06-24'
#
# You 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# 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
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -70,7 +71,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,8 +119,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -170,6 +172,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -186,6 +192,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,13 +241,14 @@ case $basic_machine in
| 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 \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -246,6 +257,7 @@ case $basic_machine in
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -254,23 +266,29 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | 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
@@ -278,6 +296,9 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -298,7 +319,7 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
- | bs2000-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
@@ -310,7 +331,7 @@ case $basic_machine in
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -319,6 +340,7 @@ case $basic_machine in
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -327,27 +349,32 @@ case $basic_machine in
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
+ | mt-* \
| msp430-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | 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)
@@ -457,6 +484,9 @@ case $basic_machine in
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
@@ -486,6 +516,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -676,6 +710,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -751,9 +788,8 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
;;
os400)
basic_machine=powerpc-ibm
@@ -784,6 +820,12 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -840,6 +882,10 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -1026,6 +1072,10 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1075,12 +1125,9 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
@@ -1154,20 +1201,23 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1185,7 +1235,7 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1294,6 +1344,9 @@ case $os in
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
@@ -1371,6 +1424,9 @@ case $basic_machine in
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
@@ -1542,7 +1598,7 @@ case $basic_machine in
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/scripts/depcomp b/scripts/depcomp
index aea3d0078..ca5ea4e1e 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -1,7 +1,10 @@
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2006-10-15.18
+
+# Copyright (C) 1999, 2000, 2003, 2004, 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 General Public License as published by
@@ -15,8 +18,8 @@
# You 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -25,22 +28,45 @@
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
-fi
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@@ -66,7 +92,20 @@ gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -172,19 +211,25 @@ sgi)
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. This file always lives in the current directory.
- # Also, the AIX compiler puts `$object:' at the start of each line;
- # $object doesn't have directory information.
- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+ # in a .u file. In older versions, this file always lives in the
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
- outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
-
stat=$?
+
+ if test -f "$tmpdepfile"; then :
+ else
+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
+ tmpdepfile="$stripped.u"
+ fi
+
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
@@ -192,6 +237,7 @@ aix)
fi
if test -f "$tmpdepfile"; then
+ outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
@@ -244,6 +290,46 @@ icc)
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -255,31 +341,47 @@ tru64)
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
- tmpdepfile1="$dir.libs/$base.lo.d"
- tmpdepfile2="$dir.libs/$base.d"
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
- tmpdepfile1="$dir$base.o.d"
- tmpdepfile2="$dir$base.d"
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- else
- tmpdepfile="$tmpdepfile2"
- fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a space and a tab in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -292,7 +394,7 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o.
+ # always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
@@ -388,7 +490,7 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
@@ -419,7 +521,8 @@ cpp)
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
@@ -430,7 +533,7 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
+ # always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
IFS=" "
@@ -470,3 +573,12 @@ none)
esac
exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/install-sh b/scripts/install-sh
index 6ce63b9f7..4fbbae7b7 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,7 +1,8 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-#
+
+scriptversion=2006-10-14.15
+
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
@@ -38,17 +39,24 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -59,236 +67,441 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd=$cpprog
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
+posix_glob=
+posix_mkdir=
-if [ x"$src" = x ]
-then
- echo "$0: no input file specified" >&2
- exit 1
-else
- :
-fi
+# Desired mode of installed file.
+mode=0755
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
+chmodcmd=$chmodprog
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
+
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
+
+ -d) dir_arg=true
+ shift
+ continue;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+ shift
+ shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
+
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
- if [ -d "$dst" ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=$mkdirprog
- fi
-else
+ -T) no_target_directory=true
+ shift
+ continue;;
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+ --version) echo "$0 $scriptversion"; exit $?;;
- if [ -f "$src" ] || [ -d "$src" ]
- then
- :
- else
- echo "$0: $src does not exist" >&2
- exit 1
- fi
+ --) shift
+ break;;
- if [ x"$dst" = x ]
- then
- echo "$0: no destination specified" >&2
- exit 1
- else
- :
- fi
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
+ *) break;;
+ esac
+done
- if [ -d "$dst" ]
- then
- dst=$dst/`basename "$src"`
- else
- :
- fi
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
fi
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
- '
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp=$pathcomp$1
- shift
-
- if [ ! -d "$pathcomp" ] ;
- then
- $mkdirprog "$pathcomp"
- else
- :
- fi
-
- pathcomp=$pathcomp/
-done
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call `install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
fi
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd "$dst" &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename "$dst"`
- else
- dstfile=`basename "$dst" $transformbasename |
- sed $transformarg`$transformbasename
- fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
-# don't allow the sed command to completely eliminate the filename
+for src
+do
+ # Protect names starting with `-'.
+ case $src in
+ -*) src=./$src ;;
+ esac
+
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
+
+ if test -z "$dstarg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+ dst=$dstarg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst ;;
+ esac
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename "$dst"`
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
else
- :
+ mkdir_mode=
fi
-# Make a couple of temp file names in the proper directory.
-
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
-
-# Trap to clean up temp files at exit.
-
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
- trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location. We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons. In this case, the final cleanup
-# might fail but the new file should still install successfully.
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
-{
- if [ -f "$dstdir/$dstfile" ]
- then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
- {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
+ shift
+ $posix_glob && set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
else
- :
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
fi
-} &&
-
-# Now rename the file to the real destination.
-
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
+
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ } || exit 1
+
+ trap '' 0
+ fi
+done
-{
- (exit 0); exit
-}
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/mdate-sh b/scripts/mdate-sh
index b610b47a6..cd916c0a3 100755
--- a/scripts/mdate-sh
+++ b/scripts/mdate-sh
@@ -1,6 +1,10 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-# Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-29.22
+
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
+# Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
@@ -15,13 +19,38 @@
#
# You 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.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# 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
# the same distribution terms that you use for the rest of that program.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+ '')
+ echo "$0: No file. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: mdate-sh [--help] [--version] FILE
+
+Pretty-print the modification time of FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "mdate-sh $scriptversion"
+ exit $?
+ ;;
+esac
+
# Prevent date giving response in another language.
LANG=C
export LANG
@@ -30,7 +59,15 @@ export LC_ALL
LC_TIME=C
export LC_TIME
-save_arg1="$1"
+# GNU ls changes its time format in response to the TIME_STYLE
+# variable. Since we cannot assume `unset' works, revert this
+# variable to its documented default.
+if test "${TIME_STYLE+set}" = set; then
+ TIME_STYLE=posix-long-iso
+ export TIME_STYLE
+fi
+
+save_arg1=$1
# Find out how to get the extended ls output of a file or directory.
if ls -L /dev/null 1>/dev/null 2>&1; then
@@ -52,7 +89,7 @@ fi
# words should be skipped to get the date.
# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-set - x`$ls_command /`
+set x`ls -l -d /`
# Find which argument is the month.
month=
@@ -79,13 +116,32 @@ do
done
# Get the extended ls output of the file or directory.
-set - x`eval "$ls_command \"\$save_arg1\""`
+set dummy x`eval "$ls_command \"\$save_arg1\""`
# Remove all preceding arguments
eval $command
-# Get the month. Next argument is day, followed by the year or time.
-case $1 in
+# Because of the dummy argument above, month is in $2.
+#
+# On a POSIX system, we should have
+#
+# $# = 5
+# $1 = file size
+# $2 = month
+# $3 = day
+# $4 = year or time
+# $5 = filename
+#
+# On Darwin 7.7.0 and 7.6.0, we have
+#
+# $# = 4
+# $1 = day
+# $2 = month
+# $3 = year or time
+# $4 = filename
+
+# Get the month.
+case $2 in
Jan) month=January; nummonth=1;;
Feb) month=February; nummonth=2;;
Mar) month=March; nummonth=3;;
@@ -100,7 +156,10 @@ case $1 in
Dec) month=December; nummonth=12;;
esac
-day=$2
+case $3 in
+ ???*) day=$1;;
+ *) day=$3; shift;;
+esac
# Here we have to deal with the problem that the ls output gives either
# the time of day or the year.
@@ -131,3 +190,12 @@ esac
# The result.
echo $day $month $year
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/missing b/scripts/missing
index 6a37006e8..1c8ff7049 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@ if test $# -eq 0; then
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +44,24 @@ else
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@ Supported PROGRAM values:
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@ Supported PROGRAM values:
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +149,8 @@ WARNING: \`$1' is missing on your system. You should only need it if
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@ WARNING: \`$1' is missing on your system. You should only need it if
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +167,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@ WARNING: \`$1' is missing on your system. You should only need it if
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,20 +188,15 @@ WARNING: \`$1' is missing on your system. You should only need it if
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -185,74 +212,67 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -262,32 +282,36 @@ WARNING: \`$1' is missing on your system. You should only need it if
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@ WARNING: \`$1' is missing on your system. You should only need it if
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,10 +347,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -334,3 +358,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
index d2d5f21b6..ef7e16fda 100755
--- a/scripts/mkinstalldirs
+++ b/scripts/mkinstalldirs
@@ -1,21 +1,36 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2006-05-11.19
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
-dirmode=""
+dirmode=
usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
+ echo "$usage"
+ exit $?
;;
-m) # -m PERM arg
shift
@@ -23,6 +38,10 @@ while test $# -gt 0 ; do
dirmode=$1
shift
;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
--) # stop option processing
shift
break
@@ -50,30 +69,58 @@ case $# in
0) exit 0 ;;
esac
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error. This is a problem when calling mkinstalldirs
+# from a parallel make. We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
- if mkdir -p -- . 2>/dev/null; then
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
fi
;;
*)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
fi
;;
esac
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
shift
+ IFS=$oIFS
- pathcomp=
for d
do
- pathcomp="$pathcomp$d"
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
@@ -84,21 +131,21 @@ do
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
- errstatus=$lasterr
+ errstatus=$lasterr
else
- if test ! -z "$dirmode"; then
+ if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
+ lasterr=
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
fi
fi
- pathcomp="$pathcomp/"
+ pathcomp=$pathcomp/
done
done
@@ -107,5 +154,8 @@ exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 019cd7650..e2b7796cf 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 Werner Koch <wk@g10code.com>
+
+ * certcheck.c (MY_GCRY_PK_ECDSA): New.
+
2007-04-20 Werner Koch <wk@g10code.com>
* gpgsm.c (main): Parameterize failed versions check messages.
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 6dbc72d64..0a362d3fb 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -35,6 +35,11 @@
#include "keydb.h"
#include "i18n.h"
+
+/* Remove this if libgcrypt 1.3.0 is required. */
+#define MY_GCRY_PK_ECDSA 301
+
+
/* Return the number of bits of the Q parameter from the DSA key
KEY. */
static unsigned int
@@ -72,11 +77,11 @@ do_encode_md (gcry_md_hd_t md, int algo, int pkalgo, unsigned int nbits,
size_t nframe;
unsigned char *frame;
- if (pkalgo == GCRY_PK_DSA || pkalgo == GCRY_PK_ECDSA)
+ if (pkalgo == GCRY_PK_DSA || pkalgo == MY_GCRY_PK_ECDSA)
{
unsigned int qbits;
- if ( pkalgo == GCRY_PK_ECDSA )
+ if ( pkalgo == MY_GCRY_PK_ECDSA )
qbits = gcry_pk_get_nbits (pkey);
else
qbits = get_dsa_qbits (pkey);
@@ -211,7 +216,7 @@ pk_algo_from_sexp (gcry_sexp_t pkey)
/* Because this function is called only for verification we can
assume that ECC actually means ECDSA. */
else if (n==3 && !memcmp (name, "ecc", 3))
- algo = GCRY_PK_ECDSA;
+ algo = MY_GCRY_PK_ECDSA;
else if (n==13 && !memcmp (name, "ambiguous-rsa", 13))
algo = GCRY_PK_RSA;
else