-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file to create version 1.2.6 from 1.2.5. Please check the signature of this patch file: zcat somepath/gnupg-1.2.5-1.2.6.diff.gz | gpg --verify Change to directory gnupg-1.2.5 (or however you renamed it) and give this command: zcat somepath/gnupg-1.2.5-1.2.6.diff.gz | patch -p1 It is a good idea to rename your current directory to gnupg-1.2.6 now. Prereq: 1.2.5 diff -urpP gnupg-1.2.5/VERSION gnupg-1.2.6/VERSION --- gnupg-1.2.5/VERSION 2004-07-26 12:26:57.000000000 +0000 +++ gnupg-1.2.6/VERSION 2004-08-25 14:59:28.000000000 +0000 @@ -1 +1 @@ -1.2.5 +1.2.6 diff -urpP gnupg-1.2.5/intl/VERSION gnupg-1.2.6/intl/VERSION --- gnupg-1.2.5/intl/VERSION 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/VERSION 2004-08-09 15:28:48.000000000 +0000 @@ -1 +1 @@ -GNU gettext library from gettext-0.10.40 +GNU gettext library from gettext-0.14.1 diff -urpP gnupg-1.2.5/ABOUT-NLS gnupg-1.2.6/ABOUT-NLS --- gnupg-1.2.5/ABOUT-NLS 2002-08-23 08:01:50.000000000 +0000 +++ gnupg-1.2.6/ABOUT-NLS 2004-08-09 15:28:47.000000000 +0000 @@ -1,10 +1,11 @@ Notes on the Free Translation Project ************************************* - Free software is going international! The Free Translation Project -is a way to get maintainers of free software, translators, and users all -together, so that will gradually become able to speak many languages. -A few packages already provide translations for their messages. +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all +together, so that free software will gradually become able to speak many +languages. A few packages already provide translations for their +messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, @@ -15,7 +16,7 @@ this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and -work at translations should contact the appropriate team. +work on translations can contact the appropriate team. When reporting bugs in the `intl/' directory or bugs which may be related to internationalization, you should tell about the version of @@ -25,7 +26,7 @@ related to internationalization, you sho Quick configuration advice ========================== - If you want to exploit the full power of internationalization, you +If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext @@ -48,34 +49,34 @@ included `libintl'. INSTALL Matters =============== - Some packages are "localizable" when properly installed; the -programs they contain can be made to speak your own native language. -Most such packages use GNU `gettext'. Other packages have their own -ways to internationalization, predating GNU `gettext'. +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the GNU `gettext' own -library will be used. This library is wholly contained within this -package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is _not_ required. Installers may use -special options at configuration time for changing the default -behaviour. The commands: +provides the GNU `gettext' functions. If not, the included GNU +`gettext' library will be used. This library is wholly contained +within this package, usually in the `intl/' subdirectory, so prior +installation of the GNU `gettext' package is _not_ required. +Installers may use special options at configuration time for changing +the default behaviour. The commands: ./configure --with-included-gettext ./configure --disable-nls -will respectively bypass any pre-existing `gettext' to use the +will, respectively, bypass any pre-existing `gettext' to use the internationalizing routines provided within this package, or else, _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might be not what is desirable. You -should use the more recent version of the GNU `gettext' library. I.e. -if the file `intl/VERSION' shows that the library which comes with this -package is more recent, you should use +will decide to use this. This might not be desirable. You should use +the more recent version of the GNU `gettext' library. I.e. if the file +`intl/VERSION' shows that the library which comes with this package is +more recent, you should use ./configure --with-included-gettext @@ -86,7 +87,7 @@ and therefore it will not be used. The emulation of `gettext' on top of `catgets' could not provide all the extensions of the GNU `gettext' library. - Internationalized packages have usually many `po/LL.po' files, where + Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless translations have been forbidden at `configure' time by using the `--disable-nls' switch, all available translations are installed @@ -98,7 +99,7 @@ codes, stating which languages are allow Using This Package ================== - As a user, if your language has been installed for this package, you +As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's @@ -113,6 +114,13 @@ But in fact, some languages have dialect example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your country by running the command +`locale -a | grep '^LL''. + Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. @@ -124,6 +132,13 @@ system libraries. For example, some Swe read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent @@ -133,7 +148,7 @@ to `de_DE' (German as spoken in Germany) Translating Teams ================= - For the Free Translation Project to be a success, we need interested +For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of @@ -163,129 +178,559 @@ programming skill, here. Available Packages ================== - Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of September -2001. The matrix shows, in regard of each package, for which languages +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of January +2004. 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%. - Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja - +----------------------------------------------------+ - a2ps | [] [] [] | - bash | [] [] [] [] | - bfd | | - binutils | [] | - bison | [] [] [] [] [] | - clisp | [] [] [] [] | - cpio | [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] | - fetchmail | | - fileutils | [] [] [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] [] [] | - freetype | | - gas | | - gawk | [] [] | - gcal | | - gcc | | - gettext | [] [] [] [] [] [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | | - grep | [] [] [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | [] | - kbd | | - ld | [] | - libc | [] [] [] [] [] [] [] [] | - lilypond | [] | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] [] [] [] | - make | [] [] [] [] [] [] | - mysecretdiary | [] | - nano | [] [] [] | - opcodes | | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - sketch | | - soundtracker | [] [] [] | - sp | | - tar | [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] [] [] | - textutils | [] [] [] [] [] [] [] [] | - util-linux | [] [] | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------------------+ - bg cs da de el en eo es et fi fr gl he hr id it ja - 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 + Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | | + ap-utils | | + aspell | [] | + bash | [] [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] [] [] | + console-tools | [] [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | [] () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] [] [] [] | + fslint | | + gas | [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] | + gnubiff | [] | + gnucash | [] () [] [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] | + gpsdrive | () () () | + gramadoir | [] | + grep | [] [] [] [] [] [] | + gretl | [] | + gtick | [] () | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] | + iso_639 | | + jpilot | [] [] [] | + jtag | | + jwhois | [] | + kbd | [] [] [] [] [] | + latrine | () | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | | + sharutils | [] [] [] [] [] [] | + silky | () | + skencil | [] () [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] [] | + tin | () () | + tp-robot | | + tuxpaint | [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] | + xchat | [] [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs da de el en en_GB eo es + 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68 + + et eu fa fi fr ga gl he hr hu id is it ja ko lg + +-------------------------------------------------+ + a2ps | [] [] [] () () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] | + aspell | [] [] | + bash | [] [] | + batchelor | [] [] | + bfd | [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] [] | + clisp | | + clisp | [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | [] | + gawk | [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext | [] [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] | + gnubiff | [] | + gnucash | () [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] [] [] | + gpe-clock | [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () () () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] [] | + gtick | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | | + iso_4217 | [] [] [] [] [] [] | + iso_639 | | + jpilot | [] () | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] | + latrine | [] | + ld | [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] [] [] | + libiconv | [] [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] [] | + man-db | () () | + minicom | [] [] [] [] | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] | + sharutils | [] [] [] [] [] | + silky | () [] () () | + skencil | [] | + sketch | [] | + soundtracker | [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] [] | + tin | [] () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] [] | + +-------------------------------------------------+ + et eu fa fi fr ga gl he hr hu id is it ja ko lg + 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0 + + lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru + +-----------------------------------------------------+ + a2ps | [] [] () () [] [] [] | + aegis | () () () | + ant-phone | [] [] | + anubis | [] [] [] [] [] [] | + ap-utils | [] () [] | + aspell | [] | + bash | [] [] [] | + batchelor | [] | + bfd | [] | + binutils | [] | + bison | [] [] [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] | + console-tools | [] | + coreutils | [] [] | + cpio | [] [] [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] [] [] [] | + e2fsprogs | [] | + enscript | [] [] [] [] | + error | [] [] [] | + fetchmail | [] [] () [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + fslint | [] [] | + gas | | + gawk | [] [] [] | + gbiff | [] [] | + gcal | | + gcc | | + gettext | [] [] [] | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] | + gliv | [] [] [] | + glunarclock | [] [] [] [] | + gnubiff | [] | + gnucash | [] [] () [] | + gnucash-glossary | [] [] | + gnupg | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] | + gprof | [] [] | + gpsdrive | () () [] | + gramadoir | () [] | + grep | [] [] [] [] [] | + gretl | | + gtick | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] | + iso_3166 | [] [] [] | + iso_3166_1 | [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] | + jpilot | () () | + jtag | | + jwhois | [] [] [] [] () | + kbd | [] [] [] | + latrine | [] | + ld | | + libc | [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] [] | + lifelines | | + lilypond | | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] | + minicom | [] [] [] [] | + mysecretdiary | [] [] [] | + nano | [] [] [] [] [] | + nano_1_0 | [] [] [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] [] [] [] | + python | | + radius | [] [] | + recode | [] [] [] [] | + rpm | [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] | + sharutils | [] [] | + silky | () | + skencil | [] [] | + sketch | [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] | + tin | | + tp-robot | [] | + tuxpaint | [] [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] | + vorbis-tools | [] [] [] | + wastesedge | | + wdiff | [] [] [] [] [] | + wget | [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] [] | + +-----------------------------------------------------+ + lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru + 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63 - ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - +----------------------------------------------------+ - a2ps | [] [] [] | 6 - bash | | 4 - bfd | | 0 - binutils | | 1 - bison | [] | 6 - clisp | [] | 5 - cpio | [] [] [] [] [] | 10 - diffutils | [] [] [] [] | 11 - enscript | [] [] [] | 5 - error | [] [] | 4 - fetchmail | | 0 - fileutils | [] [] [] [] [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] [] [] | 16 - flex | [] [] [] | 6 - freetype | | 0 - gas | | 0 - gawk | [] | 3 - gcal | | 0 - gcc | | 0 - gettext | [] [] [] [] [] [] [] [] | 18 - gnupg | [] [] [] | 10 - gprof | | 0 - grep | [] [] [] [] | 12 - hello | [] [] [] [] [] [] [] [] [] [] [] | 22 - id-utils | [] [] [] | 6 - indent | [] [] [] [] [] [] [] | 12 - jpilot | | 1 - kbd | [] | 1 - ld | | 1 - libc | [] [] [] [] [] [] [] [] | 16 - lilypond | [] [] | 3 - lynx | [] [] [] [] | 8 - m4 | [] [] [] [] | 12 - make | [] [] [] [] [] [] | 12 - mysecretdiary | | 1 - nano | [] | 4 - opcodes | [] | 1 - parted | [] [] | 5 - ptx | [] [] [] [] [] [] [] [] | 15 - python | | 0 - recode | [] [] [] [] | 13 - sed | [] [] [] [] [] [] [] | 19 - sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 - sharutils | [] [] [] | 11 - sketch | | 0 - soundtracker | | 3 - sp | | 0 - tar | [] [] [] [] [] [] [] | 15 - texinfo | [] | 7 - textutils | [] [] [] [] [] [] [] [] | 16 - util-linux | [] [] | 4 - wdiff | [] [] [] [] | 7 - wget | [] [] [] [] [] [] [] | 17 - +----------------------------------------------------+ - 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 + sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu + +-----------------------------------------------------+ + a2ps | [] [] [] [] | 16 + aegis | | 0 + ant-phone | | 3 + anubis | [] [] | 9 + ap-utils | () | 3 + aspell | | 4 + bash | | 9 + batchelor | | 3 + bfd | [] [] | 6 + binutils | [] [] [] | 8 + bison | [] [] | 14 + bluez-pin | [] [] [] | 14 + clisp | | 0 + clisp | | 5 + console-tools | | 3 + coreutils | [] [] [] [] | 16 + cpio | [] [] | 14 + darkstat | [] [] [] () () | 12 + diffutils | [] [] [] | 23 + e2fsprogs | [] [] | 6 + enscript | [] [] | 12 + error | [] [] [] | 15 + fetchmail | [] [] | 11 + fileutils | [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] | 29 + flex | [] [] | 13 + fslint | | 3 + gas | [] | 3 + gawk | [] [] | 12 + gbiff | | 4 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] | 16 + gettext-examples | [] [] [] [] [] | 14 + gettext-runtime | [] [] [] [] [] [] [] [] | 22 + gettext-tools | [] [] [] [] [] [] | 14 + gimp-print | [] [] | 10 + gliv | | 3 + glunarclock | [] [] [] | 13 + gnubiff | | 3 + gnucash | [] [] | 9 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 17 + gpe-aerial | [] | 7 + gpe-beam | [] | 8 + gpe-calendar | [] [] [] [] | 13 + gpe-clock | [] [] [] | 10 + gpe-conf | [] [] | 9 + gpe-contacts | [] [] [] | 11 + gpe-edit | [] [] [] [] [] | 12 + gpe-go | | 5 + gpe-login | [] [] [] [] [] | 13 + gpe-ownerinfo | [] [] [] [] | 13 + gpe-sketchbook | [] [] | 9 + gpe-su | [] [] [] | 10 + gpe-taskmanager | [] [] [] | 10 + gpe-timesheet | [] [] [] [] | 12 + gpe-today | [] [] [] [] [] | 13 + gpe-todo | [] [] [] [] | 12 + gphoto2 | [] [] [] | 11 + gprof | [] [] | 9 + gpsdrive | [] [] | 3 + gramadoir | [] | 5 + grep | [] [] [] [] | 26 + gretl | | 3 + gtick | | 7 + hello | [] [] [] [] [] | 34 + id-utils | [] [] | 12 + indent | [] [] [] [] | 21 + iso_3166 | [] [] [] [] [] [] [] | 27 + iso_3166_1 | [] [] [] | 16 + iso_3166_2 | | 0 + iso_3166_3 | | 2 + iso_4217 | [] [] [] [] [] [] | 24 + iso_639 | | 1 + jpilot | [] [] [] [] [] | 9 + jtag | [] | 2 + jwhois | () [] [] | 11 + kbd | [] [] | 11 + latrine | | 2 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | [] [] [] [] | 13 + libiconv | [] [] [] [] [] [] [] [] | 27 + lifelines | [] | 2 + lilypond | [] | 3 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] | 14 + m4 | [] [] | 15 + mailutils | | 5 + make | [] [] [] | 16 + man-db | [] | 5 + minicom | | 11 + mysecretdiary | [] [] | 10 + nano | [] [] [] [] | 17 + nano_1_0 | [] [] [] | 17 + opcodes | [] [] | 6 + parted | [] [] [] | 15 + ptx | [] [] | 22 + python | | 0 + radius | | 4 + recode | [] [] [] | 20 + rpm | [] [] | 9 + screem | [] [] | 2 + scrollkeeper | [] [] [] | 15 + sed | [] [] [] [] [] [] | 24 + sh-utils | [] [] | 14 + shared-mime-info | [] [] | 7 + sharutils | [] [] [] [] | 17 + silky | () | 3 + skencil | [] | 6 + sketch | [] | 6 + soundtracker | [] [] | 7 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] | 14 + textutils | [] [] [] [] | 16 + tin | | 1 + tp-robot | | 2 + tuxpaint | [] [] [] [] [] | 29 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] | 15 + vorbis-tools | | 8 + wastesedge | | 0 + wdiff | [] [] [] | 18 + wget | [] [] [] [] [] [] [] [] | 24 + xchat | [] [] [] [] [] | 15 + xfree86_xkb_xml | [] [] [] [] [] | 11 + xpad | | 5 + +-----------------------------------------------------+ + 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu + 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373 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 @@ -298,15 +743,15 @@ distributed as such by its maintainer. lag between the mere existence a PO file and its wide availability in a distribution. - If September 2001 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 + If January 2004 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'. Using `gettext' in new packages =============================== - If you are writing a freely available program and want to +If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your package. Of course you have to respect the GNU Library General Public License which covers the use of the GNU `gettext' library. This means @@ -315,7 +760,7 @@ library, whereas only free software can library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact diff -urpP gnupg-1.2.5/ChangeLog gnupg-1.2.6/ChangeLog --- gnupg-1.2.5/ChangeLog 2004-07-26 12:24:28.000000000 +0000 +++ gnupg-1.2.6/ChangeLog 2004-08-25 14:47:42.000000000 +0000 @@ -1,3 +1,30 @@ +2004-08-25 Werner Koch + + Released 1.2.6. + +2004-08-13 Werner Koch + + Releases 1.2.6rc1. + +2004-08-10 David Shaw + + * NEWS: Minor tweak to news to clarify that --enable-key-cache is + a build-time option. + +2004-08-09 Werner Koch + + * configure.ac (ALL_LINGUAS): Removed. + +2004-08-09 gettextize + + * Makefile.am (SUBDIRS): Add m4. + (ACLOCAL_AMFLAGS): New variable. + * configure.ac (AC_CONFIG_FILES): Add m4/Makefile. + +2004-08-03 David Shaw + + * configure.ac: Give warning when using capabilities. + 2004-07-26 Werner Koch Released 1.2.5. diff -urpP gnupg-1.2.5/Makefile.am gnupg-1.2.6/Makefile.am --- gnupg-1.2.5/Makefile.am 2003-04-08 08:36:08.000000000 +0000 +++ gnupg-1.2.6/Makefile.am 2004-08-09 18:56:32.000000000 +0000 @@ -25,7 +25,7 @@ else checks = checks endif -SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc ${checks} +SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks} EXTRA_DIST = PROJECTS BUGS config.h.in autogen.sh DISTCLEANFILES = g10defs.h @@ -53,3 +53,5 @@ dist-hook: + +ACLOCAL_AMFLAGS = -I m4 diff -urpP gnupg-1.2.5/Makefile.in gnupg-1.2.6/Makefile.in --- gnupg-1.2.5/Makefile.in 2004-07-26 12:25:31.000000000 +0000 +++ gnupg-1.2.6/Makefile.in 2004-08-25 14:48:18.000000000 +0000 @@ -210,9 +210,11 @@ target_vendor = @target_vendor@ @CROSS_COMPILING_TRUE@checks = @CROSS_COMPILING_FALSE@checks = checks -SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc ${checks} +SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks} EXTRA_DIST = PROJECTS BUGS config.h.in autogen.sh DISTCLEANFILES = g10defs.h + +ACLOCAL_AMFLAGS = -I m4 subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -231,7 +233,7 @@ DIST_COMMON = README $(srcdir)/Makefile. configure.ac scripts/ChangeLog scripts/config.guess \ scripts/config.rpath scripts/config.sub scripts/depcomp \ scripts/install-sh scripts/missing scripts/mkinstalldirs -DIST_SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc \ +DIST_SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc \ checks all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -251,7 +253,7 @@ $(top_builddir)/config.status: $(srcdir) $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4 m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 diff -urpP gnupg-1.2.5/NEWS gnupg-1.2.6/NEWS --- gnupg-1.2.5/NEWS 2004-07-26 12:23:59.000000000 +0000 +++ gnupg-1.2.6/NEWS 2004-08-25 14:47:13.000000000 +0000 @@ -1,3 +1,12 @@ +Noteworthy changes in version 1.2.6 (2004-08-25) +------------------------------------------------ + + * Updated the included gettext. This also fixes the installation + problem from 1.2.5 + + * Fixed a race condition possibly leading to deleted keys. + + Noteworthy changes in version 1.2.5 (2004-07-26) ------------------------------------------------ @@ -21,8 +30,9 @@ Noteworthy changes in version 1.2.5 (200 * New --gpgconf-list command for internal use by the gpgconf utility from gnupg 1.9.x. - * Some performance improvements with large keyrings. See - --enable-key-cache=SIZE in the README file for details. + * Some performance improvements with large keyrings. See the + build time option --enable-key-cache=SIZE in the README file for + details. * Some portability fixes for the OpenBSD/i386, HPPA, and AIX platforms. diff -urpP gnupg-1.2.5/README gnupg-1.2.6/README --- gnupg-1.2.5/README 2004-03-29 13:23:28.000000000 +0000 +++ gnupg-1.2.6/README 2004-08-10 18:23:25.000000000 +0000 @@ -1,7 +1,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 1.2.5 + Version 1.2.6 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff -urpP gnupg-1.2.5/THANKS gnupg-1.2.6/THANKS --- gnupg-1.2.5/THANKS 2004-07-20 11:35:44.000000000 +0000 +++ gnupg-1.2.6/THANKS 2004-08-13 16:24:24.000000000 +0000 @@ -185,6 +185,7 @@ Serge Munhoven munhoven@mema.ucl.ac. SL Baur steve@xemacs.org Stefan Bellon sbellon@sbellon.de Dr.Stefan.Dalibor Dr.Stefan.Dalibor@bfa.de +Stefan Haller Stefan.Haller@ascom.ch Stefan Karrmann S.Karrmann@gmx.net Stefan Keller dres@cs.tu-berlin.de Steffen Ullrich ccrlphr@xensei.com diff -urpP gnupg-1.2.5/aclocal.m4 gnupg-1.2.6/aclocal.m4 diff -urpP gnupg-1.2.5/aclocal.m4 gnupg-1.2.6/aclocal.m4 --- gnupg-1.2.5/aclocal.m4 2004-07-26 12:25:23.000000000 +0000 +++ gnupg-1.2.6/aclocal.m4 2004-08-25 14:48:09.000000000 +0000 @@ -2156,7 +2156,7 @@ AC_DEFUN([gt_CHECK_DECL], dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) -# po.m4 serial 2 (gettext-0.13) +# po.m4 serial 3 (gettext-0.14) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -2481,6 +2481,8 @@ changequote([,])dnl # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) # Compute MSGFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) + # Compute RESOURCESDLLFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) case "$ac_given_srcdir" in .) srcdirpre= ;; *) srcdirpre='$(srcdir)/' ;; @@ -2493,6 +2495,7 @@ changequote([,])dnl CLASSFILES= QMFILES= MSGFILES= + RESOURCESDLLFILES= for lang in $ALL_LINGUAS; do POFILES="$POFILES $srcdirpre$lang.po" UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" @@ -2503,6 +2506,8 @@ changequote([,])dnl QMFILES="$QMFILES $srcdirpre$lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" + frobbedlang=`echo $lang | sed -e 's/_/-/g'` + RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. @@ -2534,6 +2539,7 @@ changequote([,])dnl JAVACATALOGS= QTCATALOGS= TCLCATALOGS= + CSHARPCATALOGS= if test -n "$INST_LINGUAS"; then for lang in $INST_LINGUAS; do CATALOGS="$CATALOGS $lang.gmo" @@ -2541,10 +2547,12 @@ changequote([,])dnl QTCATALOGS="$QTCATALOGS $lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" + frobbedlang=`echo $lang | sed -e 's/_/-/g'` + CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" done fi - sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do @@ -2556,6 +2564,17 @@ $frobbedlang.msg: $lang.po EOF done fi + if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/_/-/g'` + cat >> "$ac_file.tmp" <> "$ac_file.tmp" <. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gnupg' PACKAGE_TARNAME='gnupg' -PACKAGE_VERSION='1.2.5' -PACKAGE_STRING='gnupg 1.2.5' +PACKAGE_VERSION='1.2.6' +PACKAGE_STRING='gnupg 1.2.6' PACKAGE_BUGREPORT='bug-gnupg@gnu.org' ac_unique_file="g10/g10.c" @@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnupg 1.2.5 to adapt to many kinds of systems. +\`configure' configures gnupg 1.2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -847,7 +847,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnupg 1.2.5:";; + short | recursive ) echo "Configuration of gnupg 1.2.6:";; esac cat <<\_ACEOF @@ -1004,7 +1004,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -gnupg configure 1.2.5 +gnupg configure 1.2.6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1018,7 +1018,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnupg $as_me 1.2.5, which was +It was created by gnupg $as_me 1.2.6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1359,8 +1359,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # sufficient. development_version=no -ALL_LINGUAS="be ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro ru sk sv tr zh_TW zh_CN" - ac_aux_dir= for ac_dir in scripts $srcdir/scripts; do if test -f $ac_dir/install-sh; then @@ -1719,7 +1717,7 @@ fi # Define the identity of the package. PACKAGE='gnupg' - VERSION='1.2.5' + VERSION='1.2.6' cat >>confdefs.h <<_ACEOF @@ -18525,6 +18523,16 @@ fi if test "$use_capabilities" = "yes" ; then + +{ echo "$as_me:$LINENO: WARNING: +*** +*** WARNING: using capabilities with GnuPG is experimental code! +***" >&5 +echo "$as_me: WARNING: +*** +*** WARNING: using capabilities with GnuPG is experimental code! +***" >&2;} + use_capabilities=no for ac_header in sys/capability.h @@ -19770,7 +19778,7 @@ fi - ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in util/Makefile mpi/Makefile cipher/Makefile g10/Makefile keyserver/Makefile keyserver/gpgkeys_mailto keyserver/gpgkeys_test doc/Makefile tools/Makefile zlib/Makefile checks/Makefile" + ac_config_files="$ac_config_files Makefile m4/Makefile intl/Makefile po/Makefile.in util/Makefile mpi/Makefile cipher/Makefile g10/Makefile keyserver/Makefile keyserver/gpgkeys_mailto keyserver/gpgkeys_test doc/Makefile tools/Makefile zlib/Makefile checks/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20211,7 +20219,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by gnupg $as_me 1.2.5, which was +This file was extended by gnupg $as_me 1.2.6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20277,7 +20285,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gnupg config.status 1.2.5 +gnupg config.status 1.2.6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -20403,6 +20411,7 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; diff -urpP gnupg-1.2.5/configure.ac gnupg-1.2.6/configure.ac --- gnupg-1.2.5/configure.ac 2004-07-26 12:18:06.000000000 +0000 +++ gnupg-1.2.6/configure.ac 2004-08-25 14:43:15.000000000 +0000 @@ -19,20 +19,18 @@ dnl along with this program; if not, wri dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.25.2.56 $)dnl +dnlAC_REVISION($Revision: 1.25.2.61 $)dnl AC_PREREQ(2.52) # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.2.5, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.2.6, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. development_version=no -ALL_LINGUAS="be ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro ru sk sv tr zh_TW zh_CN" - AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_SRCDIR(g10/g10.c) AC_CANONICAL_TARGET() @@ -687,6 +685,12 @@ dnl dnl Check whether we can use Linux capabilities as requested dnl if test "$use_capabilities" = "yes" ; then + +AC_MSG_WARN([[ +*** +*** WARNING: using capabilities with GnuPG is experimental code! +***]]) + use_capabilities=no AC_CHECK_HEADERS(sys/capability.h) if test "$ac_cv_header_sys_capability_h" = "yes" ; then @@ -1012,6 +1016,7 @@ DATADIRNAME=$DATADIRNAME AC_CONFIG_FILES([ Makefile +m4/Makefile intl/Makefile po/Makefile.in util/Makefile diff -urpP gnupg-1.2.5/doc/ChangeLog gnupg-1.2.6/doc/ChangeLog --- gnupg-1.2.5/doc/ChangeLog 2004-07-20 11:29:13.000000000 +0000 +++ gnupg-1.2.6/doc/ChangeLog 2004-08-09 15:24:01.000000000 +0000 @@ -1,3 +1,13 @@ +2004-08-03 David Shaw + + * gpg.sgml: Note that --throw-keyid is --throw-keyids. + +2004-07-30 David Shaw + + * gpg.sgml: Note changes in --pgp8. Rephrase the "don't play + algorithm games" warning now that PGP has blowfish, zlib, and + bzip2. + 2004-06-18 David Shaw * DETAILS: Document PLAINTEXT and PLAINTEXT_LENGTH. diff -urpP gnupg-1.2.5/doc/gpg.1 gnupg-1.2.6/doc/gpg.1 --- gnupg-1.2.5/doc/gpg.1 2004-07-20 12:26:50.000000000 +0000 +++ gnupg-1.2.6/doc/gpg.1 2004-08-09 19:23:46.000000000 +0000 @@ -988,11 +988,11 @@ If GnuPG feels that its information abou updated, it automatically runs the --check-trustdb command internally. This may be a time consuming process. --no-auto-check-trustdb disables this option. -.IP "--throw-keyid" 10 -Do not put the keyid into encrypted packets. This option -hides the receiver of the message and is a countermeasure -against traffic analysis. It may slow down the decryption -process because all available secret keys are tried. +.IP "--throw-keyids" 10 +Do not put the recipient keyid into encrypted packets. This option +hides the receiver of the message and is a countermeasure against +traffic analysis. It may slow down the decryption process because all +available secret keys are tried. .IP "--not-dash-escaped" 10 This option changes the behavior of cleartext signatures so that they can be used for patch files. You should not @@ -1069,7 +1069,7 @@ Set up all options to be as PGP 6 compli restricts you to the ciphers IDEA (if the IDEA plugin is installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the compression algorithms none and ZIP. This also disables ---throw-keyid, and making signatures with signing subkeys as PGP 6 +--throw-keyids, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. .IP "" 10 This option implies `--disable-mdc --no-sk-comment --escape-from-lines @@ -1082,9 +1082,8 @@ TWOFISH. .IP "--pgp8" 10 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot closer to the OpenPGP standard than previous versions of PGP, so -all this does is disable --throw-keyid and set --escape-from-lines. -The allowed algorithms list is the same as --pgp7 with the addition of -the SHA-256 digest algorithm. +all this does is disable --throw-keyids and set --escape-from-lines. +All algorithms are allowed except for the SHA384 and SHA512 digests. .RE .IP "--force-v3-sigs" 10 .IP "--no-force-v3-sigs" 10 @@ -1266,10 +1265,11 @@ Don't insert new keys into the keyrings .IP "--allow-secret-key-import" 10 This is an obsolete option and is not used anywhere. .IP "--try-all-secrets" 10 -Don't look at the key ID as stored in the message but try all secret keys in -turn to find the right decryption key. This option forces the behaviour as -used by anonymous recipients (created by using --throw-keyid) and might come -handy in case where an encrypted message contains a bogus key ID. +Don't look at the key ID as stored in the message but try all secret +keys in turn to find the right decryption key. This option forces the +behaviour as used by anonymous recipients (created by using +--throw-keyids) and might come handy in case where an encrypted +message contains a bogus key ID. .IP "--enable-special-filenames" 10 This options enables a mode in which filenames of the form \fB-&n\fP, where n is a non-negative decimal number, @@ -1445,13 +1445,13 @@ Keep in mind that, if this program is us is *very* easy to spy out your passphrase! .PP If you are going to verify detached signatures, make sure that the -program knows about it; either be giving both filenames on the -command line or using \fB-\fP to specify stdin. +program knows about it; either give both filenames on the command line +or use \fB-\fP to specify stdin. .SH "INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS" .PP GnuPG tries to be a very flexible implementation of the OpenPGP -standard. In particular, GnuPG implements many of the "optional" -parts of the standard, such as the RIPEMD/160 hash, and the ZLIB +standard. In particular, GnuPG implements many of the optional parts +of the standard, such as the SHA-512 hash, and the ZLIB and BZIP2 compression algorithms. It is important to be aware that not all OpenPGP programs implement these optional algorithms and that by forcing their use via the --cipher-algo, --digest-algo, @@ -1459,14 +1459,15 @@ forcing their use via the --cipher-algo, possible to create a perfectly valid OpenPGP message, but one that cannot be read by the intended recipient. .PP -For example, as of this writing, no (unhacked) version of PGP supports -the BLOWFISH cipher algorithm. If you use it, no PGP user will be -able to decrypt your message. The same thing applies to the ZLIB -compression algorithm. By default, GnuPG uses the standard OpenPGP -preferences system that will always do the right thing and create -messages that are usable by all recipients, regardless of which -OpenPGP program they use. Only override this safe default if you know -what you are doing. +There are dozens of variations of OpenPGP programs available, and each +supports a slightly different subset of these optional algorithms. +For example, until recently, no (unhacked) version of PGP supported +the BLOWFISH cipher algorithm. A message using BLOWFISH simply could +not be read by a PGP user. By default, GnuPG uses the standard +OpenPGP preferences system that will always do the right thing and +create messages that are usable by all recipients, regardless of which +OpenPGP program they use. Only override this safe default if you +really know what you are doing. .PP If you absolutely must override the safe default, or if the preferences on a given key are invalid for some reason, you are far @@ -1483,4 +1484,4 @@ passphrases or other sensitive material) warning message about insecure memory your operating system supports locking without being root. The program drops root privileges as soon as locked memory is allocated. -.\" created by instant / docbook-to-man, Tue 20 Jul 2004, 14:26 +.\" created by instant / docbook-to-man, Mon 09 Aug 2004, 21:23 diff -urpP gnupg-1.2.5/doc/gpg.sgml gnupg-1.2.6/doc/gpg.sgml --- gnupg-1.2.5/doc/gpg.sgml 2004-07-20 11:29:14.000000000 +0000 +++ gnupg-1.2.6/doc/gpg.sgml 2004-08-09 15:24:01.000000000 +0000 @@ -1757,15 +1757,14 @@ disables this option. ---throw-keyid +--throw-keyids -Do not put the keyid into encrypted packets. This option -hides the receiver of the message and is a countermeasure -against traffic analysis. It may slow down the decryption -process because all available secret keys are tried. +Do not put the recipient keyid into encrypted packets. This option +hides the receiver of the message and is a countermeasure against +traffic analysis. It may slow down the decryption process because all +available secret keys are tried. - --not-dash-escaped @@ -1778,7 +1777,6 @@ line, patch files don't have this. A spe line tells GnuPG about this cleartext signature option. - --escape-from-lines --no-escape-from-lines @@ -1894,7 +1892,7 @@ Set up all options to be as PGP 6 compli restricts you to the ciphers IDEA (if the IDEA plugin is installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the compression algorithms none and ZIP. This also disables ---throw-keyid, and making signatures with signing subkeys as PGP 6 +--throw-keyids, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. This option implies `--disable-mdc --no-sk-comment --escape-from-lines @@ -1915,9 +1913,8 @@ TWOFISH. Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot closer to the OpenPGP standard than previous versions of PGP, so -all this does is disable --throw-keyid and set --escape-from-lines. -The allowed algorithms list is the same as --pgp7 with the addition of -the SHA-256 digest algorithm. +all this does is disable --throw-keyids and set --escape-from-lines. +All algorithms are allowed except for the SHA384 and SHA512 digests. @@ -2262,10 +2259,11 @@ This is an obsolete option and is not us --try-all-secrets -Don't look at the key ID as stored in the message but try all secret keys in -turn to find the right decryption key. This option forces the behaviour as -used by anonymous recipients (created by using --throw-keyid) and might come -handy in case where an encrypted message contains a bogus key ID. +Don't look at the key ID as stored in the message but try all secret +keys in turn to find the right decryption key. This option forces the +behaviour as used by anonymous recipients (created by using +--throw-keyids) and might come handy in case where an encrypted +message contains a bogus key ID. @@ -2628,8 +2626,8 @@ is *very* easy to spy out your passphras If you are going to verify detached signatures, make sure that the -program knows about it; either be giving both filenames on the -command line or using - to specify stdin. +program knows about it; either give both filenames on the command line +or use - to specify stdin. @@ -2637,8 +2635,8 @@ command line or using -INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS GnuPG tries to be a very flexible implementation of the OpenPGP -standard. In particular, GnuPG implements many of the "optional" -parts of the standard, such as the RIPEMD/160 hash, and the ZLIB +standard. In particular, GnuPG implements many of the optional parts +of the standard, such as the SHA-512 hash, and the ZLIB and BZIP2 compression algorithms. It is important to be aware that not all OpenPGP programs implement these optional algorithms and that by forcing their use via the --cipher-algo, --digest-algo, @@ -2648,14 +2646,15 @@ cannot be read by the intended recipient -For example, as of this writing, no (unhacked) version of PGP supports -the BLOWFISH cipher algorithm. If you use it, no PGP user will be -able to decrypt your message. The same thing applies to the ZLIB -compression algorithm. By default, GnuPG uses the standard OpenPGP -preferences system that will always do the right thing and create -messages that are usable by all recipients, regardless of which -OpenPGP program they use. Only override this safe default if you know -what you are doing. +There are dozens of variations of OpenPGP programs available, and each +supports a slightly different subset of these optional algorithms. +For example, until recently, no (unhacked) version of PGP supported +the BLOWFISH cipher algorithm. A message using BLOWFISH simply could +not be read by a PGP user. By default, GnuPG uses the standard +OpenPGP preferences system that will always do the right thing and +create messages that are usable by all recipients, regardless of which +OpenPGP program they use. Only override this safe default if you +really know what you are doing. diff -urpP gnupg-1.2.5/doc/gpg.texi gnupg-1.2.6/doc/gpg.texi --- gnupg-1.2.5/doc/gpg.texi 2004-07-20 17:26:28.000000000 +0000 +++ gnupg-1.2.6/doc/gpg.texi 2004-08-13 16:40:20.000000000 +0000 @@ -1144,11 +1144,11 @@ updated, it automatically runs the ---ch This may be a time consuming process. ---no-auto-check-trustdb disables this option. -@item ---throw-keyid -Do not put the keyid into encrypted packets. This option -hides the receiver of the message and is a countermeasure -against traffic analysis. It may slow down the decryption -process because all available secret keys are tried. +@item ---throw-keyids +Do not put the recipient keyid into encrypted packets. This option +hides the receiver of the message and is a countermeasure against +traffic analysis. It may slow down the decryption process because all +available secret keys are tried. @item ---not-dash-escaped This option changes the behavior of cleartext signatures @@ -1238,7 +1238,7 @@ Set up all options to be as PGP 6 compli restricts you to the ciphers IDEA (if the IDEA plugin is installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the compression algorithms none and ZIP. This also disables ----throw-keyid, and making signatures with signing subkeys as PGP 6 +---throw-keyids, and making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. This option implies `---disable-mdc --no-sk-comment --escape-from-lines @@ -1253,9 +1253,8 @@ TWOFISH. @item ---pgp8 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a lot closer to the OpenPGP standard than previous versions of PGP, so -all this does is disable ---throw-keyid and set --escape-from-lines. -The allowed algorithms list is the same as ---pgp7 with the addition of -the SHA-256 digest algorithm. +all this does is disable ---throw-keyids and set --escape-from-lines. +All algorithms are allowed except for the SHA384 and SHA512 digests. @end table @@ -1477,10 +1476,11 @@ Don't insert new keys into the keyrings This is an obsolete option and is not used anywhere. @item ---try-all-secrets -Don't look at the key ID as stored in the message but try all secret keys in -turn to find the right decryption key. This option forces the behaviour as -used by anonymous recipients (created by using ---throw-keyid) and might come -handy in case where an encrypted message contains a bogus key ID. +Don't look at the key ID as stored in the message but try all secret +keys in turn to find the right decryption key. This option forces the +behaviour as used by anonymous recipients (created by using +---throw-keyids) and might come handy in case where an encrypted +message contains a bogus key ID. @item ---enable-special-filenames This options enables a mode in which filenames of the form @@ -1707,13 +1707,13 @@ Keep in mind that, if this program is us is *very* easy to spy out your passphrase! If you are going to verify detached signatures, make sure that the -program knows about it; either be giving both filenames on the -command line or using @samp{-} to specify stdin. +program knows about it; either give both filenames on the command line +or use @samp{-} to specify stdin. @majorheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS GnuPG tries to be a very flexible implementation of the OpenPGP -standard. In particular, GnuPG implements many of the "optional" -parts of the standard, such as the RIPEMD/160 hash, and the ZLIB +standard. In particular, GnuPG implements many of the optional parts +of the standard, such as the SHA-512 hash, and the ZLIB and BZIP2 compression algorithms. It is important to be aware that not all OpenPGP programs implement these optional algorithms and that by forcing their use via the ---cipher-algo, --digest-algo, @@ -1721,14 +1721,15 @@ forcing their use via the ---cipher-algo possible to create a perfectly valid OpenPGP message, but one that cannot be read by the intended recipient. -For example, as of this writing, no (unhacked) version of PGP supports -the BLOWFISH cipher algorithm. If you use it, no PGP user will be -able to decrypt your message. The same thing applies to the ZLIB -compression algorithm. By default, GnuPG uses the standard OpenPGP -preferences system that will always do the right thing and create -messages that are usable by all recipients, regardless of which -OpenPGP program they use. Only override this safe default if you know -what you are doing. +There are dozens of variations of OpenPGP programs available, and each +supports a slightly different subset of these optional algorithms. +For example, until recently, no (unhacked) version of PGP supported +the BLOWFISH cipher algorithm. A message using BLOWFISH simply could +not be read by a PGP user. By default, GnuPG uses the standard +OpenPGP preferences system that will always do the right thing and +create messages that are usable by all recipients, regardless of which +OpenPGP program they use. Only override this safe default if you +really know what you are doing. If you absolutely must override the safe default, or if the preferences on a given key are invalid for some reason, you are far diff -urpP gnupg-1.2.5/g10/ChangeLog gnupg-1.2.6/g10/ChangeLog --- gnupg-1.2.5/g10/ChangeLog 2004-07-21 07:59:44.000000000 +0000 +++ gnupg-1.2.6/g10/ChangeLog 2004-08-25 14:44:52.000000000 +0000 @@ -1,3 +1,62 @@ +2004-08-20 David Shaw + + * hkp.c (dehtmlize): Understand the quote character + (i.e. """) in HTML responses. + + * keydb.h, getkey.c (get_user_id_printable): Rename to + get_user_id_native and remove the printable stuff since we're + print-ifying valid utf8 characters. Change all callers in + import.c, sign.c, and encode.c. + +2004-08-19 David Shaw + + * hkp.c (hkp_search): Translate string to search for from utf8 to + native before displaying it. + + * keyserver.c (keyserver_search_prompt): Comments. + +2004-08-19 Werner Koch + + * seskey.c (encode_session_key): Changed the zero random byte + substituting code to actually do clever things. Thanks to + Matthias Urlichs for noting the implementation problem. + +2004-08-18 Werner Koch + + * passphrase.c (agent_get_passphrase): Fixed detection of canceled + error state as send by current gpg-agents. + +2004-08-16 Werner Koch + + * gpgv.c: Removed stray semicolon. + +2004-08-11 Werner Koch + + * gpgv.c (destroy_dotlock): New stub. + + * keydb.c (keydb_add_resource): Factored keyring creation out to .. + (maybe_create_keyring): .. new. Make sure that we do the checks + in a locked state. Problem reported by Stefan Haller. + +2004-08-09 Werner Koch + + * Makefile.am (LDADD): Replaced INTLLIBS by LIBINTL. + +2004-08-02 Werner Koch + + * g10.c (main): Extra paranoid check to make sure we are not + running setuid anymore. + +2004-07-30 Werner Koch + + * g10.c: New alias --throw-keyid for --throw-keyids, so that it + continues to work in old configuration files. Noted by Jens Adam. + +2004-07-29 David Shaw + + * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, + and bzip2. + 2004-07-20 David Shaw * status.c (do_get_from_fd): Flush stdout if status isn't flushing diff -urpP gnupg-1.2.5/g10/Makefile.am gnupg-1.2.6/g10/Makefile.am --- gnupg-1.2.5/g10/Makefile.am 2003-12-03 10:10:15.000000000 +0000 +++ gnupg-1.2.6/g10/Makefile.am 2004-08-09 16:34:10.000000000 +0000 @@ -114,7 +114,7 @@ gpgv_SOURCES = gpgv.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ +LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ diff -urpP gnupg-1.2.5/g10/Makefile.in gnupg-1.2.6/g10/Makefile.in --- gnupg-1.2.5/g10/Makefile.in 2004-07-26 12:26:30.000000000 +0000 +++ gnupg-1.2.6/g10/Makefile.in 2004-08-25 14:48:19.000000000 +0000 @@ -299,7 +299,7 @@ gpgv_SOURCES = gpgv.c \ # ks-db.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ +LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ subdir = g10 diff -urpP gnupg-1.2.5/g10/encode.c gnupg-1.2.6/g10/encode.c --- gnupg-1.2.5/g10/encode.c 2004-03-01 20:02:42.000000000 +0000 +++ gnupg-1.2.6/g10/encode.c 2004-08-25 14:44:53.000000000 +0000 @@ -740,7 +740,7 @@ write_pubkey_enc_from_list( PK_LIST pk_l log_error("pubkey_encrypt failed: %s\n", g10_errstr(rc) ); else { if( opt.verbose ) { - char *ustr = get_user_id_string_printable (enc->keyid); + char *ustr = get_user_id_string_native (enc->keyid); log_info(_("%s/%s encrypted for: \"%s\"\n"), pubkey_algo_to_string(enc->pubkey_algo), cipher_algo_to_string(dek->algo), ustr ); diff -urpP gnupg-1.2.5/g10/g10.c gnupg-1.2.6/g10/g10.c --- gnupg-1.2.5/g10/g10.c 2004-06-16 09:37:49.000000000 +0000 +++ gnupg-1.2.6/g10/g10.c 2004-08-02 08:16:19.000000000 +0000 @@ -485,6 +485,7 @@ static ARGPARSE_OPTS opts[] = { { oCertDigestAlgo, "cert-digest-algo", 2 , "@" }, { oCompressAlgo, "compress-algo", 1 , N_("|N|use compress algorithm N")}, { oThrowKeyid, "throw-keyids", 0, N_("throw keyid field of encrypted packets")}, + { oThrowKeyid, "throw-keyid", 0, "@" }, { oShowPhotos, "show-photos", 0, N_("Show Photo IDs")}, { oNoShowPhotos, "no-show-photos", 0, N_("Don't show Photo IDs")}, { oPhotoViewer, "photo-viewer", 2, N_("Set command line to view Photo IDs")}, @@ -1425,6 +1426,13 @@ main( int argc, char **argv ) maybe_setuid = 0; /* Okay, we are now working under our real uid */ +#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) + /* There should be no way to get to this spot while still carrying + setuid privs. Just in case, bomb out if we are. */ + if(getuid()!=geteuid()) + BUG(); +#endif + set_native_charset (NULL); /* Try to auto set the character set */ if( default_config ) diff -urpP gnupg-1.2.5/g10/getkey.c gnupg-1.2.6/g10/getkey.c --- gnupg-1.2.5/g10/getkey.c 2004-05-01 09:19:03.000000000 +0000 +++ gnupg-1.2.6/g10/getkey.c 2004-08-25 14:44:53.000000000 +0000 @@ -1,5 +1,5 @@ /* getkey.c - Get a key from the database - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. @@ -2611,14 +2611,12 @@ get_user_id_string( u32 *keyid ) char* -get_user_id_string_printable ( u32 *keyid ) +get_user_id_string_native ( u32 *keyid ) { - char *p = get_user_id_string( keyid ); - char *p2 = utf8_to_native( p, strlen(p), 0 ); - m_free(p); - p = make_printable_string (p2, strlen (p2), 0); - m_free (p2); - return p; + char *p = get_user_id_string( keyid ); + char *p2 = utf8_to_native( p, strlen(p), 0 ); + m_free(p); + return p2; } @@ -2675,15 +2673,13 @@ get_user_id( u32 *keyid, size_t *rn ) } char* -get_user_id_printable( u32 *keyid ) +get_user_id_native( u32 *keyid ) { - size_t rn; - char *p = get_user_id( keyid, &rn ); - char *p2 = utf8_to_native( p, rn, 0 ); - m_free(p); - p = make_printable_string (p2, strlen (p2), 0); - m_free (p2); - return p; + size_t rn; + char *p = get_user_id( keyid, &rn ); + char *p2 = utf8_to_native( p, rn, 0 ); + m_free(p); + return p2; } KEYDB_HANDLE diff -urpP gnupg-1.2.5/g10/gpgv.c gnupg-1.2.6/g10/gpgv.c --- gnupg-1.2.5/g10/gpgv.c 2003-10-03 12:50:30.000000000 +0000 +++ gnupg-1.2.6/g10/gpgv.c 2004-08-16 08:24:52.000000000 +0000 @@ -390,6 +390,7 @@ int tty_no_terminal(int onoff) {return 0 /* We do not do any locking, so use these stubs here */ void disable_dotlock(void) {} DOTLOCK create_dotlock( const char *file_to_lock ) { return NULL; } +void destroy_dotlock (DOTLOCK h) {} int make_dotlock( DOTLOCK h, long timeout ) { return 0;} int release_dotlock( DOTLOCK h ) {return 0;} void remove_lockfiles(void) {} diff -urpP gnupg-1.2.5/g10/hkp.c gnupg-1.2.6/g10/hkp.c --- gnupg-1.2.5/g10/hkp.c 2004-01-13 11:09:10.000000000 +0000 +++ gnupg-1.2.6/g10/hkp.c 2004-08-25 14:44:53.000000000 +0000 @@ -1,5 +1,6 @@ /* hkp.c - Horowitz Keyserver Protocol - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -309,6 +310,16 @@ dehtmlize(char *line) line+=5; break; } + else if((*(line+1)!='\0' && ascii_tolower(*(line+1))=='q') && + (*(line+2)!='\0' && ascii_tolower(*(line+2))=='u') && + (*(line+3)!='\0' && ascii_tolower(*(line+3))=='o') && + (*(line+4)!='\0' && ascii_tolower(*(line+4))=='t') && + (*(line+5)!='\0' && *(line+5)==';')) + { + parsed[parsedindex++]='"'; + line+=6; + break; + } default: parsed[parsedindex++]=*line; @@ -486,11 +497,9 @@ int hkp_search(STRLIST tokens) { int rc=0,len=0,max,first=1; #ifndef __riscos__ - unsigned char *searchstr=NULL,*searchurl; - unsigned char *request; + unsigned char *searchstr=NULL,*searchstr_printable,*searchurl,*request; #else - char *searchstr=NULL,*searchurl; - char *request; + char *searchstr=NULL,*searchstr_printable,*searchurl,*request; #endif struct http_context hd; unsigned int hflags=opt.keyserver_options.honor_http_proxy?HTTP_FLAG_TRY_PROXY:0; @@ -520,8 +529,10 @@ int hkp_search(STRLIST tokens) searchstr[len-1]='\0'; + searchstr_printable=utf8_to_native(searchstr,len-1,0); + log_info(_("searching for \"%s\" from HKP server %s\n"), - searchstr,opt.keyserver_host); + searchstr_printable,opt.keyserver_host); /* Now make it url-ish */ @@ -616,7 +627,7 @@ int hkp_search(STRLIST tokens) count--; if(ret>-1) - keyserver_search_prompt(buffer,count,searchstr); + keyserver_search_prompt(buffer,count,searchstr_printable); iobuf_close(buffer); m_free(line); @@ -625,6 +636,7 @@ int hkp_search(STRLIST tokens) m_free(request); m_free(searchurl); m_free(searchstr); + m_free(searchstr_printable); return rc; } diff -urpP gnupg-1.2.5/g10/import.c gnupg-1.2.6/g10/import.c --- gnupg-1.2.5/g10/import.c 2004-03-29 13:23:30.000000000 +0000 +++ gnupg-1.2.6/g10/import.c 2004-08-25 14:44:53.000000000 +0000 @@ -658,7 +658,7 @@ import_one( const char *fname, KBNODE ke /* we are ready */ if( !opt.quiet ) { - char *p=get_user_id_printable (keyid); + char *p=get_user_id_native (keyid); log_info( _("key %08lX: public key \"%s\" imported\n"), (ulong)keyid[1],p); m_free(p); @@ -734,7 +734,7 @@ import_one( const char *fname, KBNODE ke /* we are ready */ if( !opt.quiet ) { - char *p=get_user_id_printable(keyid); + char *p=get_user_id_native(keyid); if( n_uids == 1 ) log_info( _("key %08lX: \"%s\" 1 new user ID\n"), (ulong)keyid[1], p); @@ -769,7 +769,7 @@ import_one( const char *fname, KBNODE ke print_import_ok (pk, NULL, 0); if( !opt.quiet ) { - char *p=get_user_id_printable(keyid); + char *p=get_user_id_native(keyid); log_info( _("key %08lX: \"%s\" not changed\n"), (ulong)keyid[1],p); m_free(p); @@ -974,7 +974,7 @@ import_revoke_cert( const char *fname, K keydb_release (hd); hd = NULL; /* we are ready */ if( !opt.quiet ) { - char *p=get_user_id_printable (keyid); + char *p=get_user_id_native (keyid); log_info( _("key %08lX: \"%s\" revocation certificate imported\n"), (ulong)keyid[1],p); m_free(p); @@ -1502,7 +1502,7 @@ merge_blocks( const char *fname, KBNODE ++*n_sigs; if(!opt.quiet) { - char *p=get_user_id_printable (keyid); + char *p=get_user_id_native (keyid); log_info(_("key %08lX: \"%s\" revocation " "certificate added\n"), (ulong)keyid[1],p); m_free(p); diff -urpP gnupg-1.2.5/g10/keydb.c gnupg-1.2.6/g10/keydb.c --- gnupg-1.2.5/g10/keydb.c 2003-06-07 18:55:21.000000000 +0000 +++ gnupg-1.2.6/g10/keydb.c 2004-08-11 16:20:40.000000000 +0000 @@ -1,5 +1,5 @@ /* keydb.c - key database dispatcher - * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -69,6 +69,111 @@ static int lock_all (KEYDB_HANDLE hd); static void unlock_all (KEYDB_HANDLE hd); +/* Handle the creation of a keyring if it does not yet exist. Take + into acount that other processes might have the keyring alread + locked. This lock check does not work if the directory itself is + not yet available. */ +static int +maybe_create_keyring (char *filename, int force) +{ + DOTLOCK lockhd; + IOBUF iobuf; + int rc; + mode_t oldmask; + char *last_slash_in_filename; + + /* A quick test whether the filename already exists. */ + if (!access (filename, F_OK)) + return 0; + + /* If we don't want to create a new file at all, there is no need to + go any further - bail out right here. */ + if (!force) + return G10ERR_OPEN_FILE; + + /* To avoid races with other instances of gpg trying to create or + update the keyring (it is removed during an update for a short + time), we do the next stuff in a locked state. */ + lockhd = create_dotlock (filename); + if (!lockhd) + { + /* A reason for this to fail is that the directory is not + writable. However, this whole locking stuff does not make + sense if this is the case. An empty non-writable directory + with no keyring is not really useful at all. */ + if (opt.verbose) + log_info ("can't allocate lock for `%s'\n", filename ); + + if (!force) + return G10ERR_OPEN_FILE; + else + return G10ERR_GENERAL; + } + + if ( make_dotlock (lockhd, -1) ) + { + /* This is something bad. Probably a stale lockfile. */ + log_info ("can't lock `%s'\n", filename ); + rc = G10ERR_GENERAL; + goto leave; + } + + /* Now the real test while we are locked. */ + if (!access(filename, F_OK)) + { + rc = 0; /* Okay, we may access the file now. */ + goto leave; + } + + /* The file does not yet exist, create it now. */ + + last_slash_in_filename = strrchr (filename, DIRSEP_C); + *last_slash_in_filename = 0; + if (access(filename, F_OK)) + { /* On the first time we try to create the default + homedir and check again. */ + static int tried; + + if (!tried) + { + tried = 1; + try_make_homedir (filename); + } + if (access (filename, F_OK)) + { + rc = G10ERR_OPEN_FILE; + *last_slash_in_filename = DIRSEP_C; + goto leave; + } + } + *last_slash_in_filename = DIRSEP_C; + + oldmask = umask (077); + iobuf = iobuf_create (filename); + umask (oldmask); + if (!iobuf) + { + log_error ( _("error creating keyring `%s': %s\n"), + filename, strerror(errno)); + rc = G10ERR_OPEN_FILE; + goto leave; + } + + if (!opt.quiet) + log_info (_("keyring `%s' created\n"), filename); + + iobuf_close (iobuf); + /* Must invalidate that ugly cache */ + iobuf_ioctl (NULL, 2, 0, filename); + rc = 0; + + leave: + release_dotlock (lockhd); + destroy_dotlock (lockhd); + return rc; +} + + /* * Register a resource (which currently may only be a keyring file). * The first keyring which is added by this function is @@ -81,7 +186,6 @@ keydb_add_resource (const char *url, int { static int any_secret, any_public; const char *resname = url; - IOBUF iobuf = NULL; char *filename = NULL; int rc = 0; KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE; @@ -145,56 +249,9 @@ keydb_add_resource (const char *url, int goto leave; case KEYDB_RESOURCE_TYPE_KEYRING: - if (access(filename, F_OK)) - { /* file does not exist */ - mode_t oldmask; - char *last_slash_in_filename; - - if (!force) - { - rc = G10ERR_OPEN_FILE; - goto leave; - } - - last_slash_in_filename = strrchr (filename, DIRSEP_C); - *last_slash_in_filename = 0; - if (access(filename, F_OK)) - { /* On the first time we try to create the default - homedir and check again. */ - static int tried; - - if (!tried) - { - tried = 1; - try_make_homedir (filename); - } - if (access (filename, F_OK)) - { - rc = G10ERR_OPEN_FILE; - *last_slash_in_filename = DIRSEP_C; - goto leave; - } - } - *last_slash_in_filename = DIRSEP_C; - - oldmask=umask(077); - iobuf = iobuf_create (filename); - umask(oldmask); - if (!iobuf) - { - log_error ( _("error creating keyring `%s': %s\n"), - filename, strerror(errno)); - rc = G10ERR_OPEN_FILE; - goto leave; - } - - if (!opt.quiet) - log_info (_("keyring `%s' created\n"), filename); - iobuf_close (iobuf); - iobuf = NULL; - /* must invalidate that ugly cache */ - iobuf_ioctl (NULL, 2, 0, (char*)filename); - } /* end file creation */ + rc = maybe_create_keyring (filename, force); + if (rc) + goto leave; token = keyring_register_filename (filename, secret); if (!token) diff -urpP gnupg-1.2.5/g10/keydb.h gnupg-1.2.6/g10/keydb.h --- gnupg-1.2.5/g10/keydb.h 2003-05-06 07:33:09.000000000 +0000 +++ gnupg-1.2.6/g10/keydb.h 2004-08-25 14:44:53.000000000 +0000 @@ -1,5 +1,6 @@ /* keydb.h - Key database - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -218,10 +219,10 @@ void get_seckey_end( GETKEY_CTX ctx ); int enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys ); void merge_keys_and_selfsig( KBNODE keyblock ); char*get_user_id_string( u32 *keyid ); -char*get_user_id_string_printable( u32 *keyid ); +char*get_user_id_string_native( u32 *keyid ); char*get_long_user_id_string( u32 *keyid ); char*get_user_id( u32 *keyid, size_t *rn ); -char*get_user_id_printable( u32 *keyid ); +char*get_user_id_native( u32 *keyid ); KEYDB_HANDLE get_ctx_handle(GETKEY_CTX ctx); /*-- keyid.c --*/ diff -urpP gnupg-1.2.5/g10/keyserver.c gnupg-1.2.6/g10/keyserver.c --- gnupg-1.2.5/g10/keyserver.c 2004-05-01 09:19:03.000000000 +0000 +++ gnupg-1.2.6/g10/keyserver.c 2004-08-25 14:44:53.000000000 +0000 @@ -1,5 +1,5 @@ /* keyserver.c - generic keyserver code - * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1020,7 +1020,8 @@ keyserver_search(STRLIST tokens) /* Count and searchstr are just for cosmetics. If the count is too small, it will grow safely. If negative it disables the "Key x-y - of z" messages. */ + of z" messages. searchstr should be native (rather than utf8) + encoding since we're going to printf it. */ /* TODO: do this as a list sent to keyserver_work rather than calling it once for each key to get the correct counts after the import diff -urpP gnupg-1.2.5/g10/passphrase.c gnupg-1.2.6/g10/passphrase.c --- gnupg-1.2.5/g10/passphrase.c 2003-07-30 16:16:55.000000000 +0000 +++ gnupg-1.2.6/g10/passphrase.c 2004-08-18 09:59:05.000000000 +0000 @@ -867,9 +867,15 @@ agent_get_passphrase ( u32 *keyid, int m m_free (orig_codeset); return pw; } - else if (nread > 7 && !memcmp (pw, "ERR 111", 7) - && (pw[7] == ' ' || pw[7] == '\n') ) + else if ((nread > 7 && !memcmp (pw, "ERR 111", 7) + && (pw[7] == ' ' || pw[7] == '\n')) + || ((nread > 4 && !memcmp (pw, "ERR ", 4) + && (strtoul (pw+4, NULL, 0) & 0xffff) == 99)) ) { + /* 111 is the old Assuan code for canceled which might still + be in use by old installations. 99 is GPG_ERR_CANCELED as + used by modern gpg-agents; 0xfff is used to mask out the + error source. */ log_info (_("cancelled by user\n") ); if (canceled) *canceled = 1; diff -urpP gnupg-1.2.5/g10/pkclist.c gnupg-1.2.6/g10/pkclist.c --- gnupg-1.2.5/g10/pkclist.c 2004-06-16 09:37:49.000000000 +0000 +++ gnupg-1.2.6/g10/pkclist.c 2004-07-30 09:32:47.000000000 +0000 @@ -1107,15 +1107,17 @@ algo_available( preftype_t preftype, int && algo != CIPHER_ALGO_CAST5)) return 0; - if((PGP7 || PGP8) && (algo != CIPHER_ALGO_IDEA - && algo != CIPHER_ALGO_3DES - && algo != CIPHER_ALGO_CAST5 - && algo != CIPHER_ALGO_AES - && algo != CIPHER_ALGO_AES192 - && algo != CIPHER_ALGO_AES256 - && algo != CIPHER_ALGO_TWOFISH)) + if(PGP7 && (algo != CIPHER_ALGO_IDEA + && algo != CIPHER_ALGO_3DES + && algo != CIPHER_ALGO_CAST5 + && algo != CIPHER_ALGO_AES + && algo != CIPHER_ALGO_AES192 + && algo != CIPHER_ALGO_AES256 + && algo != CIPHER_ALGO_TWOFISH)) return 0; + /* PGP8 supports all the ciphers we do.. */ + return algo && !check_cipher_algo( algo ); } else if( preftype == PREFTYPE_HASH ) @@ -1143,10 +1145,12 @@ algo_available( preftype_t preftype, int } else if( preftype == PREFTYPE_ZIP ) { - if((PGP6 || PGP7 || PGP8) && (algo != COMPRESS_ALGO_NONE - && algo != COMPRESS_ALGO_ZIP)) + if((PGP6 || PGP7) && (algo != COMPRESS_ALGO_NONE + && algo != COMPRESS_ALGO_ZIP)) return 0; + /* PGP8 supports all the compression algos we do */ + return !check_compress_algo( algo ); } else diff -urpP gnupg-1.2.5/g10/seskey.c gnupg-1.2.6/g10/seskey.c --- gnupg-1.2.5/g10/seskey.c 2003-12-03 10:10:16.000000000 +0000 +++ gnupg-1.2.6/g10/seskey.c 2004-08-19 09:34:19.000000000 +0000 @@ -1,5 +1,5 @@ /* seskey.c - make sesssion keys etc. - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -117,11 +117,14 @@ encode_session_key( DEK *dek, unsigned n k++; if( !k ) break; /* okay: no zero bytes */ - k += k/128; /* better get some more */ + k += (k/128) + 3; /* better get some more */ pp = get_random_bits( k*8, 1, 1); - for(j=0; j < i && k ; j++ ) - if( !p[j] ) - p[j] = pp[--k]; + for (j=0; j < i && k; ) { + if ( !p[j] ) + p[j] = pp[--k]; + if (p[j]) + j++; + } m_free(pp); } memcpy( frame+n, p, i ); diff -urpP gnupg-1.2.5/g10/sign.c gnupg-1.2.6/g10/sign.c --- gnupg-1.2.5/g10/sign.c 2004-07-20 11:29:15.000000000 +0000 +++ gnupg-1.2.6/g10/sign.c 2004-08-25 14:44:54.000000000 +0000 @@ -318,7 +318,7 @@ do_sign( PKT_secret_key *sk, PKT_signatu log_error(_("signing failed: %s\n"), g10_errstr(rc) ); else { if( opt.verbose ) { - char *ustr = get_user_id_string_printable (sig->keyid); + char *ustr = get_user_id_string_native (sig->keyid); log_info(_("%s signature from: \"%s\"\n"), pubkey_algo_to_string(sk->pubkey_algo), ustr ); m_free(ustr); diff -urpP gnupg-1.2.5/gnupg.spec gnupg-1.2.6/gnupg.spec --- gnupg-1.2.5/gnupg.spec 2004-07-26 12:26:57.000000000 +0000 +++ gnupg-1.2.6/gnupg.spec 2004-08-25 14:59:28.000000000 +0000 @@ -2,7 +2,7 @@ # gnupg -- gnu privacy guard # This is a template. The dist target uses it to create the real file. # -%define version 1.2.5 +%define version 1.2.6 %define name gnupg Summary: GNU Utility for data encryption and digital signatures Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati. diff -urpP gnupg-1.2.5/include/util.h gnupg-1.2.6/include/util.h --- gnupg-1.2.5/include/util.h 2004-01-13 11:21:39.000000000 +0000 +++ gnupg-1.2.6/include/util.h 2004-08-11 16:14:52.000000000 +0000 @@ -144,6 +144,7 @@ typedef struct dotlock_handle *DOTLOCK; void disable_dotlock(void); DOTLOCK create_dotlock( const char *file_to_lock ); +void destroy_dotlock ( DOTLOCK h ); int make_dotlock( DOTLOCK h, long timeout ); int release_dotlock( DOTLOCK h ); void remove_lockfiles (void); diff -urpP gnupg-1.2.5/intl/ChangeLog gnupg-1.2.6/intl/ChangeLog --- gnupg-1.2.5/intl/ChangeLog 2003-05-01 11:02:18.000000000 +0000 +++ gnupg-1.2.6/intl/ChangeLog 2004-08-09 15:28:48.000000000 +0000 @@ -1,13 +1,4 @@ -2003-04-29 David Shaw +2004-01-29 GNU - * gettextP.h: Add comment for HP/UX users. Local fix for GnuPG. - -2003-03-23 David Shaw - - * dcigettext.c (plural_lookup): Name conflict on some platforms - with "index". Local fix for GnuPG. - -2001-09-13 GNU - - * Version 0.10.40 released. + * Version 0.14.1 released. diff -urpP gnupg-1.2.5/intl/Makefile.in gnupg-1.2.6/intl/Makefile.in --- gnupg-1.2.5/intl/Makefile.in 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/Makefile.in 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ -# Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. +# Makefile for directory with message catalog handling library of GNU gettext +# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -24,7 +24,7 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = .. -VPATH = @srcdir@ +VPATH = $(srcdir) prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -40,7 +40,7 @@ subdir = intl INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) l = @INTL_LIBTOOL_SUFFIX_PREFIX@ @@ -52,57 +52,91 @@ YACC = @INTLBISON@ -y -d YFLAGS = --name-prefix=__gettext DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ --DLIBDIR=\"$(libdir)\" @DEFS@ +-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \ +-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ +-Dset_relocation_prefix=libintl_set_relocation_prefix \ +-Drelocate=libintl_relocate \ +-DDEPENDS_ON_LIBICONV=1 @DEFS@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h -COMHDRS = gettext.h gettextP.h hash-string.h -SOURCES = $(COMSRCS) intl-compat.c -COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ -localcharset.c -OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ -plural.$lo localcharset.$lo -GETTOBJS = intl-compat.$lo +HEADERS = \ + gmo.h \ + gettextP.h \ + hash-string.h \ + loadinfo.h \ + plural-exp.h \ + eval-plural.h \ + localcharset.h \ + relocatable.h \ + xsize.h \ + printf-args.h printf-args.c \ + printf-parse.h wprintf-parse.h printf-parse.c \ + vasnprintf.h vasnwprintf.h vasnprintf.c \ + os2compat.h \ + libgnuintl.h.in +SOURCES = \ + bindtextdom.c \ + dcgettext.c \ + dgettext.c \ + gettext.c \ + finddomain.c \ + loadmsgcat.c \ + localealias.c \ + textdomain.c \ + l10nflist.c \ + explodename.c \ + dcigettext.c \ + dcngettext.c \ + dngettext.c \ + ngettext.c \ + plural.y \ + plural-exp.c \ + localcharset.c \ + relocatable.c \ + localename.c \ + log.c \ + printf.c \ + osdep.c \ + os2compat.c \ + intl-compat.c +OBJECTS = \ + bindtextdom.$lo \ + dcgettext.$lo \ + dgettext.$lo \ + gettext.$lo \ + finddomain.$lo \ + loadmsgcat.$lo \ + localealias.$lo \ + textdomain.$lo \ + l10nflist.$lo \ + explodename.$lo \ + dcigettext.$lo \ + dcngettext.$lo \ + dngettext.$lo \ + ngettext.$lo \ + plural.$lo \ + plural-exp.$lo \ + localcharset.$lo \ + relocatable.$lo \ + localename.$lo \ + log.$lo \ + printf.$lo \ + osdep.$lo \ + intl-compat.$lo DISTFILES.common = Makefile.in \ config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc -DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c - -# Libtool's library version information for libintl. -# Before making a gettext release, the gettext maintainer must change this -# according to the libtool documentation, section "Library interface versions". -# Maintainers of other packages that include the intl directory must *not* -# change these values. -LTV_CURRENT=1 -LTV_REVISION=1 -LTV_AGE=0 - -.SUFFIXES: -.SUFFIXES: .c .y .o .lo .sin .sed -.c.o: - $(COMPILE) $< -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) $< - -.y.c: - $(YACC) $(YFLAGS) --output $@ $< - rm -f $*.h - -.sin.sed: - sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ - mv t-$@ $@ - -INCLUDES = -I.. -I. -I$(top_srcdir)/intl +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.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 all: all-@USE_INCLUDED_LIBINTL@ all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed @@ -118,23 +152,102 @@ libintl.a libgnuintl.a: $(OBJECTS) libintl.la libgnuintl.la: $(OBJECTS) $(LIBTOOL) --mode=link \ $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ - $(OBJECTS) @LIBICONV@ \ + $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ -no-undefined +# Libtool's library version information for libintl. +# Before making a gettext release, the gettext maintainer must change this +# according to the libtool documentation, section "Library interface versions". +# Maintainers of other packages that include the intl directory must *not* +# change these values. +LTV_CURRENT=7 +LTV_REVISION=0 +LTV_AGE=4 + +.SUFFIXES: +.SUFFIXES: .c .y .o .lo .sin .sed + +.c.o: + $(COMPILE) $< + +.y.c: + $(YACC) $(YFLAGS) --output $@ $< + rm -f $*.h + +bindtextdom.lo: $(srcdir)/bindtextdom.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c +dcgettext.lo: $(srcdir)/dcgettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c +dgettext.lo: $(srcdir)/dgettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c +gettext.lo: $(srcdir)/gettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c +finddomain.lo: $(srcdir)/finddomain.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c +loadmsgcat.lo: $(srcdir)/loadmsgcat.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c +localealias.lo: $(srcdir)/localealias.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c +textdomain.lo: $(srcdir)/textdomain.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c +l10nflist.lo: $(srcdir)/l10nflist.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c +explodename.lo: $(srcdir)/explodename.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c +dcigettext.lo: $(srcdir)/dcigettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c +dcngettext.lo: $(srcdir)/dcngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c +dngettext.lo: $(srcdir)/dngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c +ngettext.lo: $(srcdir)/ngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c +plural.lo: $(srcdir)/plural.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c +plural-exp.lo: $(srcdir)/plural-exp.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c +localcharset.lo: $(srcdir)/localcharset.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c +relocatable.lo: $(srcdir)/relocatable.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c +localename.lo: $(srcdir)/localename.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c +log.lo: $(srcdir)/log.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c +printf.lo: $(srcdir)/printf.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c +osdep.lo: $(srcdir)/osdep.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c +intl-compat.lo: $(srcdir)/intl-compat.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c + +ref-add.sed: $(srcdir)/ref-add.sin + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed + mv t-ref-add.sed ref-add.sed +ref-del.sed: $(srcdir)/ref-del.sin + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed + mv t-ref-del.sed ref-del.sed + +INCLUDES = -I. -I$(srcdir) -I.. + +libgnuintl.h: $(srcdir)/libgnuintl.h.in + sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ + < $(srcdir)/libgnuintl.h.in > libgnuintl.h + libintl.h: libgnuintl.h - cp $(srcdir)/libgnuintl.h libintl.h + cp libgnuintl.h libintl.h -charset.alias: config.charset +charset.alias: $(srcdir)/config.charset $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ mv t-$@ $@ check: all -# This installation goal is only used in GNU gettext. Packages which -# only use the library should use install instead. - # We must not install the libintl.h/libintl.a files if we are on a # system which has the GNU gettext() function in its C library or in a # separate library. @@ -142,17 +255,35 @@ check: all # package, you have to use `configure --with-included-gettext'. install: install-exec install-data install-exec: all - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ $(LIBTOOL) --mode=install \ $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + if test "@RELOCATABLE@" = yes; then \ + dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ + if test -n "$$dependencies"; then \ + rm -f $(DESTDIR)$(libdir)/libintl.la; \ + fi; \ + fi; \ else \ : ; \ fi - if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no; then \ $(mkinstalldirs) $(DESTDIR)$(libdir); \ + $(LIBTOOL) --mode=install \ + $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \ + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + $(LIBTOOL) --mode=uninstall \ + rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ temp=$(DESTDIR)$(libdir)/t-charset.alias; \ dest=$(DESTDIR)$(libdir)/charset.alias; \ if test -f $(DESTDIR)$(libdir)/charset.alias; then \ @@ -181,11 +312,11 @@ install-exec: all : ; \ fi install-data: all - if test "$(PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ - dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \ + dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ for file in $$dists; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -205,18 +336,51 @@ install-data: all : ; \ fi +install-strip: install + +installdirs: + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir); \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi + # Define this as empty until I found a useful application. installcheck: uninstall: - if test "$(PACKAGE)" = "gettext" \ - && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ rm -f $(DESTDIR)$(includedir)/libintl.h; \ $(LIBTOOL) --mode=uninstall \ rm -f $(DESTDIR)$(libdir)/libintl.$la; \ else \ : ; \ fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no; then \ + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + else \ + : ; \ + fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ if test -f $(DESTDIR)$(libdir)/charset.alias; then \ temp=$(DESTDIR)$(libdir)/t-charset.alias; \ @@ -243,25 +407,36 @@ uninstall: else \ : ; \ fi - if test "$(PACKAGE)" = "gettext"; then \ - for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ : ; \ fi -info dvi: +info dvi ps pdf html: $(OBJECTS): ../config.h libgnuintl.h -bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h +bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h +dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h +explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h +dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h +dcigettext.$lo: $(srcdir)/eval-plural.h +localcharset.$lo: $(srcdir)/localcharset.h +localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h +printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c tags: TAGS TAGS: $(HEADERS) $(SOURCES) here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) +ctags: CTAGS + +CTAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES) + id: ID ID: $(HEADERS) $(SOURCES) @@ -269,15 +444,15 @@ ID: $(HEADERS) $(SOURCES) mostlyclean: - rm -f *.a *.la *.o *.lo core core.* - rm -f libintl.h charset.alias ref-add.sed ref-del.sed + rm -f *.a *.la *.o *.obj *.lo core core.* + rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed rm -f -r .libs _libs clean: mostlyclean distclean: clean rm -f Makefile ID TAGS - if test "$(PACKAGE)" = gettext; then \ + if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ rm -f ChangeLog.inst $(DISTFILES.normal); \ else \ : ; \ @@ -292,21 +467,26 @@ maintainer-clean: distclean # other files which should not be distributed in other packages. distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: Makefile - if test "$(PACKAGE)" = gettext; then \ - additional="$(DISTFILES.gettext)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + : ; \ else \ - additional="$(DISTFILES.normal)"; \ - fi; \ - $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - ln $$dir/$$file $(distdir) 2> /dev/null \ - || cp -p $$dir/$$file $(distdir); \ - done - -Makefile: Makefile.in ../config.status - cd .. \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + if test "$(PACKAGE)" = "gettext-runtime"; then \ + additional="$(DISTFILES.gettext)"; \ + else \ + additional="$(DISTFILES.normal)"; \ + fi; \ + $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ + for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ + done; \ + fi + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status +# This would be more efficient, but doesn't work any more with autoconf-2.57, +# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. +# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urpP gnupg-1.2.5/intl/bindtextdom.c gnupg-1.2.6/intl/bindtextdom.c diff -urpP gnupg-1.2.5/intl/bindtextdom.c gnupg-1.2.6/intl/bindtextdom.c --- gnupg-1.2.5/intl/bindtextdom.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/bindtextdom.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -45,8 +45,8 @@ names than the internal variables in GNU libc, otherwise programs using libintl.a cannot be linked statically. */ #if !defined _LIBC -# define _nl_default_dirname _nl_default_dirname__ -# define _nl_domain_bindings _nl_domain_bindings__ +# define _nl_default_dirname libintl_nl_default_dirname +# define _nl_domain_bindings libintl_nl_domain_bindings #endif /* Some compilers, like SunOS4 cc, don't have offsetof in . */ @@ -58,12 +58,17 @@ /* Contains the default location of the message catalogs. */ extern const char _nl_default_dirname[]; +#ifdef _LIBC +extern const char _nl_default_dirname_internal[] attribute_hidden; +#else +# define INTUSE(name) name +#endif /* List with bindings of specific domains. */ extern struct binding *_nl_domain_bindings; /* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) +__libc_rwlock_define (extern, _nl_state_lock attribute_hidden) /* Names for the libintl functions are a problem. They must not clash @@ -77,15 +82,10 @@ __libc_rwlock_define (extern, _nl_state_ # define strdup(str) __strdup (str) # endif #else -# define BINDTEXTDOMAIN bindtextdomain__ -# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__ +# define BINDTEXTDOMAIN libintl_bindtextdomain +# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset #endif -/* Prototypes for local functions. */ -static void set_binding_values PARAMS ((const char *domainname, - const char **dirnamep, - const char **codesetp)); - /* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP to be used for the DOMAINNAME message catalog. If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not @@ -93,10 +93,8 @@ static void set_binding_values PARAMS (( If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither modified nor returned. */ static void -set_binding_values (domainname, dirnamep, codesetp) - const char *domainname; - const char **dirnamep; - const char **codesetp; +set_binding_values (const char *domainname, + const char **dirnamep, const char **codesetp) { struct binding *binding; int modified; @@ -146,8 +144,8 @@ set_binding_values (domainname, dirnamep char *result = binding->dirname; if (strcmp (dirname, result) != 0) { - if (strcmp (dirname, _nl_default_dirname) == 0) - result = (char *) _nl_default_dirname; + if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0) + result = (char *) INTUSE(_nl_default_dirname); else { #if defined _LIBC || defined HAVE_STRDUP @@ -162,7 +160,7 @@ set_binding_values (domainname, dirnamep if (__builtin_expect (result != NULL, 1)) { - if (binding->dirname != _nl_default_dirname) + if (binding->dirname != INTUSE(_nl_default_dirname)) free (binding->dirname); binding->dirname = result; @@ -216,7 +214,7 @@ set_binding_values (domainname, dirnamep { /* Simply return the default values. */ if (dirnamep) - *dirnamep = _nl_default_dirname; + *dirnamep = INTUSE(_nl_default_dirname); if (codesetp) *codesetp = NULL; } @@ -238,11 +236,11 @@ set_binding_values (domainname, dirnamep if (dirname == NULL) /* The default value. */ - dirname = _nl_default_dirname; + dirname = INTUSE(_nl_default_dirname); else { - if (strcmp (dirname, _nl_default_dirname) == 0) - dirname = _nl_default_dirname; + if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0) + dirname = INTUSE(_nl_default_dirname); else { char *result; @@ -265,7 +263,7 @@ set_binding_values (domainname, dirnamep } else /* The default value. */ - new_binding->dirname = (char *) _nl_default_dirname; + new_binding->dirname = (char *) INTUSE(_nl_default_dirname); new_binding->codeset_cntr = 0; @@ -321,7 +319,7 @@ set_binding_values (domainname, dirnamep if (0) { failed_codeset: - if (new_binding->dirname != _nl_default_dirname) + if (new_binding->dirname != INTUSE(_nl_default_dirname)) free (new_binding->dirname); failed_dirname: free (new_binding); @@ -343,9 +341,7 @@ set_binding_values (domainname, dirnamep /* Specify that the DOMAINNAME message catalog will be found in DIRNAME rather than in the system locale data base. */ char * -BINDTEXTDOMAIN (domainname, dirname) - const char *domainname; - const char *dirname; +BINDTEXTDOMAIN (const char *domainname, const char *dirname) { set_binding_values (domainname, &dirname, NULL); return (char *) dirname; @@ -354,9 +350,7 @@ BINDTEXTDOMAIN (domainname, dirname) /* Specify the character encoding in which the messages from the DOMAINNAME message catalog will be returned. */ char * -BIND_TEXTDOMAIN_CODESET (domainname, codeset) - const char *domainname; - const char *codeset; +BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset) { set_binding_values (domainname, NULL, &codeset); return (char *) codeset; diff -urpP gnupg-1.2.5/intl/config.charset gnupg-1.2.6/intl/config.charset --- gnupg-1.2.5/intl/config.charset 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/config.charset 2004-08-09 15:28:48.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2001 Free Software Foundation, Inc. +# Copyright (C) 2000-2004 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -30,72 +30,77 @@ # MIME charset name is preferred. # The current list of GNU canonical charset names is as follows. # -# name used by which systems a MIME name? -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd -# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-3 glibc yes -# ISO-8859-4 osf solaris freebsd yes -# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-6 glibc aix hpux solaris yes -# ISO-8859-7 glibc aix hpux irix osf solaris yes -# ISO-8859-8 glibc aix hpux osf solaris yes -# ISO-8859-9 glibc aix hpux irix osf solaris yes -# ISO-8859-13 glibc -# ISO-8859-15 glibc aix osf solaris freebsd -# KOI8-R glibc solaris freebsd yes -# KOI8-U glibc freebsd yes -# CP437 dos -# CP775 dos -# CP850 aix osf dos -# CP852 dos -# CP855 dos -# CP856 aix -# CP857 dos -# CP861 dos -# CP862 dos -# CP864 dos -# CP865 dos -# CP866 freebsd dos -# CP869 dos -# CP874 win32 dos -# CP922 aix -# CP932 aix win32 dos -# CP943 aix -# CP949 osf win32 dos -# CP950 win32 dos -# CP1046 aix -# CP1124 aix -# CP1129 aix -# CP1250 win32 -# CP1251 glibc win32 -# CP1252 aix win32 -# CP1253 win32 -# CP1254 win32 -# CP1255 win32 -# CP1256 win32 -# CP1257 win32 -# GB2312 glibc aix hpux irix solaris freebsd yes -# EUC-JP glibc aix hpux irix osf solaris freebsd yes -# EUC-KR glibc aix hpux irix osf solaris freebsd yes -# EUC-TW glibc aix hpux irix osf solaris -# BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5-HKSCS glibc -# GBK aix osf win32 dos -# GB18030 glibc -# SHIFT_JIS hpux osf solaris freebsd yes -# JOHAB glibc win32 -# TIS-620 glibc aix hpux osf solaris -# VISCII glibc yes -# HP-ROMAN8 hpux -# HP-ARABIC8 hpux -# HP-GREEK8 hpux -# HP-HEBREW8 hpux -# HP-TURKISH8 hpux -# HP-KANA8 hpux -# DEC-KANJI osf -# DEC-HANYU osf -# UTF-8 glibc aix hpux osf solaris yes +# name MIME? used by which systems +# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin +# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-3 Y glibc solaris +# ISO-8859-4 Y osf solaris freebsd darwin +# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-6 Y glibc aix hpux solaris +# ISO-8859-7 Y glibc aix hpux irix osf solaris +# ISO-8859-8 Y glibc aix hpux osf solaris +# ISO-8859-9 Y glibc aix hpux irix osf solaris +# ISO-8859-13 glibc +# ISO-8859-14 glibc +# ISO-8859-15 glibc aix osf solaris freebsd +# KOI8-R Y glibc solaris freebsd darwin +# KOI8-U Y glibc freebsd darwin +# KOI8-T glibc +# CP437 dos +# CP775 dos +# CP850 aix osf dos +# CP852 dos +# CP855 dos +# CP856 aix +# CP857 dos +# CP861 dos +# CP862 dos +# CP864 dos +# CP865 dos +# CP866 freebsd darwin dos +# CP869 dos +# CP874 woe32 dos +# CP922 aix +# CP932 aix woe32 dos +# CP943 aix +# CP949 osf woe32 dos +# CP950 woe32 dos +# CP1046 aix +# CP1124 aix +# CP1125 dos +# CP1129 aix +# CP1250 woe32 +# CP1251 glibc solaris darwin woe32 +# CP1252 aix woe32 +# CP1253 woe32 +# CP1254 woe32 +# CP1255 glibc woe32 +# CP1256 woe32 +# CP1257 woe32 +# GB2312 Y glibc aix hpux irix solaris freebsd darwin +# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin +# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin +# EUC-TW glibc aix hpux irix osf solaris +# BIG5 Y glibc aix hpux osf solaris freebsd darwin +# BIG5-HKSCS glibc solaris +# GBK glibc aix osf solaris woe32 dos +# GB18030 glibc solaris +# SHIFT_JIS Y hpux osf solaris freebsd darwin +# JOHAB glibc solaris woe32 +# TIS-620 glibc aix hpux osf solaris +# VISCII Y glibc +# TCVN5712-1 glibc +# GEORGIAN-PS glibc +# HP-ROMAN8 hpux +# HP-ARABIC8 hpux +# HP-GREEK8 hpux +# HP-HEBREW8 hpux +# HP-TURKISH8 hpux +# HP-KANA8 hpux +# DEC-KANJI osf +# DEC-HANYU osf +# UTF-8 Y glibc aix hpux osf solaris # # Note: Names which are not marked as being a MIME name should not be used in # Internet protocols for information interchange (mail, news, etc.). @@ -116,6 +121,105 @@ echo "# It was automatically generated f # List of references, updated during installation: echo "# Packages using this file: " case "$os" in + linux-gnulibc1*) + # Linux libc5 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "C ASCII" + echo "POSIX ASCII" + for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \ + en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \ + en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \ + es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \ + et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \ + fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \ + it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \ + sv_FI sv_SE; do + echo "$l ISO-8859-1" + echo "$l.iso-8859-1 ISO-8859-1" + echo "$l.iso-8859-15 ISO-8859-15" + echo "$l.iso-8859-15@euro ISO-8859-15" + echo "$l@euro ISO-8859-15" + echo "$l.cp-437 CP437" + echo "$l.cp-850 CP850" + echo "$l.cp-1252 CP1252" + echo "$l.cp-1252@euro CP1252" + #echo "$l.atari-st ATARI-ST" # not a commonly used encoding + echo "$l.utf-8 UTF-8" + echo "$l.utf-8@euro UTF-8" + done + for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \ + sl_SI sr sr_CS sr_YU; do + echo "$l ISO-8859-2" + echo "$l.iso-8859-2 ISO-8859-2" + echo "$l.cp-852 CP852" + echo "$l.cp-1250 CP1250" + echo "$l.utf-8 UTF-8" + done + for l in mk mk_MK ru ru_RU; do + echo "$l ISO-8859-5" + echo "$l.iso-8859-5 ISO-8859-5" + echo "$l.koi8-r KOI8-R" + echo "$l.cp-866 CP866" + echo "$l.cp-1251 CP1251" + echo "$l.utf-8 UTF-8" + done + for l in ar ar_SA; do + echo "$l ISO-8859-6" + echo "$l.iso-8859-6 ISO-8859-6" + echo "$l.cp-864 CP864" + #echo "$l.cp-868 CP868" # not a commonly used encoding + echo "$l.cp-1256 CP1256" + echo "$l.utf-8 UTF-8" + done + for l in el el_GR gr gr_GR; do + echo "$l ISO-8859-7" + echo "$l.iso-8859-7 ISO-8859-7" + echo "$l.cp-869 CP869" + echo "$l.cp-1253 CP1253" + echo "$l.cp-1253@euro CP1253" + echo "$l.utf-8 UTF-8" + echo "$l.utf-8@euro UTF-8" + done + for l in he he_IL iw iw_IL; do + echo "$l ISO-8859-8" + echo "$l.iso-8859-8 ISO-8859-8" + echo "$l.cp-862 CP862" + echo "$l.cp-1255 CP1255" + echo "$l.utf-8 UTF-8" + done + for l in tr tr_TR; do + echo "$l ISO-8859-9" + echo "$l.iso-8859-9 ISO-8859-9" + echo "$l.cp-857 CP857" + echo "$l.cp-1254 CP1254" + echo "$l.utf-8 UTF-8" + done + for l in lt lt_LT lv lv_LV; do + #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name + echo "$l ISO-8859-13" + done + for l in ru_UA uk uk_UA; do + echo "$l KOI8-U" + done + for l in zh zh_CN; do + #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name + echo "$l GB2312" + done + for l in ja ja_JP ja_JP.EUC; do + echo "$l EUC-JP" + done + for l in ko ko_KR; do + echo "$l EUC-KR" + done + for l in th th_TH; do + echo "$l TIS-620" + done + for l in fa fa_IR; do + #echo "$l ISIRI-3342" # a broken encoding + echo "$l.utf-8 UTF-8" + done + ;; linux* | *-gnu*) # With glibc-2.1 or newer, we don't need any canonicalization, # because glibc has iconv and both glibc and libiconv support all @@ -217,6 +321,7 @@ case "$os" in echo "646 ASCII" echo "ISO8859-1 ISO-8859-1" echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-3 ISO-8859-3" echo "ISO8859-4 ISO-8859-4" echo "ISO8859-5 ISO-8859-5" echo "ISO8859-6 ISO-8859-6" @@ -225,20 +330,27 @@ case "$os" in echo "ISO8859-9 ISO-8859-9" echo "ISO8859-15 ISO-8859-15" echo "koi8-r KOI8-R" + echo "ansi-1251 CP1251" echo "BIG5 BIG5" + echo "Big5-HKSCS BIG5-HKSCS" echo "gb2312 GB2312" + echo "GBK GBK" + echo "GB18030 GB18030" echo "cns11643 EUC-TW" echo "5601 EUC-KR" + echo "ko_KR.johap92 JOHAB" echo "eucJP EUC-JP" echo "PCK SHIFT_JIS" echo "TIS620.2533 TIS-620" #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" ;; - freebsd*) + freebsd* | os2*) # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore # localcharset.c falls back to using the full locale name # from the environment variables. + # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just + # reuse FreeBSD's locale data for OS/2. echo "C ASCII" echo "US-ASCII ASCII" for l in la_LN lt_LN; do @@ -270,6 +382,61 @@ case "$os" in echo "ja_JP.Shift_JIS SHIFT_JIS" echo "ko_KR.EUC EUC-KR" ;; + netbsd*) + echo "646 ASCII" + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-15 ISO-8859-15" + echo "eucCN GB2312" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + echo "BIG5 BIG5" + echo "SJIS SHIFT_JIS" + ;; + darwin*) + # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "C ASCII" + for l in en_AU en_CA en_GB en_US la_LN; do + echo "$l.US-ASCII ASCII" + done + for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ + fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ + nl_NL no_NO pt_PT sv_SE; do + echo "$l ISO-8859-1" + echo "$l.ISO8859-1 ISO-8859-1" + echo "$l.ISO8859-15 ISO-8859-15" + done + for l in la_LN; do + echo "$l.ISO8859-1 ISO-8859-1" + echo "$l.ISO8859-15 ISO-8859-15" + done + for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do + echo "$l.ISO8859-2 ISO-8859-2" + done + for l in la_LN lt_LT; do + echo "$l.ISO8859-4 ISO-8859-4" + done + for l in ru_RU; do + echo "$l.KOI8-R KOI8-R" + echo "$l.ISO8859-5 ISO-8859-5" + echo "$l.CP866 CP866" + done + for l in bg_BG; do + echo "$l.CP1251 CP1251" + done + echo "uk_UA.KOI8-U KOI8-U" + echo "zh_TW.BIG5 BIG5" + echo "zh_TW.Big5 BIG5" + echo "zh_CN.EUC GB2312" + echo "ja_JP.EUC EUC-JP" + echo "ja_JP.SJIS SHIFT_JIS" + echo "ko_KR.EUC EUC-KR" + ;; beos*) # BeOS has a single locale, and it has UTF-8 encoding. echo "* UTF-8" @@ -284,7 +451,7 @@ case "$os" in echo "# country is not the one your DOS machine actually uses, just" echo "# correct it in this file, and send a mail to" echo "# Juan Manuel Guerrero " - echo "# and Bruno Haible ." + echo "# and Bruno Haible ." echo "#" echo "C ASCII" # ISO-8859-1 languages @@ -383,6 +550,7 @@ case "$os" in echo "sq CP852" echo "sq_AL CP852" echo "sr CP852" # CP852 or CP866 or CP855 ?? + echo "sr_CS CP852" # CP852 or CP866 or CP855 ?? echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? # ISO-8859-3 languages echo "mt CP850" @@ -394,8 +562,10 @@ case "$os" in echo "bg_BG CP866" # not CP855 ?? echo "mk CP866" # not CP855 ?? echo "mk_MK CP866" # not CP855 ?? - echo "ru KOI8-R" # not CP866 ?? - echo "ru_RU KOI8-R" # not CP866 ?? + echo "ru CP866" + echo "ru_RU CP866" + echo "uk CP1125" + echo "uk_UA CP1125" # ISO-8859-6 languages echo "ar CP864" echo "ar_AE CP864" diff -urpP gnupg-1.2.5/intl/dcgettext.c gnupg-1.2.6/intl/dcgettext.c --- gnupg-1.2.5/intl/dcgettext.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/dcgettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -37,22 +37,20 @@ # define DCGETTEXT __dcgettext # define DCIGETTEXT __dcigettext #else -# define DCGETTEXT dcgettext__ -# define DCIGETTEXT dcigettext__ +# define DCGETTEXT libintl_dcgettext +# define DCIGETTEXT libintl_dcigettext #endif /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * -DCGETTEXT (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; +DCGETTEXT (const char *domainname, const char *msgid, int category) { return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ +INTDEF(__dcgettext) weak_alias (__dcgettext, dcgettext); #endif diff -urpP gnupg-1.2.5/intl/dcigettext.c gnupg-1.2.6/intl/dcigettext.c --- gnupg-1.2.5/intl/dcigettext.c 2003-04-08 08:38:00.000000000 +0000 +++ gnupg-1.2.6/intl/dcigettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the internal dcigettext function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -33,14 +33,19 @@ # define alloca __builtin_alloca # define HAVE_ALLOCA 1 #else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if defined HAVE_ALLOCA_H || defined _LIBC +# include # else -# ifndef alloca +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca char *alloca (); +# endif # endif # endif # endif @@ -56,13 +61,7 @@ extern int errno; #include #include - #include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif #if defined HAVE_UNISTD_H || defined _LIBC # include @@ -70,11 +69,26 @@ extern int errno; #include +#ifdef _LIBC + /* Guess whether integer division by zero raises signal SIGFPE. + Set to 1 only if you know for sure. In case of doubt, set to 0. */ +# if defined __alpha__ || defined __arm__ || defined __i386__ \ + || defined __m68k__ || defined __s390__ +# define INTDIV0_RAISES_SIGFPE 1 +# else +# define INTDIV0_RAISES_SIGFPE 0 +# endif +#endif +#if !INTDIV0_RAISES_SIGFPE +# include +#endif + #if defined HAVE_SYS_PARAM_H || defined _LIBC # include #endif #include "gettextP.h" +#include "plural-exp.h" #ifdef _LIBC # include #else @@ -107,10 +121,10 @@ extern int errno; names than the internal variables in GNU libc, otherwise programs using libintl.a cannot be linked statically. */ #if !defined _LIBC -# define _nl_default_default_domain _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ -# define _nl_default_dirname _nl_default_dirname__ -# define _nl_domain_bindings _nl_domain_bindings__ +# define _nl_default_default_domain libintl_nl_default_default_domain +# define _nl_current_default_domain libintl_nl_current_default_domain +# define _nl_default_dirname libintl_nl_default_dirname +# define _nl_domain_bindings libintl_nl_domain_bindings #endif /* Some compilers, like SunOS4 cc, don't have offsetof in . */ @@ -134,13 +148,17 @@ extern int errno; char *getwd (); # define getcwd(buf, max) getwd (buf) # else +# if VMS +# define getcwd(buf, max) (getcwd) (buf, max, 0) +# else char *getcwd (); +# endif # endif # ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); +static char *stpcpy (char *dest, const char *src); # endif # ifndef HAVE_MEMPCPY -static void *mempcpy PARAMS ((void *dest, const void *src, size_t n)); +static void *mempcpy (void *dest, const void *src, size_t n); # endif #endif @@ -198,16 +216,6 @@ static void *mempcpy PARAMS ((void *dest # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) #endif -/* XPG3 defines the result of `setlocale (category, NULL)' as: - ``Directs `setlocale()' to query `category' and return the current - setting of `local'.'' - However it does not specify the exact format. Neither do SUSV2 and - ISO C 99. So we can use this feature only on selected systems (e.g. - those using GNU C Library). */ -#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) -# define HAVE_LOCALE_NULL -#endif - /* This is the type used for the search tree where known translations are stored. */ struct known_translation_t @@ -244,11 +252,8 @@ static void *root; # endif /* Function to compare two entries in the table of known translations. */ -static int transcmp PARAMS ((const void *p1, const void *p2)); static int -transcmp (p1, p2) - const void *p1; - const void *p2; +transcmp (const void *p1, const void *p2) { const struct known_translation_t *s1; const struct known_translation_t *s2; @@ -272,39 +277,54 @@ transcmp (p1, p2) } #endif +#ifndef INTVARDEF +# define INTVARDEF(name) +#endif +#ifndef INTUSE +# define INTUSE(name) name +#endif + /* Name of the default domain used for gettext(3) prior any call to textdomain(3). The default value for this is "messages". */ -const char _nl_default_default_domain[] = "messages"; +const char _nl_default_default_domain[] attribute_hidden = "messages"; /* Value used as the default domain for gettext(3). */ -const char *_nl_current_default_domain = _nl_default_default_domain; +const char *_nl_current_default_domain attribute_hidden + = _nl_default_default_domain; /* Contains the default location of the message catalogs. */ +#if defined __EMX__ +extern const char _nl_default_dirname[]; +#else const char _nl_default_dirname[] = LOCALEDIR; +INTVARDEF (_nl_default_dirname) +#endif /* List with bindings of specific domains created by bindtextdomain() calls. */ struct binding *_nl_domain_bindings; /* Prototypes for local functions. */ -static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain, - unsigned long int n, - const char *translation, - size_t translation_len)) - internal_function; -static unsigned long int plural_eval PARAMS ((struct expression *pexp, - unsigned long int n)) +static char *plural_lookup (struct loaded_l10nfile *domain, + unsigned long int n, + const char *translation, size_t translation_len) internal_function; -static const char *category_to_name PARAMS ((int category)) internal_function; -static const char *guess_category_value PARAMS ((int category, - const char *categoryname)) +static const char *guess_category_value (int category, + const char *categoryname) internal_function; +#ifdef _LIBC +# include "../locale/localeinfo.h" +# define category_to_name(category) _nl_category_names[category] +#else +static const char *category_to_name (int category) internal_function; +#endif /* For those loosing systems which don't have `alloca' we have to add some additional code emulating it. */ #ifdef HAVE_ALLOCA /* Nothing has to be done. */ +# define freea(p) /* nothing */ # define ADD_BLOCK(list, address) /* nothing */ # define FREE_BLOCKS(list) /* nothing */ #else @@ -329,11 +349,13 @@ struct block_list while (list != NULL) { \ struct block_list *old = list; \ list = list->next; \ + free (old->address); \ free (old); \ } \ } while (0) # undef alloca # define alloca(size) (malloc (size)) +# define freea(p) free (p) #endif /* have alloca */ @@ -357,12 +379,12 @@ typedef unsigned char transmem_block_t; #ifdef _LIBC # define DCIGETTEXT __dcigettext #else -# define DCIGETTEXT dcigettext__ +# define DCIGETTEXT libintl_dcigettext #endif /* Lock variable to protect the global data in the gettext implementation. */ #ifdef _LIBC -__libc_rwlock_define_initialized (, _nl_state_lock) +__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden) #endif /* Checking whether the binaries runs SUID must be done and glibc provides @@ -395,17 +417,15 @@ static int enable_secure; } #endif +/* Get the function to evaluate the plural expression. */ +#include "eval-plural.h" + /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale and, if PLURAL is nonzero, search over string depending on the plural form determined by N. */ char * -DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - int plural; - unsigned long int n; - int category; +DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2, + int plural, unsigned long int n, int category) { #ifndef HAVE_ALLOCA struct block_list *block_list = NULL; @@ -430,6 +450,15 @@ DCIGETTEXT (domainname, msgid1, msgid2, if (msgid1 == NULL) return NULL; +#ifdef _LIBC + if (category < 0 || category >= __LC_LAST || category == LC_ALL) + /* Bogus. */ + return (plural == 0 + ? (char *) msgid1 + /* Use the Germanic plural rule. */ + : n == 1 ? (char *) msgid1 : (char *) msgid2); +#endif + __libc_rwlock_rdlock (_nl_state_lock); /* If DOMAINNAME is NULL, we are interested in the default domain. If @@ -438,6 +467,12 @@ DCIGETTEXT (domainname, msgid1, msgid2, if (domainname == NULL) domainname = _nl_current_default_domain; + /* OS/2 specific: backward compatibility with older libintl versions */ +#ifdef LC_MESSAGES_COMPAT + if (category == LC_MESSAGES_COMPAT) + category = LC_MESSAGES; +#endif + #if defined HAVE_TSEARCH || defined _LIBC msgid_len = strlen (msgid1) + 1; @@ -450,6 +485,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, search->category = category; foundp = (struct known_translation_t **) tfind (search, &root, transcmp); + freea (search); if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr) { /* Now deal with plural. */ @@ -486,7 +522,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, } if (binding == NULL) - dirname = (char *) _nl_default_dirname; + dirname = (char *) INTUSE(_nl_default_dirname); else if (IS_ABSOLUTE_PATH (binding->dirname)) dirname = binding->dirname; else @@ -514,17 +550,9 @@ DCIGETTEXT (domainname, msgid1, msgid2, } if (ret == NULL) - { - /* We cannot get the current working directory. Don't signal an - error but simply return the default string. */ - FREE_BLOCKS (block_list); - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 - ? (char *) msgid1 - /* Use the Germanic plural rule. */ - : n == 1 ? (char *) msgid1 : (char *) msgid2); - } + /* We cannot get the current working directory. Don't signal an + error but simply return the default string. */ + goto return_untranslated; stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); } @@ -581,16 +609,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, domain. Return the MSGID. */ if (strcmp (single_locale, "C") == 0 || strcmp (single_locale, "POSIX") == 0) - { - FREE_BLOCKS (block_list); - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 - ? (char *) msgid1 - /* Use the Germanic plural rule. */ - : n == 1 ? (char *) msgid1 : (char *) msgid2); - } - + break; /* Find structure describing the message catalog matching the DOMAINNAME and CATEGORY. */ @@ -622,7 +641,6 @@ DCIGETTEXT (domainname, msgid1, msgid2, /* Found the translation of MSGID1 in domain DOMAIN: starting at RETVAL, RETLEN bytes. */ FREE_BLOCKS (block_list); - __set_errno (saved_errno); #if defined HAVE_TSEARCH || defined _LIBC if (foundp == NULL) { @@ -661,6 +679,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, (*foundp)->translation_length = retlen; } #endif + __set_errno (saved_errno); + /* Now deal with plural. */ if (plural) retval = plural_lookup (domain, n, retval, retlen); @@ -670,19 +690,40 @@ DCIGETTEXT (domainname, msgid1, msgid2, } } } - /* NOTREACHED */ + + return_untranslated: + /* Return the untranslated MSGID. */ + FREE_BLOCKS (block_list); + __libc_rwlock_unlock (_nl_state_lock); +#ifndef _LIBC + if (!ENABLE_SECURE) + { + extern void _nl_log_untranslated (const char *logfilename, + const char *domainname, + const char *msgid1, const char *msgid2, + int plural); + const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED"); + + if (logfilename != NULL && logfilename[0] != '\0') + _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural); + } +#endif + __set_errno (saved_errno); + return (plural == 0 + ? (char *) msgid1 + /* Use the Germanic plural rule. */ + : n == 1 ? (char *) msgid1 : (char *) msgid2); } char * internal_function -_nl_find_msg (domain_file, domainbinding, msgid, lengthp) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; - const char *msgid; - size_t *lengthp; +_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + size_t *lengthp) { struct loaded_domain *domain; + nls_uint32 nstrings; size_t act; char *result; size_t resultlen; @@ -695,8 +736,10 @@ _nl_find_msg (domain_file, domainbinding domain = (struct loaded_domain *) domain_file->data; + nstrings = domain->nstrings; + /* Locate the MSGID and its translation. */ - if (domain->hash_size > 2 && domain->hash_tab != NULL) + if (domain->hash_tab != NULL) { /* Use the hashing table. */ nls_uint32 len = strlen (msgid); @@ -706,22 +749,30 @@ _nl_find_msg (domain_file, domainbinding while (1) { - nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); + nls_uint32 nstr = + W (domain->must_swap_hash_tab, domain->hash_tab[idx]); if (nstr == 0) /* Hash table entry is empty. */ return NULL; - /* Compare msgid with the original string at index nstr-1. + nstr--; + + /* Compare msgid with the original string at index nstr. We compare the lengths with >=, not ==, because plural entries are represented by strings with an embedded NUL. */ - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len - && (strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) - == 0)) + if (nstr < nstrings + ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len + && (strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr].offset)) + == 0) + : domain->orig_sysdep_tab[nstr - nstrings].length > len + && (strcmp (msgid, + domain->orig_sysdep_tab[nstr - nstrings].pointer) + == 0)) { - act = nstr - 1; + act = nstr; goto found; } @@ -739,7 +790,7 @@ _nl_find_msg (domain_file, domainbinding size_t top, bottom; bottom = 0; - top = domain->nstrings; + top = nstrings; while (bottom < top) { int cmp_val; @@ -762,9 +813,17 @@ _nl_find_msg (domain_file, domainbinding found: /* The translation was found at index ACT. If we have to convert the string to use a different character set, this is the time. */ - result = ((char *) domain->data - + W (domain->must_swap, domain->trans_tab[act].offset)); - resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; + if (act < nstrings) + { + result = (char *) + (domain->data + W (domain->must_swap, domain->trans_tab[act].offset)); + resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; + } + else + { + result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer; + resultlen = domain->trans_sysdep_tab[act - nstrings].length; + } #if defined _LIBC || HAVE_ICONV if (domain->codeset_cntr @@ -797,8 +856,9 @@ _nl_find_msg (domain_file, domainbinding NULs. */ if (domain->conv_tab == NULL - && ((domain->conv_tab = (char **) calloc (domain->nstrings, - sizeof (char *))) + && ((domain->conv_tab = + (char **) calloc (nstrings + domain->n_sysdep_strings, + sizeof (char *))) == NULL)) /* Mark that we didn't succeed allocating a table. */ domain->conv_tab = (char **) -1; @@ -967,25 +1027,22 @@ _nl_find_msg (domain_file, domainbinding /* Look up a plural variant. */ static char * internal_function -plural_lookup (domain, n, translation, translation_len) - struct loaded_l10nfile *domain; - unsigned long int n; - const char *translation; - size_t translation_len; +plural_lookup (struct loaded_l10nfile *domain, unsigned long int n, + const char *translation, size_t translation_len) { struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; - unsigned long int ind; /* gnupg */ + unsigned long int index; const char *p; - ind = plural_eval (domaindata->plural, n); /* gnupg */ - if (ind >= domaindata->nplurals) /* gnupg */ + index = plural_eval (domaindata->plural, n); + if (index >= domaindata->nplurals) /* This should never happen. It means the plural expression and the given maximum value do not match. */ - ind = 0; /* gnupg */ + index = 0; /* Skip INDEX strings at TRANSLATION. */ p = translation; - while (ind-- > 0) /* gnupg */ + while (index-- > 0) { #ifdef _LIBC p = __rawmemchr (p, '\0'); @@ -1004,93 +1061,11 @@ plural_lookup (domain, n, translation, t return (char *) p; } - -/* Function to evaluate the plural expression and return an index value. */ -static unsigned long int -internal_function -plural_eval (pexp, n) - struct expression *pexp; - unsigned long int n; -{ - switch (pexp->nargs) - { - case 0: - switch (pexp->operation) - { - case var: - return n; - case num: - return pexp->val.num; - default: - break; - } - /* NOTREACHED */ - break; - case 1: - { - /* pexp->operation must be lnot. */ - unsigned long int arg = plural_eval (pexp->val.args[0], n); - return ! arg; - } - case 2: - { - unsigned long int leftarg = plural_eval (pexp->val.args[0], n); - if (pexp->operation == lor) - return leftarg || plural_eval (pexp->val.args[1], n); - else if (pexp->operation == land) - return leftarg && plural_eval (pexp->val.args[1], n); - else - { - unsigned long int rightarg = plural_eval (pexp->val.args[1], n); - - switch (pexp->operation) - { - case mult: - return leftarg * rightarg; - case divide: - return leftarg / rightarg; - case module: - return leftarg % rightarg; - case plus: - return leftarg + rightarg; - case minus: - return leftarg - rightarg; - case less_than: - return leftarg < rightarg; - case greater_than: - return leftarg > rightarg; - case less_or_equal: - return leftarg <= rightarg; - case greater_or_equal: - return leftarg >= rightarg; - case equal: - return leftarg == rightarg; - case not_equal: - return leftarg != rightarg; - default: - break; - } - } - /* NOTREACHED */ - break; - } - case 3: - { - /* pexp->operation must be qmop. */ - unsigned long int boolarg = plural_eval (pexp->val.args[0], n); - return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); - } - } - /* NOTREACHED */ - return 0; -} - - +#ifndef _LIBC /* Return string representation of locale CATEGORY. */ static const char * internal_function -category_to_name (category) - int category; +category_to_name (int category) { const char *retval; @@ -1145,13 +1120,12 @@ category_to_name (category) return retval; } +#endif /* Guess value of current locale from value of the environment variables. */ static const char * internal_function -guess_category_value (category, categoryname) - int category; - const char *categoryname; +guess_category_value (int category, const char *categoryname) { const char *language; const char *retval; @@ -1166,27 +1140,21 @@ guess_category_value (category, category /* We have to proceed with the POSIX methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some systems this can be done by the `setlocale' function itself. */ -#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL) - retval = setlocale (category, NULL); +#ifdef _LIBC + retval = __current_locale_name (category); #else - /* Setting of LC_ALL overwrites all other. */ - retval = getenv ("LC_ALL"); - if (retval == NULL || retval[0] == '\0') - { - /* Next comes the name of the desired category. */ - retval = getenv (categoryname); - if (retval == NULL || retval[0] == '\0') - { - /* Last possibility is the LANG environment variable. */ - retval = getenv ("LANG"); - if (retval == NULL || retval[0] == '\0') - /* We use C as the default domain. POSIX says this is - implementation defined. */ - return "C"; - } - } + retval = _nl_locale_name (category, categoryname); #endif + /* Ignore LANGUAGE if the locale is set to "C" because + 1. "C" locale usually uses the ASCII encoding, and most international + messages use non-ASCII characters. These characters get displayed + as question marks (if using glibc's iconv()) or as invalid 8-bit + characters (because other iconv()s refuse to convert most non-ASCII + characters to ASCII). In any case, the output is ugly. + 2. The precise output of some programs in the "C" locale is specified + by POSIX and should not depend on environment variables like + "LANGUAGE". We allow such programs to use gettext(). */ return language != NULL && strcmp (retval, "C") != 0 ? language : retval; } @@ -1198,9 +1166,7 @@ guess_category_value (category, category to be defined. */ #if !_LIBC && !HAVE_STPCPY static char * -stpcpy (dest, src) - char *dest; - const char *src; +stpcpy (char *dest, const char *src) { while ((*dest++ = *src++) != '\0') /* Do nothing. */ ; @@ -1210,10 +1176,7 @@ stpcpy (dest, src) #if !_LIBC && !HAVE_MEMPCPY static void * -mempcpy (dest, src, n) - void *dest; - const void *src; - size_t n; +mempcpy (void *dest, const void *src, size_t n) { return (void *) ((char *) memcpy (dest, src, n) + n); } @@ -1223,8 +1186,7 @@ mempcpy (dest, src, n) #ifdef _LIBC /* If we want to free all resources we have to do some work at program's end. */ -static void __attribute__ ((unused)) -free_mem (void) +libc_freeres_fn (free_mem) { void *old; @@ -1232,7 +1194,7 @@ free_mem (void) { struct binding *oldp = _nl_domain_bindings; _nl_domain_bindings = _nl_domain_bindings->next; - if (oldp->dirname != _nl_default_dirname) + if (oldp->dirname != INTUSE(_nl_default_dirname)) /* Yes, this is a pointer comparison. */ free (oldp->dirname); free (oldp->codeset); @@ -1254,6 +1216,4 @@ free_mem (void) free (old); } } - -text_set_element (__libc_subfreeres, free_mem); #endif diff -urpP gnupg-1.2.5/intl/dcngettext.c gnupg-1.2.6/intl/dcngettext.c --- gnupg-1.2.5/intl/dcngettext.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/dcngettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the dcngettext(3) function. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -37,19 +37,16 @@ # define DCNGETTEXT __dcngettext # define DCIGETTEXT __dcigettext #else -# define DCNGETTEXT dcngettext__ -# define DCIGETTEXT dcigettext__ +# define DCNGETTEXT libintl_dcngettext +# define DCIGETTEXT libintl_dcigettext #endif /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * -DCNGETTEXT (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; +DCNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) { return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); } diff -urpP gnupg-1.2.5/intl/dgettext.c gnupg-1.2.6/intl/dgettext.c --- gnupg-1.2.5/intl/dgettext.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/dgettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the dgettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -20,9 +20,10 @@ # include #endif +#include "gettextP.h" + #include -#include "gettextP.h" #ifdef _LIBC # include #else @@ -37,18 +38,16 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define DGETTEXT __dgettext -# define DCGETTEXT __dcgettext +# define DCGETTEXT INTUSE(__dcgettext) #else -# define DGETTEXT dgettext__ -# define DCGETTEXT dcgettext__ +# define DGETTEXT libintl_dgettext +# define DCGETTEXT libintl_dcgettext #endif /* Look up MSGID in the DOMAINNAME message catalog of the current LC_MESSAGES locale. */ char * -DGETTEXT (domainname, msgid) - const char *domainname; - const char *msgid; +DGETTEXT (const char *domainname, const char *msgid) { return DCGETTEXT (domainname, msgid, LC_MESSAGES); } diff -urpP gnupg-1.2.5/intl/dngettext.c gnupg-1.2.6/intl/dngettext.c --- gnupg-1.2.5/intl/dngettext.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/dngettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the dngettext(3) function. - Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -20,9 +20,10 @@ # include #endif +#include "gettextP.h" + #include -#include "gettextP.h" #ifdef _LIBC # include #else @@ -39,18 +40,15 @@ # define DNGETTEXT __dngettext # define DCNGETTEXT __dcngettext #else -# define DNGETTEXT dngettext__ -# define DCNGETTEXT dcngettext__ +# define DNGETTEXT libintl_dngettext +# define DCNGETTEXT libintl_dcngettext #endif /* Look up MSGID in the DOMAINNAME message catalog of the current LC_MESSAGES locale and skip message according to the plural form. */ char * -DNGETTEXT (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; +DNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) { return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); } diff -urpP gnupg-1.2.5/intl/eval-plural.h gnupg-1.2.6/intl/eval-plural.h --- gnupg-1.2.5/intl/eval-plural.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/eval-plural.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,108 @@ +/* Plural expression evaluation. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef STATIC +#define STATIC static +#endif + +/* Evaluate the plural expression and return an index value. */ +STATIC +unsigned long int +internal_function +plural_eval (struct expression *pexp, unsigned long int n) +{ + switch (pexp->nargs) + { + case 0: + switch (pexp->operation) + { + case var: + return n; + case num: + return pexp->val.num; + default: + break; + } + /* NOTREACHED */ + break; + case 1: + { + /* pexp->operation must be lnot. */ + unsigned long int arg = plural_eval (pexp->val.args[0], n); + return ! arg; + } + case 2: + { + unsigned long int leftarg = plural_eval (pexp->val.args[0], n); + if (pexp->operation == lor) + return leftarg || plural_eval (pexp->val.args[1], n); + else if (pexp->operation == land) + return leftarg && plural_eval (pexp->val.args[1], n); + else + { + unsigned long int rightarg = plural_eval (pexp->val.args[1], n); + + switch (pexp->operation) + { + case mult: + return leftarg * rightarg; + case divide: +#if !INTDIV0_RAISES_SIGFPE + if (rightarg == 0) + raise (SIGFPE); +#endif + return leftarg / rightarg; + case module: +#if !INTDIV0_RAISES_SIGFPE + if (rightarg == 0) + raise (SIGFPE); +#endif + return leftarg % rightarg; + case plus: + return leftarg + rightarg; + case minus: + return leftarg - rightarg; + case less_than: + return leftarg < rightarg; + case greater_than: + return leftarg > rightarg; + case less_or_equal: + return leftarg <= rightarg; + case greater_or_equal: + return leftarg >= rightarg; + case equal: + return leftarg == rightarg; + case not_equal: + return leftarg != rightarg; + default: + break; + } + } + /* NOTREACHED */ + break; + } + case 3: + { + /* pexp->operation must be qmop. */ + unsigned long int boolarg = plural_eval (pexp->val.args[0], n); + return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); + } + } + /* NOTREACHED */ + return 0; +} diff -urpP gnupg-1.2.5/intl/explodename.c gnupg-1.2.6/intl/explodename.c --- gnupg-1.2.5/intl/explodename.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/explodename.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -38,8 +38,7 @@ /* @@ end of prolog @@ */ char * -_nl_find_language (name) - const char *name; +_nl_find_language (const char *name) { while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '+' && name[0] != ',') @@ -50,17 +49,11 @@ _nl_find_language (name) int -_nl_explode_name (name, language, modifier, territory, codeset, - normalized_codeset, special, sponsor, revision) - char *name; - const char **language; - const char **modifier; - const char **territory; - const char **codeset; - const char **normalized_codeset; - const char **special; - const char **sponsor; - const char **revision; +_nl_explode_name (char *name, + const char **language, const char **modifier, + const char **territory, const char **codeset, + const char **normalized_codeset, const char **special, + const char **sponsor, const char **revision) { enum { undecided, xpg, cen } syntax; char *cp; diff -urpP gnupg-1.2.5/intl/finddomain.c gnupg-1.2.6/intl/finddomain.c --- gnupg-1.2.5/intl/finddomain.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/finddomain.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -47,11 +47,8 @@ static struct loaded_l10nfile *_nl_loade established bindings. */ struct loaded_l10nfile * internal_function -_nl_find_domain (dirname, locale, domainname, domainbinding) - const char *dirname; - char *locale; - const char *domainname; - struct binding *domainbinding; +_nl_find_domain (const char *dirname, char *locale, + const char *domainname, struct binding *domainbinding) { struct loaded_l10nfile *retval; const char *language; @@ -178,8 +175,7 @@ _nl_find_domain (dirname, locale, domain #ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) +libc_freeres_fn (free_mem) { struct loaded_l10nfile *runp = _nl_loaded_domains; @@ -193,6 +189,4 @@ free_mem (void) free (here); } } - -text_set_element (__libc_subfreeres, free_mem); #endif diff -urpP gnupg-1.2.5/intl/gettext.c gnupg-1.2.6/intl/gettext.c --- gnupg-1.2.5/intl/gettext.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/gettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -42,18 +42,17 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define GETTEXT __gettext -# define DCGETTEXT __dcgettext +# define DCGETTEXT INTUSE(__dcgettext) #else -# define GETTEXT gettext__ -# define DCGETTEXT dcgettext__ +# define GETTEXT libintl_gettext +# define DCGETTEXT libintl_dcgettext #endif /* Look up MSGID in the current default message catalog for the current LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ char * -GETTEXT (msgid) - const char *msgid; +GETTEXT (const char *msgid) { return DCGETTEXT (NULL, msgid, LC_MESSAGES); } Only in gnupg-1.2.5/intl: gettext.h diff -urpP gnupg-1.2.5/intl/gettextP.h gnupg-1.2.6/intl/gettextP.h --- gnupg-1.2.5/intl/gettextP.h 2003-05-01 11:02:18.000000000 +0000 +++ gnupg-1.2.6/intl/gettextP.h 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Header describing internals of libintl library. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -20,12 +20,6 @@ #ifndef _GETTEXTP_H #define _GETTEXTP_H -/* HP/UX users - if you get errors line "Unexpected symbol: SWAP" when - building with HP's C compiler, you will need to uncomment the - following line. This is a GnuPG-specific change. */ - -/* #define inline */ - #include /* Get size_t. */ #ifdef _LIBC @@ -38,22 +32,18 @@ #include "loadinfo.h" -#include "gettext.h" /* Get nls_uint32. */ +#include "gmo.h" /* Get nls_uint32. */ /* @@ end of prolog @@ */ -#ifndef PARAMS -# if __STDC__ -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - #ifndef internal_function # define internal_function #endif +#ifndef attribute_hidden +# define attribute_hidden +#endif + /* Tell the compiler when a conditional or integer expression is almost always true or almost always false. */ #ifndef HAVE_BUILTIN_EXPECT @@ -78,63 +68,50 @@ SWAP (i) #endif -/* This is the representation of the expressions to determine the - plural form. */ -struct expression -{ - int nargs; /* Number of arguments. */ - enum operator - { - /* Without arguments: */ - var, /* The variable "n". */ - num, /* Decimal number. */ - /* Unary operators: */ - lnot, /* Logical NOT. */ - /* Binary operators: */ - mult, /* Multiplication. */ - divide, /* Division. */ - module, /* Module operation. */ - plus, /* Addition. */ - minus, /* Subtraction. */ - less_than, /* Comparison. */ - greater_than, /* Comparison. */ - less_or_equal, /* Comparison. */ - greater_or_equal, /* Comparison. */ - equal, /* Comparision for equality. */ - not_equal, /* Comparision for inequality. */ - land, /* Logical AND. */ - lor, /* Logical OR. */ - /* Ternary operators: */ - qmop /* Question mark operator. */ - } operation; - union - { - unsigned long int num; /* Number value for `num'. */ - struct expression *args[3]; /* Up to three arguments. */ - } val; -}; - -/* This is the data structure to pass information to the parser and get - the result in a thread-safe way. */ -struct parse_args +/* In-memory representation of system dependent string. */ +struct sysdep_string_desc { - const char *cp; - struct expression *res; + /* Length of addressed string, including the trailing NUL. */ + size_t length; + /* Pointer to addressed string. */ + const char *pointer; }; - /* The representation of an opened message catalog. */ struct loaded_domain { + /* Pointer to memory containing the .mo file. */ const char *data; + /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */ int use_mmap; + /* Size of mmap()ed memory. */ size_t mmap_size; + /* 1 if the .mo file uses a different endianness than this machine. */ int must_swap; + /* Pointer to additional malloc()ed memory. */ + void *malloced; + + /* Number of static strings pairs. */ nls_uint32 nstrings; - struct string_desc *orig_tab; - struct string_desc *trans_tab; + /* Pointer to descriptors of original strings in the file. */ + const struct string_desc *orig_tab; + /* Pointer to descriptors of translated strings in the file. */ + const struct string_desc *trans_tab; + + /* Number of system dependent strings pairs. */ + nls_uint32 n_sysdep_strings; + /* Pointer to descriptors of original sysdep strings. */ + const struct sysdep_string_desc *orig_sysdep_tab; + /* Pointer to descriptors of translated sysdep strings. */ + const struct sysdep_string_desc *trans_sysdep_tab; + + /* Size of hash table. */ nls_uint32 hash_size; - nls_uint32 *hash_tab; + /* Pointer to hash table. */ + const nls_uint32 *hash_tab; + /* 1 if the hash table uses a different endianness than this machine. */ + int must_swap_hash_tab; + int codeset_cntr; #ifdef _LIBC __gconv_t conv; @@ -173,84 +150,64 @@ struct binding This variable is part of the external ABI of the GNU libintl. */ extern int _nl_msg_cat_cntr; -struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, - char *__locale, - const char *__domainname, - struct binding *__domainbinding)) +#ifndef _LIBC +const char *_nl_locale_name (int category, const char *categoryname); +#endif + +struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale, + const char *__domainname, + struct binding *__domainbinding) internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, - struct binding *__domainbinding)) +void _nl_load_domain (struct loaded_l10nfile *__domain, + struct binding *__domainbinding) internal_function; -void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) +void _nl_unload_domain (struct loaded_domain *__domain) internal_function; -const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, - struct loaded_domain *__domain, - struct binding *__domainbinding)) +const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file, + struct loaded_domain *__domain, + struct binding *__domainbinding) internal_function; -void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) +void _nl_free_domain_conv (struct loaded_domain *__domain) internal_function; -char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, - struct binding *domainbinding, - const char *msgid, size_t *lengthp)) +char *_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + size_t *lengthp) internal_function; #ifdef _LIBC -extern char *__gettext PARAMS ((const char *__msgid)); -extern char *__dgettext PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *__dcgettext PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *__dngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int n)); -extern char *__dcngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *__dcigettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *__textdomain PARAMS ((const char *__domainname)); -extern char *__bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, - const char *__codeset)); -#else -extern char *gettext__ PARAMS ((const char *__msgid)); -extern char *dgettext__ PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *dcgettext__ PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *dngettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *dcngettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *dcigettext__ PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *textdomain__ PARAMS ((const char *__domainname)); -extern char *bindtextdomain__ PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname, - const char *__codeset)); -#endif - -#ifdef _LIBC -extern void __gettext_free_exp PARAMS ((struct expression *exp)) - internal_function; -extern int __gettextparse PARAMS ((void *arg)); -#else -extern void gettext_free_exp__ PARAMS ((struct expression *exp)) - internal_function; -extern int gettextparse__ PARAMS ((void *arg)); +extern char *__gettext (const char *__msgid); +extern char *__dgettext (const char *__domainname, const char *__msgid); +extern char *__dcgettext (const char *__domainname, const char *__msgid, + int __category); +extern char *__ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n); +extern char *__dngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int n); +extern char *__dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category); +extern char *__dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); +extern char *__textdomain (const char *__domainname); +extern char *__bindtextdomain (const char *__domainname, + const char *__dirname); +extern char *__bind_textdomain_codeset (const char *__domainname, + const char *__codeset); +#else +/* Declare the exported libintl_* functions, in a way that allows us to + call them under their real name. */ +# undef _INTL_REDIRECT_INLINE +# undef _INTL_REDIRECT_MACROS +# define _INTL_REDIRECT_MACROS +# include "libgnuintl.h" +extern char *libintl_dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); #endif /* @@ begin of epilog @@ */ diff -urpP gnupg-1.2.5/intl/gmo.h gnupg-1.2.6/intl/gmo.h --- gnupg-1.2.5/intl/gmo.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/gmo.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,149 @@ +/* Description of GNU message catalog format: general file layout. + Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _GETTEXT_H +#define _GETTEXT_H 1 + +#include + +/* @@ end of prolog @@ */ + +/* The magic number of the GNU message catalog format. */ +#define _MAGIC 0x950412de +#define _MAGIC_SWAPPED 0xde120495 + +/* Revision number of the currently used .mo (binary) file format. */ +#define MO_REVISION_NUMBER 0 +#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1 + +/* The following contortions are an attempt to use the C preprocessor + to determine an unsigned integral type that is 32 bits wide. An + alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but + as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work + when cross-compiling. */ + +#if __STDC__ +# define UINT_MAX_32_BITS 4294967295U +#else +# define UINT_MAX_32_BITS 0xFFFFFFFF +#endif + +/* If UINT_MAX isn't defined, assume it's a 32-bit type. + This should be valid for all systems GNU cares about because + that doesn't include 16-bit systems, and only modern systems + (that certainly have ) have 64+-bit integral types. */ + +#ifndef UINT_MAX +# define UINT_MAX UINT_MAX_32_BITS +#endif + +#if UINT_MAX == UINT_MAX_32_BITS +typedef unsigned nls_uint32; +#else +# if USHRT_MAX == UINT_MAX_32_BITS +typedef unsigned short nls_uint32; +# else +# if ULONG_MAX == UINT_MAX_32_BITS +typedef unsigned long nls_uint32; +# else + /* The following line is intended to throw an error. Using #error is + not portable enough. */ + "Cannot determine unsigned 32-bit data type." +# endif +# endif +#endif + + +/* Header for binary .mo file format. */ +struct mo_file_header +{ + /* The magic number. */ + nls_uint32 magic; + /* The revision number of the file format. */ + nls_uint32 revision; + + /* The following are only used in .mo files with major revision 0 or 1. */ + + /* The number of strings pairs. */ + nls_uint32 nstrings; + /* Offset of table with start offsets of original strings. */ + nls_uint32 orig_tab_offset; + /* Offset of table with start offsets of translated strings. */ + nls_uint32 trans_tab_offset; + /* Size of hash table. */ + nls_uint32 hash_tab_size; + /* Offset of first hash table entry. */ + nls_uint32 hash_tab_offset; + + /* The following are only used in .mo files with minor revision >= 1. */ + + /* The number of system dependent segments. */ + nls_uint32 n_sysdep_segments; + /* Offset of table describing system dependent segments. */ + nls_uint32 sysdep_segments_offset; + /* The number of system dependent strings pairs. */ + nls_uint32 n_sysdep_strings; + /* Offset of table with start offsets of original sysdep strings. */ + nls_uint32 orig_sysdep_tab_offset; + /* Offset of table with start offsets of translated sysdep strings. */ + nls_uint32 trans_sysdep_tab_offset; +}; + +/* Descriptor for static string contained in the binary .mo file. */ +struct string_desc +{ + /* Length of addressed string, not including the trailing NUL. */ + nls_uint32 length; + /* Offset of string in file. */ + nls_uint32 offset; +}; + +/* The following are only used in .mo files with minor revision >= 1. */ + +/* Descriptor for system dependent string segment. */ +struct sysdep_segment +{ + /* Length of addressed string, including the trailing NUL. */ + nls_uint32 length; + /* Offset of string in file. */ + nls_uint32 offset; +}; + +/* Descriptor for system dependent string. */ +struct sysdep_string +{ + /* Offset of static string segments in file. */ + nls_uint32 offset; + /* Alternating sequence of static and system dependent segments. + The last segment is a static segment, including the trailing NUL. */ + struct segment_pair + { + /* Size of static segment. */ + nls_uint32 segsize; + /* Reference to system dependent string segment, or ~0 at the end. */ + nls_uint32 sysdepref; + } segments[1]; +}; + +/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF, + regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */ +#define SEGMENTS_END ((nls_uint32) ~0) + +/* @@ begin of epilog @@ */ + +#endif /* gettext.h */ diff -urpP gnupg-1.2.5/intl/hash-string.h gnupg-1.2.6/intl/hash-string.h --- gnupg-1.2.5/intl/hash-string.h 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/hash-string.h 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Description of GNU message catalog format: string hashing function. - Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -18,14 +18,6 @@ /* @@ end of prolog @@ */ -#ifndef PARAMS -# if __STDC__ -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - /* We assume to have `unsigned long int' value with at least 32 bits. */ #define HASHWORDBITS 32 @@ -33,11 +25,8 @@ /* Defines the so called `hashpjw' function by P.J. Weinberger [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, 1986, 1987 Bell Telephone Laboratories, Inc.] */ -static unsigned long int hash_string PARAMS ((const char *__str_param)); - static inline unsigned long int -hash_string (str_param) - const char *str_param; +hash_string (const char *str_param) { unsigned long int hval, g; const char *str = str_param; @@ -47,7 +36,7 @@ hash_string (str_param) while (*str != '\0') { hval <<= 4; - hval += (unsigned long int) *str++; + hval += (unsigned char) *str++; g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); if (g != 0) { diff -urpP gnupg-1.2.5/intl/intl-compat.c gnupg-1.2.6/intl/intl-compat.c --- gnupg-1.2.5/intl/intl-compat.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/intl-compat.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,6 +1,6 @@ /* intl-compat.c - Stub functions to call gettext functions from GNU gettext Library. - Copyright (C) 1995, 2000, 2001 Software Foundation, Inc. + Copyright (C) 1995, 2000-2003 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 @@ -21,52 +21,18 @@ # include #endif -#include "libgnuintl.h" #include "gettextP.h" /* @@ end of prolog @@ */ -/* This file redirects the gettext functions (without prefix or suffix) to - those defined in the included GNU gettext library (with "__" suffix). - It is compiled into libintl when the included GNU gettext library is - configured --with-included-gettext. - - This redirection works also in the case that the system C library or - the system libintl library contain gettext/textdomain/... functions. - If it didn't, we would need to add preprocessor level redirections to - libgnuintl.h of the following form: - -# define gettext gettext__ -# define dgettext dgettext__ -# define dcgettext dcgettext__ -# define ngettext ngettext__ -# define dngettext dngettext__ -# define dcngettext dcngettext__ -# define textdomain textdomain__ -# define bindtextdomain bindtextdomain__ -# define bind_textdomain_codeset bind_textdomain_codeset__ - - How does this redirection work? There are two cases. - A. When libintl.a is linked into an executable, it works because - functions defined in the executable always override functions in - the shared libraries. - B. When libintl.so is used, it works because - 1. those systems defining gettext/textdomain/... in the C library - (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are - ELF systems and define these symbols as weak, thus explicitly - letting other shared libraries override it. - 2. those systems defining gettext/textdomain/... in a standalone - libintl.so library (namely, Solaris 2.3 and newer) have this - shared library in /usr/lib, and the linker will search /usr/lib - *after* the directory where the GNU gettext library is installed. - - A third case, namely when libintl.a is linked into a shared library - whose name is not libintl.so, is not supported. In this case, on - Solaris, when -lintl precedes the linker option for the shared library - containing GNU gettext, the system's gettext would indeed override - the GNU gettext. Anyone doing this kind of stuff must be clever enough - to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker - command line. */ +/* This file redirects the gettext functions (without prefix) to those + defined in the included GNU libintl library (with "libintl_" prefix). + It is compiled into libintl in order to make the AM_GNU_GETTEXT test + of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which + has the redirections primarily in the include file. + It is also compiled into libgnuintl so that libgnuintl.so can be used + as LD_PRELOADable library on glibc systems, to provide the extra + features that the functions in the libc don't have (namely, logging). */ #undef gettext @@ -80,87 +46,86 @@ #undef bind_textdomain_codeset +/* When building a DLL, we must export some functions. Note that because + the functions are only defined for binary backward compatibility, we + don't need to use __declspec(dllimport) in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define DLL_EXPORTED __declspec(dllexport) +#else +# define DLL_EXPORTED +#endif + + +DLL_EXPORTED char * -gettext (msgid) - const char *msgid; +gettext (const char *msgid) { - return gettext__ (msgid); + return libintl_gettext (msgid); } +DLL_EXPORTED char * -dgettext (domainname, msgid) - const char *domainname; - const char *msgid; +dgettext (const char *domainname, const char *msgid) { - return dgettext__ (domainname, msgid); + return libintl_dgettext (domainname, msgid); } +DLL_EXPORTED char * -dcgettext (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; +dcgettext (const char *domainname, const char *msgid, int category) { - return dcgettext__ (domainname, msgid, category); + return libintl_dcgettext (domainname, msgid, category); } +DLL_EXPORTED char * -ngettext (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; +ngettext (const char *msgid1, const char *msgid2, unsigned long int n) { - return ngettext__ (msgid1, msgid2, n); + return libintl_ngettext (msgid1, msgid2, n); } +DLL_EXPORTED char * -dngettext (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; +dngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) { - return dngettext__ (domainname, msgid1, msgid2, n); + return libintl_dngettext (domainname, msgid1, msgid2, n); } +DLL_EXPORTED char * -dcngettext (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; +dcngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) { - return dcngettext__ (domainname, msgid1, msgid2, n, category); + return libintl_dcngettext (domainname, msgid1, msgid2, n, category); } +DLL_EXPORTED char * -textdomain (domainname) - const char *domainname; +textdomain (const char *domainname) { - return textdomain__ (domainname); + return libintl_textdomain (domainname); } +DLL_EXPORTED char * -bindtextdomain (domainname, dirname) - const char *domainname; - const char *dirname; +bindtextdomain (const char *domainname, const char *dirname) { - return bindtextdomain__ (domainname, dirname); + return libintl_bindtextdomain (domainname, dirname); } +DLL_EXPORTED char * -bind_textdomain_codeset (domainname, codeset) - const char *domainname; - const char *codeset; +bind_textdomain_codeset (const char *domainname, const char *codeset) { - return bind_textdomain_codeset__ (domainname, codeset); + return libintl_bind_textdomain_codeset (domainname, codeset); } diff -urpP gnupg-1.2.5/intl/l10nflist.c gnupg-1.2.6/intl/l10nflist.c --- gnupg-1.2.5/intl/l10nflist.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/l10nflist.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -28,11 +28,6 @@ #endif #include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif #if defined _LIBC || defined HAVE_ARGZ_H # include @@ -63,20 +58,34 @@ # endif #else # ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); +static char *stpcpy (char *dest, const char *src); # endif #endif +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, + it may be concatenated to a directory pathname. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) +#endif + /* Define function which are usually not available. */ #if !defined _LIBC && !defined HAVE___ARGZ_COUNT /* Returns the number of strings in ARGZ. */ -static size_t argz_count__ PARAMS ((const char *argz, size_t len)); - static size_t -argz_count__ (argz, len) - const char *argz; - size_t len; +argz_count__ (const char *argz, size_t len) { size_t count = 0; while (len > 0) @@ -90,18 +99,17 @@ argz_count__ (argz, len) } # undef __argz_count # define __argz_count(argz, len) argz_count__ (argz, len) +#else +# ifdef _LIBC +# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len) +# endif #endif /* !_LIBC && !HAVE___ARGZ_COUNT */ #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's except the last into the character SEP. */ -static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); - static void -argz_stringify__ (argz, len, sep) - char *argz; - size_t len; - int sep; +argz_stringify__ (char *argz, size_t len, int sep) { while (len > 0) { @@ -114,17 +122,16 @@ argz_stringify__ (argz, len, sep) } # undef __argz_stringify # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) +#else +# ifdef _LIBC +# define __argz_stringify(argz, len, sep) \ + INTUSE(__argz_stringify) (argz, len, sep) +# endif #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ #if !defined _LIBC && !defined HAVE___ARGZ_NEXT -static char *argz_next__ PARAMS ((char *argz, size_t argz_len, - const char *entry)); - static char * -argz_next__ (argz, argz_len, entry) - char *argz; - size_t argz_len; - const char *entry; +argz_next__ (char *argz, size_t argz_len, const char *entry) { if (entry) { @@ -145,11 +152,8 @@ argz_next__ (argz, argz_len, entry) /* Return number of bits set in X. */ -static int pop PARAMS ((int x)); - static inline int -pop (x) - int x; +pop (int x) { /* We assume that no more than 16 bits are used. */ x = ((x & ~0x5555) >> 1) + (x & 0x5555); @@ -162,31 +166,27 @@ pop (x) struct loaded_l10nfile * -_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, - territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, do_allocate) - struct loaded_l10nfile **l10nfile_list; - const char *dirlist; - size_t dirlist_len; - int mask; - const char *language; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *modifier; - const char *special; - const char *sponsor; - const char *revision; - const char *filename; - int do_allocate; +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, + int mask, const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate) { char *abs_filename; - struct loaded_l10nfile *last = NULL; + struct loaded_l10nfile **lastp; struct loaded_l10nfile *retval; char *cp; + size_t dirlist_count; size_t entries; int cnt; + /* If LANGUAGE contains an absolute directory specification, we ignore + DIRLIST. */ + if (IS_ABSOLUTE_PATH (language)) + dirlist_len = 0; + /* Allocate room for the full file name. */ abs_filename = (char *) malloc (dirlist_len + strlen (language) @@ -204,7 +204,7 @@ _nl_make_l10nflist (l10nfile_list, dirli + (((mask & CEN_SPONSOR) != 0 || (mask & CEN_REVISION) != 0) ? (1 + ((mask & CEN_SPONSOR) != 0 - ? strlen (sponsor) + 1 : 0) + ? strlen (sponsor) : 0) + ((mask & CEN_REVISION) != 0 ? strlen (revision) + 1 : 0)) : 0) + 1 + strlen (filename) + 1); @@ -212,14 +212,16 @@ _nl_make_l10nflist (l10nfile_list, dirli if (abs_filename == NULL) return NULL; - retval = NULL; - last = NULL; - /* Construct file name. */ - memcpy (abs_filename, dirlist, dirlist_len); - __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR); - cp = abs_filename + (dirlist_len - 1); - *cp++ = '/'; + cp = abs_filename; + if (dirlist_len > 0) + { + memcpy (cp, dirlist, dirlist_len); + __argz_stringify (cp, dirlist_len, PATH_SEPARATOR); + cp += dirlist_len; + cp[-1] = '/'; + } + cp = stpcpy (cp, language); if ((mask & TERRITORY) != 0) @@ -266,7 +268,7 @@ _nl_make_l10nflist (l10nfile_list, dirli /* Look in list of already loaded domains whether it is already available. */ - last = NULL; + lastp = l10nfile_list; for (retval = *l10nfile_list; retval != NULL; retval = retval->next) if (retval->filename != NULL) { @@ -281,7 +283,7 @@ _nl_make_l10nflist (l10nfile_list, dirli break; } - last = retval; + lastp = &retval->next; } if (retval != NULL || do_allocate == 0) @@ -290,48 +292,66 @@ _nl_make_l10nflist (l10nfile_list, dirli return retval; } - retval = (struct loaded_l10nfile *) - malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) - * (1 << pop (mask)) - * sizeof (struct loaded_l10nfile *))); + dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1); + + /* Allocate a new loaded_l10nfile. */ + retval = + (struct loaded_l10nfile *) + malloc (sizeof (*retval) + + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0)) + * sizeof (struct loaded_l10nfile *))); if (retval == NULL) return NULL; retval->filename = abs_filename; - retval->decided = (__argz_count (dirlist, dirlist_len) != 1 + + /* We set retval->data to NULL here; it is filled in later. + Setting retval->decided to 1 here means that retval does not + correspond to a real file (dirlist_count > 1) or is not worth + looking up (if an unnormalized codeset was specified). */ + retval->decided = (dirlist_count > 1 || ((mask & XPG_CODESET) != 0 && (mask & XPG_NORM_CODESET) != 0)); retval->data = NULL; - if (last == NULL) - { - retval->next = *l10nfile_list; - *l10nfile_list = retval; - } - else - { - retval->next = last->next; - last->next = retval; - } + retval->next = *lastp; + *lastp = retval; entries = 0; - /* If the DIRLIST is a real list the RETVAL entry corresponds not to - a real file. So we have to use the DIRLIST separation mechanism - of the inner loop. */ - cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; - for (; cnt >= 0; --cnt) + /* Recurse to fill the inheritance list of RETVAL. + If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL + entry does not correspond to a real file; retval->filename contains + colons. In this case we loop across all elements of DIRLIST and + across all bit patterns dominated by MASK. + If the DIRLIST is a single directory or entirely redundant (i.e. + DIRLIST_COUNT == 1), we loop across all bit patterns dominated by + MASK, excluding MASK itself. + In either case, we loop down from MASK to 0. This has the effect + that the extra bits in the locale name are dropped in this order: + first the modifier, then the territory, then the codeset, then the + normalized_codeset. */ + for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt) if ((cnt & ~mask) == 0 && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) { - /* Iterate over all elements of the DIRLIST. */ - char *dir = NULL; + if (dirlist_count > 1) + { + /* Iterate over all elements of the DIRLIST. */ + char *dir = NULL; - while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) - != NULL) + while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) + != NULL) + retval->successor[entries++] + = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, + cnt, language, territory, codeset, + normalized_codeset, modifier, special, + sponsor, revision, filename, 1); + } + else retval->successor[entries++] - = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, - language, territory, codeset, + = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, + cnt, language, territory, codeset, normalized_codeset, modifier, special, sponsor, revision, filename, 1); } @@ -345,9 +365,7 @@ _nl_make_l10nflist (l10nfile_list, dirli names. The return value is dynamically allocated and has to be freed by the caller. */ const char * -_nl_normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; +_nl_normalize_codeset (const char *codeset, size_t name_len) { int len = 0; int only_digit = 1; @@ -356,11 +374,11 @@ _nl_normalize_codeset (codeset, name_len size_t cnt; for (cnt = 0; cnt < name_len; ++cnt) - if (isalnum (codeset[cnt])) + if (isalnum ((unsigned char) codeset[cnt])) { ++len; - if (isalpha (codeset[cnt])) + if (isalpha ((unsigned char) codeset[cnt])) only_digit = 0; } @@ -374,9 +392,9 @@ _nl_normalize_codeset (codeset, name_len wp = retval; for (cnt = 0; cnt < name_len; ++cnt) - if (isalpha (codeset[cnt])) - *wp++ = tolower (codeset[cnt]); - else if (isdigit (codeset[cnt])) + if (isalpha ((unsigned char) codeset[cnt])) + *wp++ = tolower ((unsigned char) codeset[cnt]); + else if (isdigit ((unsigned char) codeset[cnt])) *wp++ = codeset[cnt]; *wp = '\0'; @@ -394,9 +412,7 @@ _nl_normalize_codeset (codeset, name_len to be defined. */ #if !_LIBC && !HAVE_STPCPY static char * -stpcpy (dest, src) - char *dest; - const char *src; +stpcpy (char *dest, const char *src) { while ((*dest++ = *src++) != '\0') /* Do nothing. */ ; Only in gnupg-1.2.5/intl: libgettext.h Only in gnupg-1.2.5/intl: libgnuintl.h diff -urpP gnupg-1.2.5/intl/libgnuintl.h.in gnupg-1.2.6/intl/libgnuintl.h.in --- gnupg-1.2.5/intl/libgnuintl.h.in 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/libgnuintl.h.in 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,383 @@ +/* Message catalogs for internationalization. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LIBINTL_H +#define _LIBINTL_H 1 + +#include + +/* The LC_MESSAGES locale category is the category used by the functions + gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. + On systems that don't define it, use an arbitrary value instead. + On Solaris, defines __LOCALE_H (or _LOCALE_H in Solaris 2.5) + then includes (i.e. this file!) and then only defines + LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES + in this case. */ +#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun)) +# define LC_MESSAGES 1729 +#endif + +/* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ +#define __USE_GNU_GETTEXT 1 + +/* Provide information about the supported file formats. Returns the + maximum minor revision number supported for a given major revision. */ +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \ + ((major) == 0 ? 1 : -1) + +/* Resolve a platform specific conflict on DJGPP. GNU gettext takes + precedence over _conio_gettext. */ +#ifdef __DJGPP__ +# undef gettext +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +/* We redirect the functions to those prefixed with "libintl_". This is + necessary, because some systems define gettext/textdomain/... in the C + library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer). + If we used the unprefixed names, there would be cases where the + definition in the C library would override the one in the libintl.so + shared library. Recall that on ELF systems, the symbols are looked + up in the following order: + 1. in the executable, + 2. in the shared libraries specified on the link command line, in order, + 3. in the dependencies of the shared libraries specified on the link + command line, + 4. in the dlopen()ed shared libraries, in the order in which they were + dlopen()ed. + The definition in the C library would override the one in libintl.so if + either + * -lc is given on the link command line and -lintl isn't, or + * -lc is given on the link command line before -lintl, or + * libintl.so is a dependency of a dlopen()ed shared library but not + linked to the executable at link time. + Since Solaris gettext() behaves differently than GNU gettext(), this + would be unacceptable. + + The redirection happens by default through macros in C, so that &gettext + is independent of the compilation unit, but through inline functions in + C++, in order not to interfere with the name mangling of class fields or + class methods called 'gettext'. */ + +/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS. + If he doesn't, we choose the method. A third possible method is + _INTL_REDIRECT_ASM, supported only by GCC. */ +#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) +# define _INTL_REDIRECT_ASM +# else +# ifdef __cplusplus +# define _INTL_REDIRECT_INLINE +# else +# define _INTL_REDIRECT_MACROS +# endif +# endif +#endif +/* Auxiliary macros. */ +#ifdef _INTL_REDIRECT_ASM +# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname)) +# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring +# define _INTL_STRINGIFY(prefix) #prefix +#else +# define _INTL_ASM(cname) +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_gettext (const char *__msgid); +static inline char *gettext (const char *__msgid) +{ + return libintl_gettext (__msgid); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define gettext libintl_gettext +#endif +extern char *gettext (const char *__msgid) + _INTL_ASM (libintl_gettext); +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dgettext (const char *__domainname, const char *__msgid); +static inline char *dgettext (const char *__domainname, const char *__msgid) +{ + return libintl_dgettext (__domainname, __msgid); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dgettext libintl_dgettext +#endif +extern char *dgettext (const char *__domainname, const char *__msgid) + _INTL_ASM (libintl_dgettext); +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dcgettext (const char *__domainname, const char *__msgid, + int __category); +static inline char *dcgettext (const char *__domainname, const char *__msgid, + int __category) +{ + return libintl_dcgettext (__domainname, __msgid, __category); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dcgettext libintl_dcgettext +#endif +extern char *dcgettext (const char *__domainname, const char *__msgid, + int __category) + _INTL_ASM (libintl_dcgettext); +#endif + + +/* Similar to `gettext' but select the plural form corresponding to the + number N. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n); +static inline char *ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n) +{ + return libintl_ngettext (__msgid1, __msgid2, __n); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define ngettext libintl_ngettext +#endif +extern char *ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n) + _INTL_ASM (libintl_ngettext); +#endif + +/* Similar to `dgettext' but select the plural form corresponding to the + number N. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dngettext (const char *__domainname, const char *__msgid1, + const char *__msgid2, unsigned long int __n); +static inline char *dngettext (const char *__domainname, const char *__msgid1, + const char *__msgid2, unsigned long int __n) +{ + return libintl_dngettext (__domainname, __msgid1, __msgid2, __n); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dngettext libintl_dngettext +#endif +extern char *dngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n) + _INTL_ASM (libintl_dngettext); +#endif + +/* Similar to `dcgettext' but select the plural form corresponding to the + number N. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category); +static inline char *dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) +{ + return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dcngettext libintl_dcngettext +#endif +extern char *dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) + _INTL_ASM (libintl_dcngettext); +#endif + + +/* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_textdomain (const char *__domainname); +static inline char *textdomain (const char *__domainname) +{ + return libintl_textdomain (__domainname); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define textdomain libintl_textdomain +#endif +extern char *textdomain (const char *__domainname) + _INTL_ASM (libintl_textdomain); +#endif + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_bindtextdomain (const char *__domainname, + const char *__dirname); +static inline char *bindtextdomain (const char *__domainname, + const char *__dirname) +{ + return libintl_bindtextdomain (__domainname, __dirname); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define bindtextdomain libintl_bindtextdomain +#endif +extern char *bindtextdomain (const char *__domainname, const char *__dirname) + _INTL_ASM (libintl_bindtextdomain); +#endif + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_bind_textdomain_codeset (const char *__domainname, + const char *__codeset); +static inline char *bind_textdomain_codeset (const char *__domainname, + const char *__codeset) +{ + return libintl_bind_textdomain_codeset (__domainname, __codeset); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define bind_textdomain_codeset libintl_bind_textdomain_codeset +#endif +extern char *bind_textdomain_codeset (const char *__domainname, + const char *__codeset) + _INTL_ASM (libintl_bind_textdomain_codeset); +#endif + + +/* Support for format strings with positions in *printf(), following the + POSIX/XSI specification. + Note: These replacements for the *printf() functions are visible only + in source files that #include or #include "gettext.h". + Packages that use *printf() in source files that don't refer to _() + or gettext() but for which the format string could be the return value + of _() or gettext() need to add this #include. Oh well. */ + +#if !@HAVE_POSIX_PRINTF@ + +#include +#include + +/* Get va_list. */ +#if __STDC__ || defined __cplusplus || defined _MSC_VER +# include +#else +# include +#endif + +#undef fprintf +#define fprintf libintl_fprintf +extern int fprintf (FILE *, const char *, ...); +#undef vfprintf +#define vfprintf libintl_vfprintf +extern int vfprintf (FILE *, const char *, va_list); + +#undef printf +#define printf libintl_printf +extern int printf (const char *, ...); +#undef vprintf +#define vprintf libintl_vprintf +extern int vprintf (const char *, va_list); + +#undef sprintf +#define sprintf libintl_sprintf +extern int sprintf (char *, const char *, ...); +#undef vsprintf +#define vsprintf libintl_vsprintf +extern int vsprintf (char *, const char *, va_list); + +#if @HAVE_SNPRINTF@ + +#undef snprintf +#define snprintf libintl_snprintf +extern int snprintf (char *, size_t, const char *, ...); +#undef vsnprintf +#define vsnprintf libintl_vsnprintf +extern int vsnprintf (char *, size_t, const char *, va_list); + +#endif + +#if @HAVE_ASPRINTF@ + +#undef asprintf +#define asprintf libintl_asprintf +extern int asprintf (char **, const char *, ...); +#undef vasprintf +#define vasprintf libintl_vasprintf +extern int vasprintf (char **, const char *, va_list); + +#endif + +#if @HAVE_WPRINTF@ + +#undef fwprintf +#define fwprintf libintl_fwprintf +extern int fwprintf (FILE *, const wchar_t *, ...); +#undef vfwprintf +#define vfwprintf libintl_vfwprintf +extern int vfwprintf (FILE *, const wchar_t *, va_list); + +#undef wprintf +#define wprintf libintl_wprintf +extern int wprintf (const wchar_t *, ...); +#undef vwprintf +#define vwprintf libintl_vwprintf +extern int vwprintf (const wchar_t *, va_list); + +#undef swprintf +#define swprintf libintl_swprintf +extern int swprintf (wchar_t *, size_t, const wchar_t *, ...); +#undef vswprintf +#define vswprintf libintl_vswprintf +extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); + +#endif + +#endif + + +/* Support for relocatable packages. */ + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +#define libintl_set_relocation_prefix libintl_set_relocation_prefix +extern void + libintl_set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + + +#ifdef __cplusplus +} +#endif + +#endif /* libintl.h */ diff -urpP gnupg-1.2.5/intl/loadinfo.h gnupg-1.2.6/intl/loadinfo.h --- gnupg-1.2.5/intl/loadinfo.h 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/loadinfo.h 2004-08-09 15:28:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -20,13 +20,17 @@ #ifndef _LOADINFO_H #define _LOADINFO_H 1 -#ifndef PARAMS -# if __STDC__ -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif +/* Declarations of locale dependent catalog lookup functions. + Implemented in + + localealias.c Possibly replace a locale name by another. + explodename.c Split a locale name into its various fields. + l10nflist.c Generate a list of filenames of possible message catalogs. + finddomain.c Find and open the relevant message catalogs. + + The main function _nl_find_domain() in finddomain.c is declared + in gettextP.h. + */ #ifndef internal_function # define internal_function @@ -77,33 +81,65 @@ struct loaded_l10nfile names. Normalization allows the user to use any of the common names. The return value is dynamically allocated and has to be freed by the caller. */ -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, - size_t name_len)); +extern const char *_nl_normalize_codeset (const char *codeset, + size_t name_len); +/* Lookup a locale dependent file. + *L10NFILE_LIST denotes a pool of lookup results of locale dependent + files of the same kind, sorted in decreasing order of ->filename. + DIRLIST and DIRLIST_LEN are an argz list of directories in which to + look, containing at least one directory (i.e. DIRLIST_LEN > 0). + MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER, + SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as + produced by _nl_explode_name(). FILENAME is the filename suffix. + The return value is the lookup result, either found in *L10NFILE_LIST, + or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL. + If the return value is non-NULL, it is added to *L10NFILE_LIST, and + its ->next field denotes the chaining inside *L10NFILE_LIST, and + furthermore its ->successor[] field contains a list of other lookup + results from which this lookup result inherits. */ extern struct loaded_l10nfile * -_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, - const char *dirlist, size_t dirlist_len, int mask, - const char *language, const char *territory, - const char *codeset, - const char *normalized_codeset, - const char *modifier, const char *special, - const char *sponsor, const char *revision, - const char *filename, int do_allocate)); - - -extern const char *_nl_expand_alias PARAMS ((const char *name)); - -/* normalized_codeset is dynamically allocated and has to be freed by - the caller. */ -extern int _nl_explode_name PARAMS ((char *name, const char **language, - const char **modifier, - const char **territory, - const char **codeset, - const char **normalized_codeset, - const char **special, - const char **sponsor, - const char **revision)); - -extern char *_nl_find_language PARAMS ((const char *name)); +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, int mask, + const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate); + +/* Lookup the real locale name for a locale alias NAME, or NULL if + NAME is not a locale alias (but possibly a real locale name). + The return value is statically allocated and must not be freed. */ +extern const char *_nl_expand_alias (const char *name); + +/* Split a locale name NAME into its pieces: language, modifier, + territory, codeset, special, sponsor, revision. + NAME gets destructively modified: NUL bytes are inserted here and + there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY, + *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a + pointer into the old NAME string, or NULL. *NORMALIZED_CODESET + gets assigned the expanded *CODESET, if it is different from *CODESET; + this one is dynamically allocated and has to be freed by the caller. + The return value is a bitmask, where each bit corresponds to one + filled-in value: + XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER, + TERRITORY for *TERRITORY, + XPG_CODESET for *CODESET, + XPG_NORM_CODESET for *NORMALIZED_CODESET, + CEN_SPECIAL for *SPECIAL, + CEN_SPONSOR for *SPONSOR, + CEN_REVISION for *REVISION. + */ +extern int _nl_explode_name (char *name, const char **language, + const char **modifier, const char **territory, + const char **codeset, + const char **normalized_codeset, + const char **special, const char **sponsor, + const char **revision); + +/* Split a locale name NAME into a leading language part and all the + rest. Return a pointer to the first character after the language, + i.e. to the first byte of the rest. */ +extern char *_nl_find_language (const char *name); #endif /* loadinfo.h */ diff -urpP gnupg-1.2.5/intl/loadmsgcat.c gnupg-1.2.6/intl/loadmsgcat.c --- gnupg-1.2.5/intl/loadmsgcat.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/loadmsgcat.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Load needed message catalogs. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -34,17 +34,23 @@ #include #ifdef __GNUC__ +# undef alloca # define alloca __builtin_alloca # define HAVE_ALLOCA 1 #else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if defined HAVE_ALLOCA_H || defined _LIBC +# include # else -# ifndef alloca +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca char *alloca (); +# endif # endif # endif # endif @@ -71,13 +77,380 @@ char *alloca (); # undef HAVE_MMAP #endif -#include "gettext.h" +#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC +# include +#endif +#if defined HAVE_INTTYPES_H || defined _LIBC +# include +#endif + +#include "gmo.h" #include "gettextP.h" +#include "hash-string.h" +#include "plural-exp.h" #ifdef _LIBC # include "../locale/localeinfo.h" #endif +/* Provide fallback values for macros that ought to be defined in . + Note that our fallback values need not be literal strings, because we don't + use them with preprocessor string concatenation. */ +#if !defined PRId8 || PRI_MACROS_BROKEN +# undef PRId8 +# define PRId8 "d" +#endif +#if !defined PRIi8 || PRI_MACROS_BROKEN +# undef PRIi8 +# define PRIi8 "i" +#endif +#if !defined PRIo8 || PRI_MACROS_BROKEN +# undef PRIo8 +# define PRIo8 "o" +#endif +#if !defined PRIu8 || PRI_MACROS_BROKEN +# undef PRIu8 +# define PRIu8 "u" +#endif +#if !defined PRIx8 || PRI_MACROS_BROKEN +# undef PRIx8 +# define PRIx8 "x" +#endif +#if !defined PRIX8 || PRI_MACROS_BROKEN +# undef PRIX8 +# define PRIX8 "X" +#endif +#if !defined PRId16 || PRI_MACROS_BROKEN +# undef PRId16 +# define PRId16 "d" +#endif +#if !defined PRIi16 || PRI_MACROS_BROKEN +# undef PRIi16 +# define PRIi16 "i" +#endif +#if !defined PRIo16 || PRI_MACROS_BROKEN +# undef PRIo16 +# define PRIo16 "o" +#endif +#if !defined PRIu16 || PRI_MACROS_BROKEN +# undef PRIu16 +# define PRIu16 "u" +#endif +#if !defined PRIx16 || PRI_MACROS_BROKEN +# undef PRIx16 +# define PRIx16 "x" +#endif +#if !defined PRIX16 || PRI_MACROS_BROKEN +# undef PRIX16 +# define PRIX16 "X" +#endif +#if !defined PRId32 || PRI_MACROS_BROKEN +# undef PRId32 +# define PRId32 "d" +#endif +#if !defined PRIi32 || PRI_MACROS_BROKEN +# undef PRIi32 +# define PRIi32 "i" +#endif +#if !defined PRIo32 || PRI_MACROS_BROKEN +# undef PRIo32 +# define PRIo32 "o" +#endif +#if !defined PRIu32 || PRI_MACROS_BROKEN +# undef PRIu32 +# define PRIu32 "u" +#endif +#if !defined PRIx32 || PRI_MACROS_BROKEN +# undef PRIx32 +# define PRIx32 "x" +#endif +#if !defined PRIX32 || PRI_MACROS_BROKEN +# undef PRIX32 +# define PRIX32 "X" +#endif +#if !defined PRId64 || PRI_MACROS_BROKEN +# undef PRId64 +# define PRId64 (sizeof (long) == 8 ? "ld" : "lld") +#endif +#if !defined PRIi64 || PRI_MACROS_BROKEN +# undef PRIi64 +# define PRIi64 (sizeof (long) == 8 ? "li" : "lli") +#endif +#if !defined PRIo64 || PRI_MACROS_BROKEN +# undef PRIo64 +# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo") +#endif +#if !defined PRIu64 || PRI_MACROS_BROKEN +# undef PRIu64 +# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu") +#endif +#if !defined PRIx64 || PRI_MACROS_BROKEN +# undef PRIx64 +# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx") +#endif +#if !defined PRIX64 || PRI_MACROS_BROKEN +# undef PRIX64 +# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX") +#endif +#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN +# undef PRIdLEAST8 +# define PRIdLEAST8 "d" +#endif +#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN +# undef PRIiLEAST8 +# define PRIiLEAST8 "i" +#endif +#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN +# undef PRIoLEAST8 +# define PRIoLEAST8 "o" +#endif +#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN +# undef PRIuLEAST8 +# define PRIuLEAST8 "u" +#endif +#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN +# undef PRIxLEAST8 +# define PRIxLEAST8 "x" +#endif +#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN +# undef PRIXLEAST8 +# define PRIXLEAST8 "X" +#endif +#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN +# undef PRIdLEAST16 +# define PRIdLEAST16 "d" +#endif +#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN +# undef PRIiLEAST16 +# define PRIiLEAST16 "i" +#endif +#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN +# undef PRIoLEAST16 +# define PRIoLEAST16 "o" +#endif +#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN +# undef PRIuLEAST16 +# define PRIuLEAST16 "u" +#endif +#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN +# undef PRIxLEAST16 +# define PRIxLEAST16 "x" +#endif +#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN +# undef PRIXLEAST16 +# define PRIXLEAST16 "X" +#endif +#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN +# undef PRIdLEAST32 +# define PRIdLEAST32 "d" +#endif +#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN +# undef PRIiLEAST32 +# define PRIiLEAST32 "i" +#endif +#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN +# undef PRIoLEAST32 +# define PRIoLEAST32 "o" +#endif +#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN +# undef PRIuLEAST32 +# define PRIuLEAST32 "u" +#endif +#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN +# undef PRIxLEAST32 +# define PRIxLEAST32 "x" +#endif +#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN +# undef PRIXLEAST32 +# define PRIXLEAST32 "X" +#endif +#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN +# undef PRIdLEAST64 +# define PRIdLEAST64 PRId64 +#endif +#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN +# undef PRIiLEAST64 +# define PRIiLEAST64 PRIi64 +#endif +#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN +# undef PRIoLEAST64 +# define PRIoLEAST64 PRIo64 +#endif +#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN +# undef PRIuLEAST64 +# define PRIuLEAST64 PRIu64 +#endif +#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN +# undef PRIxLEAST64 +# define PRIxLEAST64 PRIx64 +#endif +#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN +# undef PRIXLEAST64 +# define PRIXLEAST64 PRIX64 +#endif +#if !defined PRIdFAST8 || PRI_MACROS_BROKEN +# undef PRIdFAST8 +# define PRIdFAST8 "d" +#endif +#if !defined PRIiFAST8 || PRI_MACROS_BROKEN +# undef PRIiFAST8 +# define PRIiFAST8 "i" +#endif +#if !defined PRIoFAST8 || PRI_MACROS_BROKEN +# undef PRIoFAST8 +# define PRIoFAST8 "o" +#endif +#if !defined PRIuFAST8 || PRI_MACROS_BROKEN +# undef PRIuFAST8 +# define PRIuFAST8 "u" +#endif +#if !defined PRIxFAST8 || PRI_MACROS_BROKEN +# undef PRIxFAST8 +# define PRIxFAST8 "x" +#endif +#if !defined PRIXFAST8 || PRI_MACROS_BROKEN +# undef PRIXFAST8 +# define PRIXFAST8 "X" +#endif +#if !defined PRIdFAST16 || PRI_MACROS_BROKEN +# undef PRIdFAST16 +# define PRIdFAST16 "d" +#endif +#if !defined PRIiFAST16 || PRI_MACROS_BROKEN +# undef PRIiFAST16 +# define PRIiFAST16 "i" +#endif +#if !defined PRIoFAST16 || PRI_MACROS_BROKEN +# undef PRIoFAST16 +# define PRIoFAST16 "o" +#endif +#if !defined PRIuFAST16 || PRI_MACROS_BROKEN +# undef PRIuFAST16 +# define PRIuFAST16 "u" +#endif +#if !defined PRIxFAST16 || PRI_MACROS_BROKEN +# undef PRIxFAST16 +# define PRIxFAST16 "x" +#endif +#if !defined PRIXFAST16 || PRI_MACROS_BROKEN +# undef PRIXFAST16 +# define PRIXFAST16 "X" +#endif +#if !defined PRIdFAST32 || PRI_MACROS_BROKEN +# undef PRIdFAST32 +# define PRIdFAST32 "d" +#endif +#if !defined PRIiFAST32 || PRI_MACROS_BROKEN +# undef PRIiFAST32 +# define PRIiFAST32 "i" +#endif +#if !defined PRIoFAST32 || PRI_MACROS_BROKEN +# undef PRIoFAST32 +# define PRIoFAST32 "o" +#endif +#if !defined PRIuFAST32 || PRI_MACROS_BROKEN +# undef PRIuFAST32 +# define PRIuFAST32 "u" +#endif +#if !defined PRIxFAST32 || PRI_MACROS_BROKEN +# undef PRIxFAST32 +# define PRIxFAST32 "x" +#endif +#if !defined PRIXFAST32 || PRI_MACROS_BROKEN +# undef PRIXFAST32 +# define PRIXFAST32 "X" +#endif +#if !defined PRIdFAST64 || PRI_MACROS_BROKEN +# undef PRIdFAST64 +# define PRIdFAST64 PRId64 +#endif +#if !defined PRIiFAST64 || PRI_MACROS_BROKEN +# undef PRIiFAST64 +# define PRIiFAST64 PRIi64 +#endif +#if !defined PRIoFAST64 || PRI_MACROS_BROKEN +# undef PRIoFAST64 +# define PRIoFAST64 PRIo64 +#endif +#if !defined PRIuFAST64 || PRI_MACROS_BROKEN +# undef PRIuFAST64 +# define PRIuFAST64 PRIu64 +#endif +#if !defined PRIxFAST64 || PRI_MACROS_BROKEN +# undef PRIxFAST64 +# define PRIxFAST64 PRIx64 +#endif +#if !defined PRIXFAST64 || PRI_MACROS_BROKEN +# undef PRIXFAST64 +# define PRIXFAST64 PRIX64 +#endif +#if !defined PRIdMAX || PRI_MACROS_BROKEN +# undef PRIdMAX +# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld") +#endif +#if !defined PRIiMAX || PRI_MACROS_BROKEN +# undef PRIiMAX +# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli") +#endif +#if !defined PRIoMAX || PRI_MACROS_BROKEN +# undef PRIoMAX +# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo") +#endif +#if !defined PRIuMAX || PRI_MACROS_BROKEN +# undef PRIuMAX +# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu") +#endif +#if !defined PRIxMAX || PRI_MACROS_BROKEN +# undef PRIxMAX +# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx") +#endif +#if !defined PRIXMAX || PRI_MACROS_BROKEN +# undef PRIXMAX +# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX") +#endif +#if !defined PRIdPTR || PRI_MACROS_BROKEN +# undef PRIdPTR +# define PRIdPTR \ + (sizeof (void *) == sizeof (long) ? "ld" : \ + sizeof (void *) == sizeof (int) ? "d" : \ + "lld") +#endif +#if !defined PRIiPTR || PRI_MACROS_BROKEN +# undef PRIiPTR +# define PRIiPTR \ + (sizeof (void *) == sizeof (long) ? "li" : \ + sizeof (void *) == sizeof (int) ? "i" : \ + "lli") +#endif +#if !defined PRIoPTR || PRI_MACROS_BROKEN +# undef PRIoPTR +# define PRIoPTR \ + (sizeof (void *) == sizeof (long) ? "lo" : \ + sizeof (void *) == sizeof (int) ? "o" : \ + "llo") +#endif +#if !defined PRIuPTR || PRI_MACROS_BROKEN +# undef PRIuPTR +# define PRIuPTR \ + (sizeof (void *) == sizeof (long) ? "lu" : \ + sizeof (void *) == sizeof (int) ? "u" : \ + "llu") +#endif +#if !defined PRIxPTR || PRI_MACROS_BROKEN +# undef PRIxPTR +# define PRIxPTR \ + (sizeof (void *) == sizeof (long) ? "lx" : \ + sizeof (void *) == sizeof (int) ? "x" : \ + "llx") +#endif +#if !defined PRIXPTR || PRI_MACROS_BROKEN +# undef PRIXPTR +# define PRIXPTR \ + (sizeof (void *) == sizeof (long) ? "lX" : \ + sizeof (void *) == sizeof (int) ? "X" : \ + "llX") +#endif + /* @@ end of prolog @@ */ #ifdef _LIBC @@ -91,16 +464,6 @@ char *alloca (); # define munmap __munmap #endif -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define PLURAL_PARSE __gettextparse -#else -# define PLURAL_PARSE gettextparse__ -#endif - /* For those losing systems which don't have `alloca' we have to add some additional code emulating it. */ #ifdef HAVE_ALLOCA @@ -127,87 +490,287 @@ char *alloca (); # define O_BINARY 0 #endif + /* We need a sign, whether a new catalog was loaded, which can be associated with all translations. This is important if the translations are cached by one of GCC's features. */ int _nl_msg_cat_cntr; -#if (defined __GNUC__ && !defined __APPLE_CC__) \ - || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) -/* These structs are the constant expression for the germanic plural - form determination. It represents the expression "n != 1". */ -static const struct expression plvar = +/* Expand a system dependent string segment. Return NULL if unsupported. */ +static const char * +get_sysdep_segment_value (const char *name) { - .nargs = 0, - .operation = var, -}; -static const struct expression plone = -{ - .nargs = 0, - .operation = num, - .val = - { - .num = 1 - } -}; -static struct expression germanic_plural = -{ - .nargs = 2, - .operation = not_equal, - .val = - { - .args = + /* Test for an ISO C 99 section 7.8.1 format string directive. + Syntax: + P R I { d | i | o | u | x | X } + { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */ + /* We don't use a table of 14 times 6 'const char *' strings here, because + data relocations cost startup time. */ + if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I') { - [0] = (struct expression *) &plvar, - [1] = (struct expression *) &plone + if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u' + || name[3] == 'x' || name[3] == 'X') + { + if (name[4] == '8' && name[5] == '\0') + { + if (name[3] == 'd') + return PRId8; + if (name[3] == 'i') + return PRIi8; + if (name[3] == 'o') + return PRIo8; + if (name[3] == 'u') + return PRIu8; + if (name[3] == 'x') + return PRIx8; + if (name[3] == 'X') + return PRIX8; + abort (); + } + if (name[4] == '1' && name[5] == '6' && name[6] == '\0') + { + if (name[3] == 'd') + return PRId16; + if (name[3] == 'i') + return PRIi16; + if (name[3] == 'o') + return PRIo16; + if (name[3] == 'u') + return PRIu16; + if (name[3] == 'x') + return PRIx16; + if (name[3] == 'X') + return PRIX16; + abort (); + } + if (name[4] == '3' && name[5] == '2' && name[6] == '\0') + { + if (name[3] == 'd') + return PRId32; + if (name[3] == 'i') + return PRIi32; + if (name[3] == 'o') + return PRIo32; + if (name[3] == 'u') + return PRIu32; + if (name[3] == 'x') + return PRIx32; + if (name[3] == 'X') + return PRIX32; + abort (); + } + if (name[4] == '6' && name[5] == '4' && name[6] == '\0') + { + if (name[3] == 'd') + return PRId64; + if (name[3] == 'i') + return PRIi64; + if (name[3] == 'o') + return PRIo64; + if (name[3] == 'u') + return PRIu64; + if (name[3] == 'x') + return PRIx64; + if (name[3] == 'X') + return PRIX64; + abort (); + } + if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A' + && name[7] == 'S' && name[8] == 'T') + { + if (name[9] == '8' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST8; + if (name[3] == 'i') + return PRIiLEAST8; + if (name[3] == 'o') + return PRIoLEAST8; + if (name[3] == 'u') + return PRIuLEAST8; + if (name[3] == 'x') + return PRIxLEAST8; + if (name[3] == 'X') + return PRIXLEAST8; + abort (); + } + if (name[9] == '1' && name[10] == '6' && name[11] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST16; + if (name[3] == 'i') + return PRIiLEAST16; + if (name[3] == 'o') + return PRIoLEAST16; + if (name[3] == 'u') + return PRIuLEAST16; + if (name[3] == 'x') + return PRIxLEAST16; + if (name[3] == 'X') + return PRIXLEAST16; + abort (); + } + if (name[9] == '3' && name[10] == '2' && name[11] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST32; + if (name[3] == 'i') + return PRIiLEAST32; + if (name[3] == 'o') + return PRIoLEAST32; + if (name[3] == 'u') + return PRIuLEAST32; + if (name[3] == 'x') + return PRIxLEAST32; + if (name[3] == 'X') + return PRIXLEAST32; + abort (); + } + if (name[9] == '6' && name[10] == '4' && name[11] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST64; + if (name[3] == 'i') + return PRIiLEAST64; + if (name[3] == 'o') + return PRIoLEAST64; + if (name[3] == 'u') + return PRIuLEAST64; + if (name[3] == 'x') + return PRIxLEAST64; + if (name[3] == 'X') + return PRIXLEAST64; + abort (); + } + } + if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S' + && name[7] == 'T') + { + if (name[8] == '8' && name[9] == '\0') + { + if (name[3] == 'd') + return PRIdFAST8; + if (name[3] == 'i') + return PRIiFAST8; + if (name[3] == 'o') + return PRIoFAST8; + if (name[3] == 'u') + return PRIuFAST8; + if (name[3] == 'x') + return PRIxFAST8; + if (name[3] == 'X') + return PRIXFAST8; + abort (); + } + if (name[8] == '1' && name[9] == '6' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdFAST16; + if (name[3] == 'i') + return PRIiFAST16; + if (name[3] == 'o') + return PRIoFAST16; + if (name[3] == 'u') + return PRIuFAST16; + if (name[3] == 'x') + return PRIxFAST16; + if (name[3] == 'X') + return PRIXFAST16; + abort (); + } + if (name[8] == '3' && name[9] == '2' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdFAST32; + if (name[3] == 'i') + return PRIiFAST32; + if (name[3] == 'o') + return PRIoFAST32; + if (name[3] == 'u') + return PRIuFAST32; + if (name[3] == 'x') + return PRIxFAST32; + if (name[3] == 'X') + return PRIXFAST32; + abort (); + } + if (name[8] == '6' && name[9] == '4' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdFAST64; + if (name[3] == 'i') + return PRIiFAST64; + if (name[3] == 'o') + return PRIoFAST64; + if (name[3] == 'u') + return PRIuFAST64; + if (name[3] == 'x') + return PRIxFAST64; + if (name[3] == 'X') + return PRIXFAST64; + abort (); + } + } + if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X' + && name[7] == '\0') + { + if (name[3] == 'd') + return PRIdMAX; + if (name[3] == 'i') + return PRIiMAX; + if (name[3] == 'o') + return PRIoMAX; + if (name[3] == 'u') + return PRIuMAX; + if (name[3] == 'x') + return PRIxMAX; + if (name[3] == 'X') + return PRIXMAX; + abort (); + } + if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R' + && name[7] == '\0') + { + if (name[3] == 'd') + return PRIdPTR; + if (name[3] == 'i') + return PRIiPTR; + if (name[3] == 'o') + return PRIoPTR; + if (name[3] == 'u') + return PRIuPTR; + if (name[3] == 'x') + return PRIxPTR; + if (name[3] == 'X') + return PRIXPTR; + abort (); + } + } } - } -}; - -# define INIT_GERMANIC_PLURAL() - -#else - -/* For compilers without support for ISO C 99 struct/union initializers: - Initialization at run-time. */ - -static struct expression plvar; -static struct expression plone; -static struct expression germanic_plural; - -static void -init_germanic_plural () -{ - if (plone.val.num == 0) + /* Test for a glibc specific printf() format directive flag. */ + if (name[0] == 'I' && name[1] == '\0') { - plvar.nargs = 0; - plvar.operation = var; - - plone.nargs = 0; - plone.operation = num; - plone.val.num = 1; - - germanic_plural.nargs = 2; - germanic_plural.operation = not_equal; - germanic_plural.val.args[0] = &plvar; - germanic_plural.val.args[1] = &plone; +#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) + /* The 'I' flag, in numeric format directives, replaces ASCII digits + with the 'outdigits' defined in the LC_CTYPE locale facet. This is + used for Farsi (Persian) and maybe Arabic. */ + return "I"; +#else + return ""; +#endif } + /* Other system dependent strings are not valid. */ + return NULL; } -# define INIT_GERMANIC_PLURAL() init_germanic_plural () - -#endif - - /* Initialize the codeset dependent parts of an opened message catalog. Return the header entry. */ const char * internal_function -_nl_init_domain_conv (domain_file, domain, domainbinding) - struct loaded_l10nfile *domain_file; - struct loaded_domain *domain; - struct binding *domainbinding; +_nl_init_domain_conv (struct loaded_l10nfile *domain_file, + struct loaded_domain *domain, + struct binding *domainbinding) { /* Find out about the character set the file is encoded with. This can be found (in textual form) in the entry "". If this @@ -268,7 +831,7 @@ _nl_init_domain_conv (domain_file, domai if (outcharset == NULL || outcharset[0] == '\0') { # ifdef _LIBC - outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; + outcharset = _NL_CURRENT (LC_CTYPE, CODESET); # else # if HAVE_ICONV extern const char *locale_charset (void); @@ -288,20 +851,27 @@ _nl_init_domain_conv (domain_file, domai domain->conv = (__gconv_t) -1; # else # if HAVE_ICONV - /* When using GNU libiconv, we want to use transliteration. */ -# if _LIBICONV_VERSION >= 0x0105 - len = strlen (outcharset); - { - char *tmp = (char *) alloca (len + 10 + 1); - memcpy (tmp, outcharset, len); - memcpy (tmp + len, "//TRANSLIT", 10 + 1); - outcharset = tmp; - } -# endif - domain->conv = iconv_open (outcharset, charset); -# if _LIBICONV_VERSION >= 0x0105 - freea (outcharset); + /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, + we want to use transliteration. */ +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ + || _LIBICONV_VERSION >= 0x0105 + if (strchr (outcharset, '/') == NULL) + { + char *tmp; + + len = strlen (outcharset); + tmp = (char *) alloca (len + 10 + 1); + memcpy (tmp, outcharset, len); + memcpy (tmp + len, "//TRANSLIT", 10 + 1); + outcharset = tmp; + + domain->conv = iconv_open (outcharset, charset); + + freea (outcharset); + } + else # endif + domain->conv = iconv_open (outcharset, charset); # endif # endif @@ -316,8 +886,7 @@ _nl_init_domain_conv (domain_file, domai /* Frees the codeset dependent parts of an opened message catalog. */ void internal_function -_nl_free_domain_conv (domain) - struct loaded_domain *domain; +_nl_free_domain_conv (struct loaded_domain *domain) { if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) free (domain->conv_tab); @@ -337,9 +906,8 @@ _nl_free_domain_conv (domain) message catalog do nothing. */ void internal_function -_nl_load_domain (domain_file, domainbinding) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; +_nl_load_domain (struct loaded_l10nfile *domain_file, + struct binding *domainbinding) { int fd; size_t size; @@ -351,6 +919,7 @@ _nl_load_domain (domain_file, domainbind struct mo_file_header *data = (struct mo_file_header *) -1; int use_mmap = 0; struct loaded_domain *domain; + int revision; const char *nullentry; domain_file->decided = 1; @@ -458,22 +1027,353 @@ _nl_load_domain (domain_file, domainbind domain->use_mmap = use_mmap; domain->mmap_size = size; domain->must_swap = data->magic != _MAGIC; + domain->malloced = NULL; /* Fill in the information about the available tables. */ - switch (W (domain->must_swap, data->revision)) + revision = W (domain->must_swap, data->revision); + /* We support only the major revisions 0 and 1. */ + switch (revision >> 16) { case 0: + case 1: domain->nstrings = W (domain->must_swap, data->nstrings); - domain->orig_tab = (struct string_desc *) + domain->orig_tab = (const struct string_desc *) ((char *) data + W (domain->must_swap, data->orig_tab_offset)); - domain->trans_tab = (struct string_desc *) + domain->trans_tab = (const struct string_desc *) ((char *) data + W (domain->must_swap, data->trans_tab_offset)); domain->hash_size = W (domain->must_swap, data->hash_tab_size); - domain->hash_tab = (nls_uint32 *) - ((char *) data + W (domain->must_swap, data->hash_tab_offset)); + domain->hash_tab = + (domain->hash_size > 2 + ? (const nls_uint32 *) + ((char *) data + W (domain->must_swap, data->hash_tab_offset)) + : NULL); + domain->must_swap_hash_tab = domain->must_swap; + + /* Now dispatch on the minor revision. */ + switch (revision & 0xffff) + { + case 0: + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + break; + case 1: + default: + { + nls_uint32 n_sysdep_strings; + + if (domain->hash_tab == NULL) + /* This is invalid. These minor revisions need a hash table. */ + goto invalid; + + n_sysdep_strings = + W (domain->must_swap, data->n_sysdep_strings); + if (n_sysdep_strings > 0) + { + nls_uint32 n_sysdep_segments; + const struct sysdep_segment *sysdep_segments; + const char **sysdep_segment_values; + const nls_uint32 *orig_sysdep_tab; + const nls_uint32 *trans_sysdep_tab; + nls_uint32 n_inmem_sysdep_strings; + size_t memneed; + char *mem; + struct sysdep_string_desc *inmem_orig_sysdep_tab; + struct sysdep_string_desc *inmem_trans_sysdep_tab; + nls_uint32 *inmem_hash_tab; + unsigned int i, j; + + /* Get the values of the system dependent segments. */ + n_sysdep_segments = + W (domain->must_swap, data->n_sysdep_segments); + sysdep_segments = (const struct sysdep_segment *) + ((char *) data + + W (domain->must_swap, data->sysdep_segments_offset)); + sysdep_segment_values = + alloca (n_sysdep_segments * sizeof (const char *)); + for (i = 0; i < n_sysdep_segments; i++) + { + const char *name = + (char *) data + + W (domain->must_swap, sysdep_segments[i].offset); + nls_uint32 namelen = + W (domain->must_swap, sysdep_segments[i].length); + + if (!(namelen > 0 && name[namelen - 1] == '\0')) + { + freea (sysdep_segment_values); + goto invalid; + } + + sysdep_segment_values[i] = get_sysdep_segment_value (name); + } + + orig_sysdep_tab = (const nls_uint32 *) + ((char *) data + + W (domain->must_swap, data->orig_sysdep_tab_offset)); + trans_sysdep_tab = (const nls_uint32 *) + ((char *) data + + W (domain->must_swap, data->trans_sysdep_tab_offset)); + + /* Compute the amount of additional memory needed for the + system dependent strings and the augmented hash table. + At the same time, also drop string pairs which refer to + an undefined system dependent segment. */ + n_inmem_sysdep_strings = 0; + memneed = domain->hash_size * sizeof (nls_uint32); + for (i = 0; i < n_sysdep_strings; i++) + { + int valid = 1; + size_t needs[2]; + + for (j = 0; j < 2; j++) + { + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + size_t need = 0; + const struct segment_pair *p = sysdep_string->segments; + + if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END) + for (p = sysdep_string->segments;; p++) + { + nls_uint32 sysdepref; + + need += W (domain->must_swap, p->segsize); + + sysdepref = W (domain->must_swap, p->sysdepref); + if (sysdepref == SEGMENTS_END) + break; + + if (sysdepref >= n_sysdep_segments) + { + /* Invalid. */ + freea (sysdep_segment_values); + goto invalid; + } + + if (sysdep_segment_values[sysdepref] == NULL) + { + /* This particular string pair is invalid. */ + valid = 0; + break; + } + + need += strlen (sysdep_segment_values[sysdepref]); + } + + needs[j] = need; + if (!valid) + break; + } + + if (valid) + { + n_inmem_sysdep_strings++; + memneed += needs[0] + needs[1]; + } + } + memneed += 2 * n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + + if (n_inmem_sysdep_strings > 0) + { + unsigned int k; + + /* Allocate additional memory. */ + mem = (char *) malloc (memneed); + if (mem == NULL) + goto invalid; + + domain->malloced = mem; + inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem; + mem += n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem; + mem += n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + inmem_hash_tab = (nls_uint32 *) mem; + mem += domain->hash_size * sizeof (nls_uint32); + + /* Compute the system dependent strings. */ + k = 0; + for (i = 0; i < n_sysdep_strings; i++) + { + int valid = 1; + + for (j = 0; j < 2; j++) + { + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + const struct segment_pair *p = + sysdep_string->segments; + + if (W (domain->must_swap, p->sysdepref) + != SEGMENTS_END) + for (p = sysdep_string->segments;; p++) + { + nls_uint32 sysdepref; + + sysdepref = + W (domain->must_swap, p->sysdepref); + if (sysdepref == SEGMENTS_END) + break; + + if (sysdep_segment_values[sysdepref] == NULL) + { + /* This particular string pair is + invalid. */ + valid = 0; + break; + } + } + + if (!valid) + break; + } + + if (valid) + { + for (j = 0; j < 2; j++) + { + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + const char *static_segments = + (char *) data + + W (domain->must_swap, sysdep_string->offset); + const struct segment_pair *p = + sysdep_string->segments; + + /* Concatenate the segments, and fill + inmem_orig_sysdep_tab[k] (for j == 0) and + inmem_trans_sysdep_tab[k] (for j == 1). */ + + struct sysdep_string_desc *inmem_tab_entry = + (j == 0 + ? inmem_orig_sysdep_tab + : inmem_trans_sysdep_tab) + + k; + + if (W (domain->must_swap, p->sysdepref) + == SEGMENTS_END) + { + /* Only one static segment. */ + inmem_tab_entry->length = + W (domain->must_swap, p->segsize); + inmem_tab_entry->pointer = static_segments; + } + else + { + inmem_tab_entry->pointer = mem; + + for (p = sysdep_string->segments;; p++) + { + nls_uint32 segsize = + W (domain->must_swap, p->segsize); + nls_uint32 sysdepref = + W (domain->must_swap, p->sysdepref); + size_t n; + + if (segsize > 0) + { + memcpy (mem, static_segments, segsize); + mem += segsize; + static_segments += segsize; + } + + if (sysdepref == SEGMENTS_END) + break; + + n = strlen (sysdep_segment_values[sysdepref]); + memcpy (mem, sysdep_segment_values[sysdepref], n); + mem += n; + } + + inmem_tab_entry->length = + mem - inmem_tab_entry->pointer; + } + } + + k++; + } + } + if (k != n_inmem_sysdep_strings) + abort (); + + /* Compute the augmented hash table. */ + for (i = 0; i < domain->hash_size; i++) + inmem_hash_tab[i] = + W (domain->must_swap_hash_tab, domain->hash_tab[i]); + for (i = 0; i < n_inmem_sysdep_strings; i++) + { + const char *msgid = inmem_orig_sysdep_tab[i].pointer; + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = + 1 + (hash_val % (domain->hash_size - 2)); + + for (;;) + { + if (inmem_hash_tab[idx] == 0) + { + /* Hash table entry is empty. Use it. */ + inmem_hash_tab[idx] = 1 + domain->nstrings + i; + break; + } + + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + } + } + + domain->n_sysdep_strings = n_inmem_sysdep_strings; + domain->orig_sysdep_tab = inmem_orig_sysdep_tab; + domain->trans_sysdep_tab = inmem_trans_sysdep_tab; + + domain->hash_tab = inmem_hash_tab; + domain->must_swap_hash_tab = 0; + } + else + { + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + } + + freea (sysdep_segment_values); + } + else + { + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + } + } + break; + } break; default: /* This is an invalid revision. */ + invalid: + /* This is an invalid .mo file. */ + if (domain->malloced) + free (domain->malloced); #ifdef HAVE_MMAP if (use_mmap) munmap ((caddr_t) data, size); @@ -491,70 +1391,23 @@ _nl_load_domain (domain_file, domainbind nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); /* Also look for a plural specification. */ - if (nullentry != NULL) - { - const char *plural; - const char *nplurals; - - plural = strstr (nullentry, "plural="); - nplurals = strstr (nullentry, "nplurals="); - if (plural == NULL || nplurals == NULL) - goto no_plural; - else - { - /* First get the number. */ - char *endp; - unsigned long int n; - struct parse_args args; - - nplurals += 9; - while (*nplurals != '\0' && isspace (*nplurals)) - ++nplurals; -#if defined HAVE_STRTOUL || defined _LIBC - n = strtoul (nplurals, &endp, 10); -#else - for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) - n = n * 10 + (*endp - '0'); -#endif - domain->nplurals = n; - if (nplurals == endp) - goto no_plural; - - /* Due to the restrictions bison imposes onto the interface of the - scanner function we have to put the input string and the result - passed up from the parser into the same structure which address - is passed down to the parser. */ - plural += 7; - args.cp = plural; - if (PLURAL_PARSE (&args) != 0) - goto no_plural; - domain->plural = args.res; - } - } - else - { - /* By default we are using the Germanic form: singular form only - for `one', the plural form otherwise. Yes, this is also what - English is using since English is a Germanic language. */ - no_plural: - INIT_GERMANIC_PLURAL (); - domain->plural = &germanic_plural; - domain->nplurals = 2; - } + EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals); } #ifdef _LIBC void internal_function -_nl_unload_domain (domain) - struct loaded_domain *domain; +_nl_unload_domain (struct loaded_domain *domain) { - if (domain->plural != &germanic_plural) + if (domain->plural != &__gettext_germanic_plural) __gettext_free_exp (domain->plural); _nl_free_domain_conv (domain); + if (domain->malloced) + free (domain->malloced); + # ifdef _POSIX_MAPPED_FILES if (domain->use_mmap) munmap ((caddr_t) domain->data, domain->mmap_size); diff -urpP gnupg-1.2.5/intl/localcharset.c gnupg-1.2.6/intl/localcharset.c --- gnupg-1.2.5/intl/localcharset.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/localcharset.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2001 Free Software Foundation, Inc. + Copyright (C) 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -17,12 +17,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Written by Bruno Haible . */ +/* Written by Bruno Haible . */ #ifdef HAVE_CONFIG_H # include #endif +/* Specification. */ +#include "localcharset.h" + #if HAVE_STDDEF_H # include #endif @@ -42,7 +45,12 @@ # define WIN32 #endif -#ifndef WIN32 +#if defined __EMX__ +/* Assume EMX program runs on OS/2, even if compiled under DOS. */ +# define OS2 +#endif + +#if !defined WIN32 # if HAVE_LANGINFO_CODESET # include # else @@ -50,10 +58,25 @@ # include # endif # endif -#else /* WIN32 */ +#elif defined WIN32 # define WIN32_LEAN_AND_MEAN # include #endif +#if defined OS2 +# define INCL_DOS +# include +#endif + +#if ENABLE_RELOCATABLE +# include "relocatable.h" +#else +# define relocate(pathname) (pathname) +#endif + +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#endif #ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' @@ -63,6 +86,11 @@ # define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) #endif +#if HAVE_DECL_GETC_UNLOCKED +# undef getc +# define getc getc_unlocked +#endif + /* The following static variable is declared 'volatile' to avoid a possible multithread problem in the function get_charset_aliases. If we are running in a threaded environment, and if two threads initialize @@ -86,9 +114,9 @@ get_charset_aliases () cp = charset_aliases; if (cp == NULL) { -#ifndef WIN32 +#if !(defined VMS || defined WIN32) FILE *fp; - const char *dir = LIBDIR; + const char *dir = relocate (LIBDIR); const char *base = "charset.alias"; char *file_name; @@ -138,19 +166,19 @@ get_charset_aliases () continue; } ungetc (c, fp); - if (fscanf(fp, "%50s %50s", buf1, buf2) < 2) + if (fscanf (fp, "%50s %50s", buf1, buf2) < 2) break; l1 = strlen (buf1); l2 = strlen (buf2); if (res_size == 0) { res_size = l1 + 1 + l2 + 1; - res_ptr = malloc (res_size + 1); + res_ptr = (char *) malloc (res_size + 1); } else { res_size += l1 + 1 + l2 + 1; - res_ptr = realloc (res_ptr, res_size + 1); + res_ptr = (char *) realloc (res_ptr, res_size + 1); } if (res_ptr == NULL) { @@ -174,14 +202,54 @@ get_charset_aliases () if (file_name != NULL) free (file_name); -#else /* WIN32 */ +#else +# if defined VMS + /* To avoid the troubles of an extra file charset.alias_vms in the + sources of many GNU packages, simply inline the aliases here. */ + /* The list of encodings is taken from the OpenVMS 7.3-1 documentation + "Compaq C Run-Time Library Reference Manual for OpenVMS systems" + section 10.7 "Handling Different Character Sets". */ + cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" + "ISO8859-2" "\0" "ISO-8859-2" "\0" + "ISO8859-5" "\0" "ISO-8859-5" "\0" + "ISO8859-7" "\0" "ISO-8859-7" "\0" + "ISO8859-8" "\0" "ISO-8859-8" "\0" + "ISO8859-9" "\0" "ISO-8859-9" "\0" + /* Japanese */ + "eucJP" "\0" "EUC-JP" "\0" + "SJIS" "\0" "SHIFT_JIS" "\0" + "DECKANJI" "\0" "DEC-KANJI" "\0" + "SDECKANJI" "\0" "EUC-JP" "\0" + /* Chinese */ + "eucTW" "\0" "EUC-TW" "\0" + "DECHANYU" "\0" "DEC-HANYU" "\0" + "DECHANZI" "\0" "GB2312" "\0" + /* Korean */ + "DECKOREAN" "\0" "EUC-KR" "\0"; +# endif + +# if defined WIN32 /* To avoid the troubles of installing a separate file in the same directory as the DLL and of retrieving the DLL's directory at runtime, simply inline the aliases here. */ cp = "CP936" "\0" "GBK" "\0" - "CP1361" "\0" "JOHAB" "\0"; + "CP1361" "\0" "JOHAB" "\0" + "CP20127" "\0" "ASCII" "\0" + "CP20866" "\0" "KOI8-R" "\0" + "CP21866" "\0" "KOI8-RU" "\0" + "CP28591" "\0" "ISO-8859-1" "\0" + "CP28592" "\0" "ISO-8859-2" "\0" + "CP28593" "\0" "ISO-8859-3" "\0" + "CP28594" "\0" "ISO-8859-4" "\0" + "CP28595" "\0" "ISO-8859-5" "\0" + "CP28596" "\0" "ISO-8859-6" "\0" + "CP28597" "\0" "ISO-8859-7" "\0" + "CP28598" "\0" "ISO-8859-8" "\0" + "CP28599" "\0" "ISO-8859-9" "\0" + "CP28605" "\0" "ISO-8859-15" "\0"; +# endif #endif charset_aliases = cp; @@ -205,7 +273,7 @@ locale_charset () const char *codeset; const char *aliases; -#ifndef WIN32 +#if !(defined WIN32 || defined OS2) # if HAVE_LANGINFO_CODESET @@ -242,14 +310,67 @@ locale_charset () # endif -#else /* WIN32 */ +#elif defined WIN32 static char buf[2 + 10 + 1]; - /* Win32 has a function returning the locale's codepage as a number. */ + /* Woe32 has a function returning the locale's codepage as a number. */ sprintf (buf, "CP%u", GetACP ()); codeset = buf; +#elif defined OS2 + + const char *locale; + static char buf[2 + 10 + 1]; + ULONG cp[3]; + ULONG cplen; + + /* Allow user to override the codeset, as set in the operating system, + with standard language environment variables. */ + locale = getenv ("LC_ALL"); + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_CTYPE"); + if (locale == NULL || locale[0] == '\0') + locale = getenv ("LANG"); + } + if (locale != NULL && locale[0] != '\0') + { + /* If the locale name contains an encoding after the dot, return it. */ + const char *dot = strchr (locale, '.'); + + if (dot != NULL) + { + const char *modifier; + + dot++; + /* Look for the possible @... trailer and remove it, if any. */ + modifier = strchr (dot, '@'); + if (modifier == NULL) + return dot; + if (modifier - dot < sizeof (buf)) + { + memcpy (buf, dot, modifier - dot); + buf [modifier - dot] = '\0'; + return buf; + } + } + + /* Resolve through the charset.alias file. */ + codeset = locale; + } + else + { + /* OS/2 has a function returning the locale's codepage as a number. */ + if (DosQueryCp (sizeof (cp), cp, &cplen)) + codeset = ""; + else + { + sprintf (buf, "CP%u", cp[0]); + codeset = buf; + } + } + #endif if (codeset == NULL) @@ -267,5 +388,11 @@ locale_charset () break; } + /* Don't return an empty string. GNU libc and GNU libiconv interpret + the empty string as denoting "the locale's character encoding", + thus GNU libiconv would call this function a second time. */ + if (codeset[0] == '\0') + codeset = "ASCII"; + return codeset; } diff -urpP gnupg-1.2.5/intl/localcharset.h gnupg-1.2.6/intl/localcharset.h --- gnupg-1.2.5/intl/localcharset.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/localcharset.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,42 @@ +/* Determine a canonical name for the current locale's character encoding. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LOCALCHARSET_H +#define _LOCALCHARSET_H + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Determine the current locale's character encoding, and canonicalize it + into one of the canonical names listed in config.charset. + The result must not be freed; it is statically allocated. + If the canonical name cannot be determined, the result is a non-canonical + name. */ +extern const char * locale_charset (void); + + +#ifdef __cplusplus +} +#endif + + +#endif /* _LOCALCHARSET_H */ diff -urpP gnupg-1.2.5/intl/locale.alias gnupg-1.2.6/intl/locale.alias --- gnupg-1.2.5/intl/locale.alias 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/locale.alias 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ # Locale name alias data base. -# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. +# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -29,8 +29,8 @@ # Packages using this file: -bokmal no_NO.ISO-8859-1 -bokm嶚 no_NO.ISO-8859-1 +bokmal nb_NO.ISO-8859-1 +bokm嶚 nb_NO.ISO-8859-1 catalan ca_ES.ISO-8859-1 croatian hr_HR.ISO-8859-2 czech cs_CZ.ISO-8859-2 @@ -61,9 +61,9 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR lithuanian lt_LT.ISO-8859-13 -nb_NO no_NO.ISO-8859-1 -nb_NO.ISO-8859-1 no_NO.ISO-8859-1 -norwegian no_NO.ISO-8859-1 +no_NO nb_NO.ISO-8859-1 +no_NO.ISO-8859-1 nb_NO.ISO-8859-1 +norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 portuguese pt_PT.ISO-8859-1 diff -urpP gnupg-1.2.5/intl/localealias.c gnupg-1.2.6/intl/localealias.c --- gnupg-1.2.5/intl/localealias.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/localealias.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Handle aliases for locale names. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -29,36 +29,45 @@ #include #include +#if defined _LIBC || defined HAVE___FSETLOCKING +# include +#endif #include #ifdef __GNUC__ +# undef alloca # define alloca __builtin_alloca # define HAVE_ALLOCA 1 #else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if defined HAVE_ALLOCA_H || defined _LIBC +# include # else -# ifndef alloca +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca char *alloca (); +# endif # endif # endif # endif #endif #include - #include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif #include "gettextP.h" +#if ENABLE_RELOCATABLE +# include "relocatable.h" +#else +# define relocate(pathname) (pathname) +#endif + /* @@ end of prolog @@ */ #ifdef _LIBC @@ -71,6 +80,7 @@ char *alloca (); # define mempcpy __mempcpy # endif # define HAVE_MEMPCPY 1 +# define HAVE___FSETLOCKING 1 /* We need locking here since we can be called from different places. */ # include @@ -82,6 +92,15 @@ __libc_lock_define_initialized (static, # define internal_function #endif +/* Some optimizations for glibc. */ +#ifdef _LIBC +# define FEOF(fp) feof_unlocked (fp) +# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp) +#else +# define FEOF(fp) feof (fp) +# define FGETS(buf, n, fp) fgets (buf, n, fp) +#endif + /* For those losing systems which don't have `alloca' we have to add some additional code emulating it. */ #ifdef HAVE_ALLOCA @@ -91,11 +110,11 @@ __libc_lock_define_initialized (static, # define freea(p) free (p) #endif -#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED +#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED # undef fgets # define fgets(buf, len, s) fgets_unlocked (buf, len, s) #endif -#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED +#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED # undef feof # define feof(s) feof_unlocked (s) #endif @@ -108,27 +127,30 @@ struct alias_map }; -static char *string_space; +#ifndef _LIBC +# define libc_freeres_ptr(decl) decl +#endif + +libc_freeres_ptr (static char *string_space); static size_t string_space_act; static size_t string_space_max; -static struct alias_map *map; +libc_freeres_ptr (static struct alias_map *map); static size_t nmap; static size_t maxmap; /* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) +static size_t read_alias_file (const char *fname, int fname_len) internal_function; -static int extend_alias_table PARAMS ((void)); -static int alias_compare PARAMS ((const struct alias_map *map1, - const struct alias_map *map2)); +static int extend_alias_table (void); +static int alias_compare (const struct alias_map *map1, + const struct alias_map *map2); const char * -_nl_expand_alias (name) - const char *name; +_nl_expand_alias (const char *name) { - static const char *locale_alias_path = LOCALE_ALIAS_PATH; + static const char *locale_alias_path; struct alias_map *retval; const char *result = NULL; size_t added; @@ -137,6 +159,9 @@ _nl_expand_alias (name) __libc_lock_lock (lock); #endif + if (locale_alias_path == NULL) + locale_alias_path = LOCALE_ALIAS_PATH; + do { struct alias_map item; @@ -146,8 +171,8 @@ _nl_expand_alias (name) if (nmap > 0) retval = (struct alias_map *) bsearch (&item, map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, - const void *)) + (int (*) (const void *, + const void *) ) alias_compare); else retval = NULL; @@ -189,9 +214,7 @@ _nl_expand_alias (name) static size_t internal_function -read_alias_file (fname, fname_len) - const char *fname; - int fname_len; +read_alias_file (const char *fname, int fname_len) { FILE *fp; char *full_fname; @@ -207,58 +230,52 @@ read_alias_file (fname, fname_len) memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); #endif - fp = fopen (full_fname, "r"); + fp = fopen (relocate (full_fname), "r"); freea (full_fname); if (fp == NULL) return 0; +#ifdef HAVE___FSETLOCKING + /* No threads present. */ + __fsetlocking (fp, FSETLOCKING_BYCALLER); +#endif + added = 0; - while (!feof (fp)) + while (!FEOF (fp)) { /* It is a reasonable approach to use a fix buffer here because a) we are only interested in the first two fields b) these fields must be usable as file names and so must not be that long - */ - char buf[BUFSIZ]; + We avoid a multi-kilobyte buffer here since this would use up + stack space which we might not have if the program ran out of + memory. */ + char buf[400]; char *alias; char *value; char *cp; - if (fgets (buf, sizeof buf, fp) == NULL) + if (FGETS (buf, sizeof buf, fp) == NULL) /* EOF reached. */ break; - /* Possibly not the whole line fits into the buffer. Ignore - the rest of the line. */ - if (strchr (buf, '\n') == NULL) - { - char altbuf[BUFSIZ]; - do - if (fgets (altbuf, sizeof altbuf, fp) == NULL) - /* Make sure the inner loop will be left. The outer loop - will exit at the `feof' test. */ - break; - while (strchr (altbuf, '\n') == NULL); - } - cp = buf; /* Ignore leading white space. */ - while (isspace (cp[0])) + while (isspace ((unsigned char) cp[0])) ++cp; /* A leading '#' signals a comment line. */ if (cp[0] != '\0' && cp[0] != '#') { alias = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) ++cp; /* Terminate alias name. */ if (cp[0] != '\0') *cp++ = '\0'; /* Now look for the beginning of the value. */ - while (isspace (cp[0])) + while (isspace ((unsigned char) cp[0])) ++cp; if (cp[0] != '\0') @@ -267,7 +284,7 @@ read_alias_file (fname, fname_len) size_t value_len; value = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) ++cp; /* Terminate value. */ if (cp[0] == '\n') @@ -325,6 +342,14 @@ read_alias_file (fname, fname_len) ++added; } } + + /* Possibly not the whole line fits into the buffer. Ignore + the rest of the line. */ + while (strchr (buf, '\n') == NULL) + if (FGETS (buf, sizeof buf, fp) == NULL) + /* Make sure the inner loop will be left. The outer loop + will exit at the `feof' test. */ + break; } /* Should we test for ferror()? I think we have to silently ignore @@ -333,7 +358,7 @@ read_alias_file (fname, fname_len) if (added > 0) qsort (map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, const void *))) alias_compare); + (int (*) (const void *, const void *)) alias_compare); return added; } @@ -358,23 +383,8 @@ extend_alias_table () } -#ifdef _LIBC -static void __attribute__ ((unused)) -free_mem (void) -{ - if (string_space != NULL) - free (string_space); - if (map != NULL) - free (map); -} -text_set_element (__libc_subfreeres, free_mem); -#endif - - static int -alias_compare (map1, map2) - const struct alias_map *map1; - const struct alias_map *map2; +alias_compare (const struct alias_map *map1, const struct alias_map *map2) { #if defined _LIBC || defined HAVE_STRCASECMP return strcasecmp (map1->alias, map2->alias); diff -urpP gnupg-1.2.5/intl/localename.c gnupg-1.2.6/intl/localename.c --- gnupg-1.2.5/intl/localename.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/localename.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,1142 @@ +/* Determine the current selected locale. + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Written by Ulrich Drepper , 1995. */ +/* Win32 code written by Tor Lillqvist . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#if defined _WIN32 || defined __WIN32__ +# undef WIN32 /* avoid warning on mingw32 */ +# define WIN32 +#endif + +#ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include +/* List of language codes, sorted by value: + 0x01 LANG_ARABIC + 0x02 LANG_BULGARIAN + 0x03 LANG_CATALAN + 0x04 LANG_CHINESE + 0x05 LANG_CZECH + 0x06 LANG_DANISH + 0x07 LANG_GERMAN + 0x08 LANG_GREEK + 0x09 LANG_ENGLISH + 0x0a LANG_SPANISH + 0x0b LANG_FINNISH + 0x0c LANG_FRENCH + 0x0d LANG_HEBREW + 0x0e LANG_HUNGARIAN + 0x0f LANG_ICELANDIC + 0x10 LANG_ITALIAN + 0x11 LANG_JAPANESE + 0x12 LANG_KOREAN + 0x13 LANG_DUTCH + 0x14 LANG_NORWEGIAN + 0x15 LANG_POLISH + 0x16 LANG_PORTUGUESE + 0x17 LANG_RHAETO_ROMANCE + 0x18 LANG_ROMANIAN + 0x19 LANG_RUSSIAN + 0x1a LANG_CROATIAN == LANG_SERBIAN + 0x1b LANG_SLOVAK + 0x1c LANG_ALBANIAN + 0x1d LANG_SWEDISH + 0x1e LANG_THAI + 0x1f LANG_TURKISH + 0x20 LANG_URDU + 0x21 LANG_INDONESIAN + 0x22 LANG_UKRAINIAN + 0x23 LANG_BELARUSIAN + 0x24 LANG_SLOVENIAN + 0x25 LANG_ESTONIAN + 0x26 LANG_LATVIAN + 0x27 LANG_LITHUANIAN + 0x28 LANG_TAJIK + 0x29 LANG_FARSI + 0x2a LANG_VIETNAMESE + 0x2b LANG_ARMENIAN + 0x2c LANG_AZERI + 0x2d LANG_BASQUE + 0x2e LANG_SORBIAN + 0x2f LANG_MACEDONIAN + 0x30 LANG_SUTU + 0x31 LANG_TSONGA + 0x32 LANG_TSWANA + 0x33 LANG_VENDA + 0x34 LANG_XHOSA + 0x35 LANG_ZULU + 0x36 LANG_AFRIKAANS + 0x37 LANG_GEORGIAN + 0x38 LANG_FAEROESE + 0x39 LANG_HINDI + 0x3a LANG_MALTESE + 0x3b LANG_SAAMI + 0x3c LANG_GAELIC + 0x3d LANG_YIDDISH + 0x3e LANG_MALAY + 0x3f LANG_KAZAK + 0x40 LANG_KYRGYZ + 0x41 LANG_SWAHILI + 0x42 LANG_TURKMEN + 0x43 LANG_UZBEK + 0x44 LANG_TATAR + 0x45 LANG_BENGALI + 0x46 LANG_PUNJABI + 0x47 LANG_GUJARATI + 0x48 LANG_ORIYA + 0x49 LANG_TAMIL + 0x4a LANG_TELUGU + 0x4b LANG_KANNADA + 0x4c LANG_MALAYALAM + 0x4d LANG_ASSAMESE + 0x4e LANG_MARATHI + 0x4f LANG_SANSKRIT + 0x50 LANG_MONGOLIAN + 0x51 LANG_TIBETAN + 0x52 LANG_WELSH + 0x53 LANG_CAMBODIAN + 0x54 LANG_LAO + 0x55 LANG_BURMESE + 0x56 LANG_GALICIAN + 0x57 LANG_KONKANI + 0x58 LANG_MANIPURI + 0x59 LANG_SINDHI + 0x5a LANG_SYRIAC + 0x5b LANG_SINHALESE + 0x5c LANG_CHEROKEE + 0x5d LANG_INUKTITUT + 0x5e LANG_AMHARIC + 0x5f LANG_TAMAZIGHT + 0x60 LANG_KASHMIRI + 0x61 LANG_NEPALI + 0x62 LANG_FRISIAN + 0x63 LANG_PASHTO + 0x64 LANG_TAGALOG + 0x65 LANG_DIVEHI + 0x66 LANG_EDO + 0x67 LANG_FULFULDE + 0x68 LANG_HAUSA + 0x69 LANG_IBIBIO + 0x6a LANG_YORUBA + 0x70 LANG_IGBO + 0x71 LANG_KANURI + 0x72 LANG_OROMO + 0x73 LANG_TIGRINYA + 0x74 LANG_GUARANI + 0x75 LANG_HAWAIIAN + 0x76 LANG_LATIN + 0x77 LANG_SOMALI + 0x78 LANG_YI + 0x79 LANG_PAPIAMENTU +*/ +/* Mingw headers don't have latest language and sublanguage codes. */ +# ifndef LANG_AFRIKAANS +# define LANG_AFRIKAANS 0x36 +# endif +# ifndef LANG_ALBANIAN +# define LANG_ALBANIAN 0x1c +# endif +# ifndef LANG_AMHARIC +# define LANG_AMHARIC 0x5e +# endif +# ifndef LANG_ARABIC +# define LANG_ARABIC 0x01 +# endif +# ifndef LANG_ARMENIAN +# define LANG_ARMENIAN 0x2b +# endif +# ifndef LANG_ASSAMESE +# define LANG_ASSAMESE 0x4d +# endif +# ifndef LANG_AZERI +# define LANG_AZERI 0x2c +# endif +# ifndef LANG_BASQUE +# define LANG_BASQUE 0x2d +# endif +# ifndef LANG_BELARUSIAN +# define LANG_BELARUSIAN 0x23 +# endif +# ifndef LANG_BENGALI +# define LANG_BENGALI 0x45 +# endif +# ifndef LANG_BURMESE +# define LANG_BURMESE 0x55 +# endif +# ifndef LANG_CAMBODIAN +# define LANG_CAMBODIAN 0x53 +# endif +# ifndef LANG_CATALAN +# define LANG_CATALAN 0x03 +# endif +# ifndef LANG_CHEROKEE +# define LANG_CHEROKEE 0x5c +# endif +# ifndef LANG_DIVEHI +# define LANG_DIVEHI 0x65 +# endif +# ifndef LANG_EDO +# define LANG_EDO 0x66 +# endif +# ifndef LANG_ESTONIAN +# define LANG_ESTONIAN 0x25 +# endif +# ifndef LANG_FAEROESE +# define LANG_FAEROESE 0x38 +# endif +# ifndef LANG_FARSI +# define LANG_FARSI 0x29 +# endif +# ifndef LANG_FRISIAN +# define LANG_FRISIAN 0x62 +# endif +# ifndef LANG_FULFULDE +# define LANG_FULFULDE 0x67 +# endif +# ifndef LANG_GAELIC +# define LANG_GAELIC 0x3c +# endif +# ifndef LANG_GALICIAN +# define LANG_GALICIAN 0x56 +# endif +# ifndef LANG_GEORGIAN +# define LANG_GEORGIAN 0x37 +# endif +# ifndef LANG_GUARANI +# define LANG_GUARANI 0x74 +# endif +# ifndef LANG_GUJARATI +# define LANG_GUJARATI 0x47 +# endif +# ifndef LANG_HAUSA +# define LANG_HAUSA 0x68 +# endif +# ifndef LANG_HAWAIIAN +# define LANG_HAWAIIAN 0x75 +# endif +# ifndef LANG_HEBREW +# define LANG_HEBREW 0x0d +# endif +# ifndef LANG_HINDI +# define LANG_HINDI 0x39 +# endif +# ifndef LANG_IBIBIO +# define LANG_IBIBIO 0x69 +# endif +# ifndef LANG_IGBO +# define LANG_IGBO 0x70 +# endif +# ifndef LANG_INDONESIAN +# define LANG_INDONESIAN 0x21 +# endif +# ifndef LANG_INUKTITUT +# define LANG_INUKTITUT 0x5d +# endif +# ifndef LANG_KANNADA +# define LANG_KANNADA 0x4b +# endif +# ifndef LANG_KANURI +# define LANG_KANURI 0x71 +# endif +# ifndef LANG_KASHMIRI +# define LANG_KASHMIRI 0x60 +# endif +# ifndef LANG_KAZAK +# define LANG_KAZAK 0x3f +# endif +# ifndef LANG_KONKANI +# define LANG_KONKANI 0x57 +# endif +# ifndef LANG_KYRGYZ +# define LANG_KYRGYZ 0x40 +# endif +# ifndef LANG_LAO +# define LANG_LAO 0x54 +# endif +# ifndef LANG_LATIN +# define LANG_LATIN 0x76 +# endif +# ifndef LANG_LATVIAN +# define LANG_LATVIAN 0x26 +# endif +# ifndef LANG_LITHUANIAN +# define LANG_LITHUANIAN 0x27 +# endif +# ifndef LANG_MACEDONIAN +# define LANG_MACEDONIAN 0x2f +# endif +# ifndef LANG_MALAY +# define LANG_MALAY 0x3e +# endif +# ifndef LANG_MALAYALAM +# define LANG_MALAYALAM 0x4c +# endif +# ifndef LANG_MALTESE +# define LANG_MALTESE 0x3a +# endif +# ifndef LANG_MANIPURI +# define LANG_MANIPURI 0x58 +# endif +# ifndef LANG_MARATHI +# define LANG_MARATHI 0x4e +# endif +# ifndef LANG_MONGOLIAN +# define LANG_MONGOLIAN 0x50 +# endif +# ifndef LANG_NEPALI +# define LANG_NEPALI 0x61 +# endif +# ifndef LANG_ORIYA +# define LANG_ORIYA 0x48 +# endif +# ifndef LANG_OROMO +# define LANG_OROMO 0x72 +# endif +# ifndef LANG_PAPIAMENTU +# define LANG_PAPIAMENTU 0x79 +# endif +# ifndef LANG_PASHTO +# define LANG_PASHTO 0x63 +# endif +# ifndef LANG_PUNJABI +# define LANG_PUNJABI 0x46 +# endif +# ifndef LANG_RHAETO_ROMANCE +# define LANG_RHAETO_ROMANCE 0x17 +# endif +# ifndef LANG_SAAMI +# define LANG_SAAMI 0x3b +# endif +# ifndef LANG_SANSKRIT +# define LANG_SANSKRIT 0x4f +# endif +# ifndef LANG_SERBIAN +# define LANG_SERBIAN 0x1a +# endif +# ifndef LANG_SINDHI +# define LANG_SINDHI 0x59 +# endif +# ifndef LANG_SINHALESE +# define LANG_SINHALESE 0x5b +# endif +# ifndef LANG_SLOVAK +# define LANG_SLOVAK 0x1b +# endif +# ifndef LANG_SOMALI +# define LANG_SOMALI 0x77 +# endif +# ifndef LANG_SORBIAN +# define LANG_SORBIAN 0x2e +# endif +# ifndef LANG_SUTU +# define LANG_SUTU 0x30 +# endif +# ifndef LANG_SWAHILI +# define LANG_SWAHILI 0x41 +# endif +# ifndef LANG_SYRIAC +# define LANG_SYRIAC 0x5a +# endif +# ifndef LANG_TAGALOG +# define LANG_TAGALOG 0x64 +# endif +# ifndef LANG_TAJIK +# define LANG_TAJIK 0x28 +# endif +# ifndef LANG_TAMAZIGHT +# define LANG_TAMAZIGHT 0x5f +# endif +# ifndef LANG_TAMIL +# define LANG_TAMIL 0x49 +# endif +# ifndef LANG_TATAR +# define LANG_TATAR 0x44 +# endif +# ifndef LANG_TELUGU +# define LANG_TELUGU 0x4a +# endif +# ifndef LANG_THAI +# define LANG_THAI 0x1e +# endif +# ifndef LANG_TIBETAN +# define LANG_TIBETAN 0x51 +# endif +# ifndef LANG_TIGRINYA +# define LANG_TIGRINYA 0x73 +# endif +# ifndef LANG_TSONGA +# define LANG_TSONGA 0x31 +# endif +# ifndef LANG_TSWANA +# define LANG_TSWANA 0x32 +# endif +# ifndef LANG_TURKMEN +# define LANG_TURKMEN 0x42 +# endif +# ifndef LANG_UKRAINIAN +# define LANG_UKRAINIAN 0x22 +# endif +# ifndef LANG_URDU +# define LANG_URDU 0x20 +# endif +# ifndef LANG_UZBEK +# define LANG_UZBEK 0x43 +# endif +# ifndef LANG_VENDA +# define LANG_VENDA 0x33 +# endif +# ifndef LANG_VIETNAMESE +# define LANG_VIETNAMESE 0x2a +# endif +# ifndef LANG_WELSH +# define LANG_WELSH 0x52 +# endif +# ifndef LANG_XHOSA +# define LANG_XHOSA 0x34 +# endif +# ifndef LANG_YI +# define LANG_YI 0x78 +# endif +# ifndef LANG_YIDDISH +# define LANG_YIDDISH 0x3d +# endif +# ifndef LANG_YORUBA +# define LANG_YORUBA 0x6a +# endif +# ifndef LANG_ZULU +# define LANG_ZULU 0x35 +# endif +# ifndef SUBLANG_ARABIC_SAUDI_ARABIA +# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +# endif +# ifndef SUBLANG_ARABIC_IRAQ +# define SUBLANG_ARABIC_IRAQ 0x02 +# endif +# ifndef SUBLANG_ARABIC_EGYPT +# define SUBLANG_ARABIC_EGYPT 0x03 +# endif +# ifndef SUBLANG_ARABIC_LIBYA +# define SUBLANG_ARABIC_LIBYA 0x04 +# endif +# ifndef SUBLANG_ARABIC_ALGERIA +# define SUBLANG_ARABIC_ALGERIA 0x05 +# endif +# ifndef SUBLANG_ARABIC_MOROCCO +# define SUBLANG_ARABIC_MOROCCO 0x06 +# endif +# ifndef SUBLANG_ARABIC_TUNISIA +# define SUBLANG_ARABIC_TUNISIA 0x07 +# endif +# ifndef SUBLANG_ARABIC_OMAN +# define SUBLANG_ARABIC_OMAN 0x08 +# endif +# ifndef SUBLANG_ARABIC_YEMEN +# define SUBLANG_ARABIC_YEMEN 0x09 +# endif +# ifndef SUBLANG_ARABIC_SYRIA +# define SUBLANG_ARABIC_SYRIA 0x0a +# endif +# ifndef SUBLANG_ARABIC_JORDAN +# define SUBLANG_ARABIC_JORDAN 0x0b +# endif +# ifndef SUBLANG_ARABIC_LEBANON +# define SUBLANG_ARABIC_LEBANON 0x0c +# endif +# ifndef SUBLANG_ARABIC_KUWAIT +# define SUBLANG_ARABIC_KUWAIT 0x0d +# endif +# ifndef SUBLANG_ARABIC_UAE +# define SUBLANG_ARABIC_UAE 0x0e +# endif +# ifndef SUBLANG_ARABIC_BAHRAIN +# define SUBLANG_ARABIC_BAHRAIN 0x0f +# endif +# ifndef SUBLANG_ARABIC_QATAR +# define SUBLANG_ARABIC_QATAR 0x10 +# endif +# ifndef SUBLANG_AZERI_LATIN +# define SUBLANG_AZERI_LATIN 0x01 +# endif +# ifndef SUBLANG_AZERI_CYRILLIC +# define SUBLANG_AZERI_CYRILLIC 0x02 +# endif +# ifndef SUBLANG_BENGALI_INDIA +# define SUBLANG_BENGALI_INDIA 0x00 +# endif +# ifndef SUBLANG_BENGALI_BANGLADESH +# define SUBLANG_BENGALI_BANGLADESH 0x01 +# endif +# ifndef SUBLANG_CHINESE_MACAU +# define SUBLANG_CHINESE_MACAU 0x05 +# endif +# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA +# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +# endif +# ifndef SUBLANG_ENGLISH_JAMAICA +# define SUBLANG_ENGLISH_JAMAICA 0x08 +# endif +# ifndef SUBLANG_ENGLISH_CARIBBEAN +# define SUBLANG_ENGLISH_CARIBBEAN 0x09 +# endif +# ifndef SUBLANG_ENGLISH_BELIZE +# define SUBLANG_ENGLISH_BELIZE 0x0a +# endif +# ifndef SUBLANG_ENGLISH_TRINIDAD +# define SUBLANG_ENGLISH_TRINIDAD 0x0b +# endif +# ifndef SUBLANG_ENGLISH_ZIMBABWE +# define SUBLANG_ENGLISH_ZIMBABWE 0x0c +# endif +# ifndef SUBLANG_ENGLISH_PHILIPPINES +# define SUBLANG_ENGLISH_PHILIPPINES 0x0d +# endif +# ifndef SUBLANG_ENGLISH_INDONESIA +# define SUBLANG_ENGLISH_INDONESIA 0x0e +# endif +# ifndef SUBLANG_ENGLISH_HONGKONG +# define SUBLANG_ENGLISH_HONGKONG 0x0f +# endif +# ifndef SUBLANG_ENGLISH_INDIA +# define SUBLANG_ENGLISH_INDIA 0x10 +# endif +# ifndef SUBLANG_ENGLISH_MALAYSIA +# define SUBLANG_ENGLISH_MALAYSIA 0x11 +# endif +# ifndef SUBLANG_ENGLISH_SINGAPORE +# define SUBLANG_ENGLISH_SINGAPORE 0x12 +# endif +# ifndef SUBLANG_FRENCH_LUXEMBOURG +# define SUBLANG_FRENCH_LUXEMBOURG 0x05 +# endif +# ifndef SUBLANG_FRENCH_MONACO +# define SUBLANG_FRENCH_MONACO 0x06 +# endif +# ifndef SUBLANG_FRENCH_WESTINDIES +# define SUBLANG_FRENCH_WESTINDIES 0x07 +# endif +# ifndef SUBLANG_FRENCH_REUNION +# define SUBLANG_FRENCH_REUNION 0x08 +# endif +# ifndef SUBLANG_FRENCH_CONGO +# define SUBLANG_FRENCH_CONGO 0x09 +# endif +# ifndef SUBLANG_FRENCH_SENEGAL +# define SUBLANG_FRENCH_SENEGAL 0x0a +# endif +# ifndef SUBLANG_FRENCH_CAMEROON +# define SUBLANG_FRENCH_CAMEROON 0x0b +# endif +# ifndef SUBLANG_FRENCH_COTEDIVOIRE +# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c +# endif +# ifndef SUBLANG_FRENCH_MALI +# define SUBLANG_FRENCH_MALI 0x0d +# endif +# ifndef SUBLANG_FRENCH_MOROCCO +# define SUBLANG_FRENCH_MOROCCO 0x0e +# endif +# ifndef SUBLANG_FRENCH_HAITI +# define SUBLANG_FRENCH_HAITI 0x0f +# endif +# ifndef SUBLANG_GERMAN_LUXEMBOURG +# define SUBLANG_GERMAN_LUXEMBOURG 0x04 +# endif +# ifndef SUBLANG_GERMAN_LIECHTENSTEIN +# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +# endif +# ifndef SUBLANG_KASHMIRI_INDIA +# define SUBLANG_KASHMIRI_INDIA 0x02 +# endif +# ifndef SUBLANG_MALAY_MALAYSIA +# define SUBLANG_MALAY_MALAYSIA 0x01 +# endif +# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM +# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +# endif +# ifndef SUBLANG_NEPALI_INDIA +# define SUBLANG_NEPALI_INDIA 0x02 +# endif +# ifndef SUBLANG_PUNJABI_INDIA +# define SUBLANG_PUNJABI_INDIA 0x00 +# endif +# ifndef SUBLANG_PUNJABI_PAKISTAN +# define SUBLANG_PUNJABI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_ROMANIAN_ROMANIA +# define SUBLANG_ROMANIAN_ROMANIA 0x00 +# endif +# ifndef SUBLANG_ROMANIAN_MOLDOVA +# define SUBLANG_ROMANIAN_MOLDOVA 0x01 +# endif +# ifndef SUBLANG_SERBIAN_LATIN +# define SUBLANG_SERBIAN_LATIN 0x02 +# endif +# ifndef SUBLANG_SERBIAN_CYRILLIC +# define SUBLANG_SERBIAN_CYRILLIC 0x03 +# endif +# ifndef SUBLANG_SINDHI_INDIA +# define SUBLANG_SINDHI_INDIA 0x00 +# endif +# ifndef SUBLANG_SINDHI_PAKISTAN +# define SUBLANG_SINDHI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_SPANISH_GUATEMALA +# define SUBLANG_SPANISH_GUATEMALA 0x04 +# endif +# ifndef SUBLANG_SPANISH_COSTA_RICA +# define SUBLANG_SPANISH_COSTA_RICA 0x05 +# endif +# ifndef SUBLANG_SPANISH_PANAMA +# define SUBLANG_SPANISH_PANAMA 0x06 +# endif +# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC +# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +# endif +# ifndef SUBLANG_SPANISH_VENEZUELA +# define SUBLANG_SPANISH_VENEZUELA 0x08 +# endif +# ifndef SUBLANG_SPANISH_COLOMBIA +# define SUBLANG_SPANISH_COLOMBIA 0x09 +# endif +# ifndef SUBLANG_SPANISH_PERU +# define SUBLANG_SPANISH_PERU 0x0a +# endif +# ifndef SUBLANG_SPANISH_ARGENTINA +# define SUBLANG_SPANISH_ARGENTINA 0x0b +# endif +# ifndef SUBLANG_SPANISH_ECUADOR +# define SUBLANG_SPANISH_ECUADOR 0x0c +# endif +# ifndef SUBLANG_SPANISH_CHILE +# define SUBLANG_SPANISH_CHILE 0x0d +# endif +# ifndef SUBLANG_SPANISH_URUGUAY +# define SUBLANG_SPANISH_URUGUAY 0x0e +# endif +# ifndef SUBLANG_SPANISH_PARAGUAY +# define SUBLANG_SPANISH_PARAGUAY 0x0f +# endif +# ifndef SUBLANG_SPANISH_BOLIVIA +# define SUBLANG_SPANISH_BOLIVIA 0x10 +# endif +# ifndef SUBLANG_SPANISH_EL_SALVADOR +# define SUBLANG_SPANISH_EL_SALVADOR 0x11 +# endif +# ifndef SUBLANG_SPANISH_HONDURAS +# define SUBLANG_SPANISH_HONDURAS 0x12 +# endif +# ifndef SUBLANG_SPANISH_NICARAGUA +# define SUBLANG_SPANISH_NICARAGUA 0x13 +# endif +# ifndef SUBLANG_SPANISH_PUERTO_RICO +# define SUBLANG_SPANISH_PUERTO_RICO 0x14 +# endif +# ifndef SUBLANG_SWEDISH_FINLAND +# define SUBLANG_SWEDISH_FINLAND 0x02 +# endif +# ifndef SUBLANG_TAMAZIGHT_ARABIC +# define SUBLANG_TAMAZIGHT_ARABIC 0x01 +# endif +# ifndef SUBLANG_TAMAZIGHT_LATIN +# define SUBLANG_TAMAZIGHT_LATIN 0x02 +# endif +# ifndef SUBLANG_TIGRINYA_ETHIOPIA +# define SUBLANG_TIGRINYA_ETHIOPIA 0x00 +# endif +# ifndef SUBLANG_TIGRINYA_ERITREA +# define SUBLANG_TIGRINYA_ERITREA 0x01 +# endif +# ifndef SUBLANG_URDU_PAKISTAN +# define SUBLANG_URDU_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_URDU_INDIA +# define SUBLANG_URDU_INDIA 0x02 +# endif +# ifndef SUBLANG_UZBEK_LATIN +# define SUBLANG_UZBEK_LATIN 0x01 +# endif +# ifndef SUBLANG_UZBEK_CYRILLIC +# define SUBLANG_UZBEK_CYRILLIC 0x02 +# endif +#endif + +/* XPG3 defines the result of 'setlocale (category, NULL)' as: + "Directs 'setlocale()' to query 'category' and return the current + setting of 'local'." + However it does not specify the exact format. Neither do SUSV2 and + ISO C 99. So we can use this feature only on selected systems (e.g. + those using GNU C Library). */ +#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) +# define HAVE_LOCALE_NULL +#endif + +/* Determine the current locale's name, and canonicalize it into XPG syntax + language[_territory[.codeset]][@modifier] + The codeset part in the result is not reliable; the locale_charset() + should be used for codeset information instead. + The result must not be freed; it is statically allocated. */ + +const char * +_nl_locale_name (int category, const char *categoryname) +{ + const char *retval; + +#ifndef WIN32 + + /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. + On some systems this can be done by the 'setlocale' function itself. */ +# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL + retval = setlocale (category, NULL); +# else + /* Setting of LC_ALL overwrites all other. */ + retval = getenv ("LC_ALL"); + if (retval == NULL || retval[0] == '\0') + { + /* Next comes the name of the desired category. */ + retval = getenv (categoryname); + if (retval == NULL || retval[0] == '\0') + { + /* Last possibility is the LANG environment variable. */ + retval = getenv ("LANG"); + if (retval == NULL || retval[0] == '\0') + /* We use C as the default domain. POSIX says this is + implementation defined. */ + retval = "C"; + } + } +# endif + + return retval; + +#else /* WIN32 */ + + /* Return an XPG style locale name language[_territory][@modifier]. + Don't even bother determining the codeset; it's not useful in this + context, because message catalogs are not specific to a single + codeset. */ + + LCID lcid; + LANGID langid; + int primary, sub; + + /* Let the user override the system settings through environment + variables, as on POSIX systems. */ + retval = getenv ("LC_ALL"); + if (retval != NULL && retval[0] != '\0') + return retval; + retval = getenv (categoryname); + if (retval != NULL && retval[0] != '\0') + return retval; + retval = getenv ("LANG"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Use native Win32 API locale ID. */ + lcid = GetThreadLocale (); + + /* Strip off the sorting rules, keep only the language part. */ + langid = LANGIDFROMLCID (lcid); + + /* Split into language and territory part. */ + primary = PRIMARYLANGID (langid); + sub = SUBLANGID (langid); + + /* Dispatch on language. + See also http://www.unicode.org/unicode/onlinedat/languages.html . + For details about languages, see http://www.ethnologue.com/ . */ + switch (primary) + { + case LANG_AFRIKAANS: return "af_ZA"; + case LANG_ALBANIAN: return "sq_AL"; + case LANG_AMHARIC: return "am_ET"; + case LANG_ARABIC: + switch (sub) + { + case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA"; + case SUBLANG_ARABIC_IRAQ: return "ar_IQ"; + case SUBLANG_ARABIC_EGYPT: return "ar_EG"; + case SUBLANG_ARABIC_LIBYA: return "ar_LY"; + case SUBLANG_ARABIC_ALGERIA: return "ar_DZ"; + case SUBLANG_ARABIC_MOROCCO: return "ar_MA"; + case SUBLANG_ARABIC_TUNISIA: return "ar_TN"; + case SUBLANG_ARABIC_OMAN: return "ar_OM"; + case SUBLANG_ARABIC_YEMEN: return "ar_YE"; + case SUBLANG_ARABIC_SYRIA: return "ar_SY"; + case SUBLANG_ARABIC_JORDAN: return "ar_JO"; + case SUBLANG_ARABIC_LEBANON: return "ar_LB"; + case SUBLANG_ARABIC_KUWAIT: return "ar_KW"; + case SUBLANG_ARABIC_UAE: return "ar_AE"; + case SUBLANG_ARABIC_BAHRAIN: return "ar_BH"; + case SUBLANG_ARABIC_QATAR: return "ar_QA"; + } + return "ar"; + case LANG_ARMENIAN: return "hy_AM"; + case LANG_ASSAMESE: return "as_IN"; + case LANG_AZERI: + switch (sub) + { + /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */ + case SUBLANG_AZERI_LATIN: return "az_AZ@latin"; + case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic"; + } + return "az"; + case LANG_BASQUE: + return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */ + case LANG_BELARUSIAN: return "be_BY"; + case LANG_BENGALI: + switch (sub) + { + case SUBLANG_BENGALI_INDIA: return "bn_IN"; + case SUBLANG_BENGALI_BANGLADESH: return "bn_BD"; + } + return "bn"; + case LANG_BULGARIAN: return "bg_BG"; + case LANG_BURMESE: return "my_MM"; + case LANG_CAMBODIAN: return "km_KH"; + case LANG_CATALAN: return "ca_ES"; + case LANG_CHEROKEE: return "chr_US"; + case LANG_CHINESE: + switch (sub) + { + case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW"; + case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN"; + case SUBLANG_CHINESE_HONGKONG: return "zh_HK"; + case SUBLANG_CHINESE_SINGAPORE: return "zh_SG"; + case SUBLANG_CHINESE_MACAU: return "zh_MO"; + } + return "zh"; + case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN + * What used to be called Serbo-Croatian + * should really now be two separate + * languages because of political reasons. + * (Says tml, who knows nothing about Serbian + * or Croatian.) + * (I can feel those flames coming already.) + */ + switch (sub) + { + case SUBLANG_DEFAULT: return "hr_HR"; + case SUBLANG_SERBIAN_LATIN: return "sr_CS"; + case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic"; + } + return "hr"; + case LANG_CZECH: return "cs_CZ"; + case LANG_DANISH: return "da_DK"; + case LANG_DIVEHI: return "dv_MV"; + case LANG_DUTCH: + switch (sub) + { + case SUBLANG_DUTCH: return "nl_NL"; + case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE"; + } + return "nl"; + case LANG_EDO: return "bin_NG"; + case LANG_ENGLISH: + switch (sub) + { + /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought + * English was the language spoken in England. + * Oh well. + */ + case SUBLANG_ENGLISH_US: return "en_US"; + case SUBLANG_ENGLISH_UK: return "en_GB"; + case SUBLANG_ENGLISH_AUS: return "en_AU"; + case SUBLANG_ENGLISH_CAN: return "en_CA"; + case SUBLANG_ENGLISH_NZ: return "en_NZ"; + case SUBLANG_ENGLISH_EIRE: return "en_IE"; + case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA"; + case SUBLANG_ENGLISH_JAMAICA: return "en_JM"; + case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */ + case SUBLANG_ENGLISH_BELIZE: return "en_BZ"; + case SUBLANG_ENGLISH_TRINIDAD: return "en_TT"; + case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW"; + case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH"; + case SUBLANG_ENGLISH_INDONESIA: return "en_ID"; + case SUBLANG_ENGLISH_HONGKONG: return "en_HK"; + case SUBLANG_ENGLISH_INDIA: return "en_IN"; + case SUBLANG_ENGLISH_MALAYSIA: return "en_MY"; + case SUBLANG_ENGLISH_SINGAPORE: return "en_SG"; + } + return "en"; + case LANG_ESTONIAN: return "et_EE"; + case LANG_FAEROESE: return "fo_FO"; + case LANG_FARSI: return "fa_IR"; + case LANG_FINNISH: return "fi_FI"; + case LANG_FRENCH: + switch (sub) + { + case SUBLANG_FRENCH: return "fr_FR"; + case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE"; + case SUBLANG_FRENCH_CANADIAN: return "fr_CA"; + case SUBLANG_FRENCH_SWISS: return "fr_CH"; + case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU"; + case SUBLANG_FRENCH_MONACO: return "fr_MC"; + case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */ + case SUBLANG_FRENCH_REUNION: return "fr_RE"; + case SUBLANG_FRENCH_CONGO: return "fr_CG"; + case SUBLANG_FRENCH_SENEGAL: return "fr_SN"; + case SUBLANG_FRENCH_CAMEROON: return "fr_CM"; + case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI"; + case SUBLANG_FRENCH_MALI: return "fr_ML"; + case SUBLANG_FRENCH_MOROCCO: return "fr_MA"; + case SUBLANG_FRENCH_HAITI: return "fr_HT"; + } + return "fr"; + case LANG_FRISIAN: return "fy_NL"; + case LANG_FULFULDE: + /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */ + return "ff_NG"; + case LANG_GAELIC: + switch (sub) + { + case 0x01: /* SCOTTISH */ return "gd_GB"; + case 0x02: /* IRISH */ return "ga_IE"; + } + return "C"; + case LANG_GALICIAN: return "gl_ES"; + case LANG_GEORGIAN: return "ka_GE"; + case LANG_GERMAN: + switch (sub) + { + case SUBLANG_GERMAN: return "de_DE"; + case SUBLANG_GERMAN_SWISS: return "de_CH"; + case SUBLANG_GERMAN_AUSTRIAN: return "de_AT"; + case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU"; + case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI"; + } + return "de"; + case LANG_GREEK: return "el_GR"; + case LANG_GUARANI: return "gn_PY"; + case LANG_GUJARATI: return "gu_IN"; + case LANG_HAUSA: return "ha_NG"; + case LANG_HAWAIIAN: + /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers) + or Hawaii Creole English ("cpe_US", 600000 speakers)? */ + return "cpe_US"; + case LANG_HEBREW: return "he_IL"; + case LANG_HINDI: return "hi_IN"; + case LANG_HUNGARIAN: return "hu_HU"; + case LANG_IBIBIO: return "nic_NG"; + case LANG_ICELANDIC: return "is_IS"; + case LANG_IGBO: return "ig_NG"; + case LANG_INDONESIAN: return "id_ID"; + case LANG_INUKTITUT: return "iu_CA"; + case LANG_ITALIAN: + switch (sub) + { + case SUBLANG_ITALIAN: return "it_IT"; + case SUBLANG_ITALIAN_SWISS: return "it_CH"; + } + return "it"; + case LANG_JAPANESE: return "ja_JP"; + case LANG_KANNADA: return "kn_IN"; + case LANG_KANURI: return "kr_NG"; + case LANG_KASHMIRI: + switch (sub) + { + case SUBLANG_DEFAULT: return "ks_PK"; + case SUBLANG_KASHMIRI_INDIA: return "ks_IN"; + } + return "ks"; + case LANG_KAZAK: return "kk_KZ"; + case LANG_KONKANI: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "kok_IN"; + case LANG_KOREAN: return "ko_KR"; + case LANG_KYRGYZ: return "ky_KG"; + case LANG_LAO: return "lo_LA"; + case LANG_LATIN: return "la_VA"; + case LANG_LATVIAN: return "lv_LV"; + case LANG_LITHUANIAN: return "lt_LT"; + case LANG_MACEDONIAN: return "mk_MK"; + case LANG_MALAY: + switch (sub) + { + case SUBLANG_MALAY_MALAYSIA: return "ms_MY"; + case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN"; + } + return "ms"; + case LANG_MALAYALAM: return "ml_IN"; + case LANG_MALTESE: return "mt_MT"; + case LANG_MANIPURI: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "mni_IN"; + case LANG_MARATHI: return "mr_IN"; + case LANG_MONGOLIAN: + return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */ + case LANG_NEPALI: + switch (sub) + { + case SUBLANG_DEFAULT: return "ne_NP"; + case SUBLANG_NEPALI_INDIA: return "ne_IN"; + } + return "ne"; + case LANG_NORWEGIAN: + switch (sub) + { + case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO"; + case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO"; + } + return "no"; + case LANG_ORIYA: return "or_IN"; + case LANG_OROMO: return "om_ET"; + case LANG_PAPIAMENTU: return "pap_AN"; + case LANG_PASHTO: + return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */ + case LANG_POLISH: return "pl_PL"; + case LANG_PORTUGUESE: + switch (sub) + { + case SUBLANG_PORTUGUESE: return "pt_PT"; + /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT. + Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */ + case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR"; + } + return "pt"; + case LANG_PUNJABI: + switch (sub) + { + case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */ + case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */ + } + return "pa"; + case LANG_RHAETO_ROMANCE: return "rm_CH"; + case LANG_ROMANIAN: + switch (sub) + { + case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO"; + case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD"; + } + return "ro"; + case LANG_RUSSIAN: + return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */ + case LANG_SAAMI: /* actually Northern Sami */ return "se_NO"; + case LANG_SANSKRIT: return "sa_IN"; + case LANG_SINDHI: + switch (sub) + { + case SUBLANG_SINDHI_INDIA: return "sd_IN"; + case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; + } + return "sd"; + case LANG_SINHALESE: return "si_LK"; + case LANG_SLOVAK: return "sk_SK"; + case LANG_SLOVENIAN: return "sl_SI"; + case LANG_SOMALI: return "so_SO"; + case LANG_SORBIAN: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "wen_DE"; + case LANG_SPANISH: + switch (sub) + { + case SUBLANG_SPANISH: return "es_ES"; + case SUBLANG_SPANISH_MEXICAN: return "es_MX"; + case SUBLANG_SPANISH_MODERN: + return "es_ES@modern"; /* not seen on Unix */ + case SUBLANG_SPANISH_GUATEMALA: return "es_GT"; + case SUBLANG_SPANISH_COSTA_RICA: return "es_CR"; + case SUBLANG_SPANISH_PANAMA: return "es_PA"; + case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO"; + case SUBLANG_SPANISH_VENEZUELA: return "es_VE"; + case SUBLANG_SPANISH_COLOMBIA: return "es_CO"; + case SUBLANG_SPANISH_PERU: return "es_PE"; + case SUBLANG_SPANISH_ARGENTINA: return "es_AR"; + case SUBLANG_SPANISH_ECUADOR: return "es_EC"; + case SUBLANG_SPANISH_CHILE: return "es_CL"; + case SUBLANG_SPANISH_URUGUAY: return "es_UY"; + case SUBLANG_SPANISH_PARAGUAY: return "es_PY"; + case SUBLANG_SPANISH_BOLIVIA: return "es_BO"; + case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV"; + case SUBLANG_SPANISH_HONDURAS: return "es_HN"; + case SUBLANG_SPANISH_NICARAGUA: return "es_NI"; + case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR"; + } + return "es"; + case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */ + case LANG_SWAHILI: return "sw_KE"; + case LANG_SWEDISH: + switch (sub) + { + case SUBLANG_DEFAULT: return "sv_SE"; + case SUBLANG_SWEDISH_FINLAND: return "sv_FI"; + } + return "sv"; + case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */ + case LANG_TAGALOG: return "tl_PH"; + case LANG_TAJIK: return "tg_TJ"; + case LANG_TAMAZIGHT: + switch (sub) + { + /* FIXME: Adjust this when Tamazight locales appear on Unix. */ + case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; + case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin"; + } + return "ber_MA"; + case LANG_TAMIL: + return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */ + case LANG_TATAR: return "tt_RU"; + case LANG_TELUGU: return "te_IN"; + case LANG_THAI: return "th_TH"; + case LANG_TIBETAN: return "bo_CN"; + case LANG_TIGRINYA: + switch (sub) + { + case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET"; + case SUBLANG_TIGRINYA_ERITREA: return "ti_ER"; + } + return "ti"; + case LANG_TSONGA: return "ts_ZA"; + case LANG_TSWANA: return "tn_BW"; + case LANG_TURKISH: return "tr_TR"; + case LANG_TURKMEN: return "tk_TM"; + case LANG_UKRAINIAN: return "uk_UA"; + case LANG_URDU: + switch (sub) + { + case SUBLANG_URDU_PAKISTAN: return "ur_PK"; + case SUBLANG_URDU_INDIA: return "ur_IN"; + } + return "ur"; + case LANG_UZBEK: + switch (sub) + { + case SUBLANG_UZBEK_LATIN: return "uz_UZ"; + case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic"; + } + return "uz"; + case LANG_VENDA: return "ve_ZA"; + case LANG_VIETNAMESE: return "vi_VN"; + case LANG_WELSH: return "cy_GB"; + case LANG_XHOSA: return "xh_ZA"; + case LANG_YI: return "sit_CN"; + case LANG_YIDDISH: return "yi_IL"; + case LANG_YORUBA: return "yo_NG"; + case LANG_ZULU: return "zu_ZA"; + default: return "C"; + } + +#endif +} diff -urpP gnupg-1.2.5/intl/log.c gnupg-1.2.6/intl/log.c --- gnupg-1.2.5/intl/log.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/log.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,98 @@ +/* Log file output. + Copyright (C) 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Written by Bruno Haible . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include + +/* Print an ASCII string with quotes and escape sequences where needed. */ +static void +print_escaped (FILE *stream, const char *str) +{ + putc ('"', stream); + for (; *str != '\0'; str++) + if (*str == '\n') + { + fputs ("\\n\"", stream); + if (str[1] == '\0') + return; + fputs ("\n\"", stream); + } + else + { + if (*str == '"' || *str == '\\') + putc ('\\', stream); + putc (*str, stream); + } + putc ('"', stream); +} + +/* Add to the log file an entry denoting a failed translation. */ +void +_nl_log_untranslated (const char *logfilename, const char *domainname, + const char *msgid1, const char *msgid2, int plural) +{ + static char *last_logfilename = NULL; + static FILE *last_logfile = NULL; + FILE *logfile; + + /* Can we reuse the last opened logfile? */ + if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0) + { + /* Close the last used logfile. */ + if (last_logfilename != NULL) + { + if (last_logfile != NULL) + { + fclose (last_logfile); + last_logfile = NULL; + } + free (last_logfilename); + last_logfilename = NULL; + } + /* Open the logfile. */ + last_logfilename = (char *) malloc (strlen (logfilename) + 1); + if (last_logfilename == NULL) + return; + strcpy (last_logfilename, logfilename); + last_logfile = fopen (logfilename, "a"); + if (last_logfile == NULL) + return; + } + logfile = last_logfile; + + fprintf (logfile, "domain "); + print_escaped (logfile, domainname); + fprintf (logfile, "\nmsgid "); + print_escaped (logfile, msgid1); + if (plural) + { + fprintf (logfile, "\nmsgid_plural "); + print_escaped (logfile, msgid2); + fprintf (logfile, "\nmsgstr[0] \"\"\n"); + } + else + fprintf (logfile, "\nmsgstr \"\"\n"); + putc ('\n', logfile); +} diff -urpP gnupg-1.2.5/intl/ngettext.c gnupg-1.2.6/intl/ngettext.c --- gnupg-1.2.5/intl/ngettext.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/ngettext.c 2004-08-09 15:28:48.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of ngettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -46,18 +46,15 @@ # define NGETTEXT __ngettext # define DCNGETTEXT __dcngettext #else -# define NGETTEXT ngettext__ -# define DCNGETTEXT dcngettext__ +# define NGETTEXT libintl_ngettext +# define DCNGETTEXT libintl_dcngettext #endif /* Look up MSGID in the current default message catalog for the current LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ char * -NGETTEXT (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; +NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n) { return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); } diff -urpP gnupg-1.2.5/intl/os2compat.c gnupg-1.2.6/intl/os2compat.c --- gnupg-1.2.5/intl/os2compat.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/os2compat.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,98 @@ +/* OS/2 compatibility functions. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#define OS2_AWARE +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +/* A version of getenv() that works from DLLs */ +extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue); + +char * +_nl_getenv (const char *name) +{ + unsigned char *value; + if (DosScanEnv (name, &value)) + return NULL; + else + return value; +} + +/* A fixed size buffer. */ +char libintl_nl_default_dirname[MAXPATHLEN+1]; + +char *_nlos2_libdir = NULL; +char *_nlos2_localealiaspath = NULL; +char *_nlos2_localedir = NULL; + +static __attribute__((constructor)) void +nlos2_initialize () +{ + char *root = getenv ("UNIXROOT"); + char *gnulocaledir = getenv ("GNULOCALEDIR"); + + _nlos2_libdir = gnulocaledir; + if (!_nlos2_libdir) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1); + memcpy (_nlos2_libdir, root, sl); + memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1); + } + else + _nlos2_libdir = LIBDIR; + } + + _nlos2_localealiaspath = gnulocaledir; + if (!_nlos2_localealiaspath) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1); + memcpy (_nlos2_localealiaspath, root, sl); + memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1); + } + else + _nlos2_localealiaspath = LOCALE_ALIAS_PATH; + } + + _nlos2_localedir = gnulocaledir; + if (!_nlos2_localedir) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1); + memcpy (_nlos2_localedir, root, sl); + memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1); + } + else + _nlos2_localedir = LOCALEDIR; + } + + if (strlen (_nlos2_localedir) <= MAXPATHLEN) + strcpy (libintl_nl_default_dirname, _nlos2_localedir); +} diff -urpP gnupg-1.2.5/intl/os2compat.h gnupg-1.2.6/intl/os2compat.h --- gnupg-1.2.5/intl/os2compat.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/os2compat.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,46 @@ +/* OS/2 compatibility defines. + This file is intended to be included from config.h + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* When included from os2compat.h we need all the original definitions */ +#ifndef OS2_AWARE + +#undef LIBDIR +#define LIBDIR _nlos2_libdir +extern char *_nlos2_libdir; + +#undef LOCALEDIR +#define LOCALEDIR _nlos2_localedir +extern char *_nlos2_localedir; + +#undef LOCALE_ALIAS_PATH +#define LOCALE_ALIAS_PATH _nlos2_localealiaspath +extern char *_nlos2_localealiaspath; + +#endif + +#undef HAVE_STRCASECMP +#define HAVE_STRCASECMP 1 +#define strcasecmp stricmp +#define strncasecmp strnicmp + +/* We have our own getenv() which works even if library is compiled as DLL */ +#define getenv _nl_getenv + +/* Older versions of gettext used -1 as the value of LC_MESSAGES */ +#define LC_MESSAGES_COMPAT (-1) diff -urpP gnupg-1.2.5/intl/osdep.c gnupg-1.2.6/intl/osdep.c --- gnupg-1.2.5/intl/osdep.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/osdep.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,24 @@ +/* OS dependent parts of libintl. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#if defined __EMX__ +# include "os2compat.c" +#else +/* Avoid AIX compiler warning. */ +typedef int dummy; +#endif diff -urpP gnupg-1.2.5/intl/plural-exp.c gnupg-1.2.6/intl/plural-exp.c --- gnupg-1.2.5/intl/plural-exp.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/plural-exp.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,154 @@ +/* Expression parsing for plural form selection. + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. + Written by Ulrich Drepper , 2000. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include + +#include "plural-exp.h" + +#if (defined __GNUC__ && !defined __APPLE_CC__) \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) + +/* These structs are the constant expression for the germanic plural + form determination. It represents the expression "n != 1". */ +static const struct expression plvar = +{ + .nargs = 0, + .operation = var, +}; +static const struct expression plone = +{ + .nargs = 0, + .operation = num, + .val = + { + .num = 1 + } +}; +struct expression GERMANIC_PLURAL = +{ + .nargs = 2, + .operation = not_equal, + .val = + { + .args = + { + [0] = (struct expression *) &plvar, + [1] = (struct expression *) &plone + } + } +}; + +# define INIT_GERMANIC_PLURAL() + +#else + +/* For compilers without support for ISO C 99 struct/union initializers: + Initialization at run-time. */ + +static struct expression plvar; +static struct expression plone; +struct expression GERMANIC_PLURAL; + +static void +init_germanic_plural () +{ + if (plone.val.num == 0) + { + plvar.nargs = 0; + plvar.operation = var; + + plone.nargs = 0; + plone.operation = num; + plone.val.num = 1; + + GERMANIC_PLURAL.nargs = 2; + GERMANIC_PLURAL.operation = not_equal; + GERMANIC_PLURAL.val.args[0] = &plvar; + GERMANIC_PLURAL.val.args[1] = &plone; + } +} + +# define INIT_GERMANIC_PLURAL() init_germanic_plural () + +#endif + +void +internal_function +EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp, + unsigned long int *npluralsp) +{ + if (nullentry != NULL) + { + const char *plural; + const char *nplurals; + + plural = strstr (nullentry, "plural="); + nplurals = strstr (nullentry, "nplurals="); + if (plural == NULL || nplurals == NULL) + goto no_plural; + else + { + char *endp; + unsigned long int n; + struct parse_args args; + + /* First get the number. */ + nplurals += 9; + while (*nplurals != '\0' && isspace ((unsigned char) *nplurals)) + ++nplurals; + if (!(*nplurals >= '0' && *nplurals <= '9')) + goto no_plural; +#if defined HAVE_STRTOUL || defined _LIBC + n = strtoul (nplurals, &endp, 10); +#else + for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) + n = n * 10 + (*endp - '0'); +#endif + if (nplurals == endp) + goto no_plural; + *npluralsp = n; + + /* Due to the restrictions bison imposes onto the interface of the + scanner function we have to put the input string and the result + passed up from the parser into the same structure which address + is passed down to the parser. */ + plural += 7; + args.cp = plural; + if (PLURAL_PARSE (&args) != 0) + goto no_plural; + *pluralp = args.res; + } + } + else + { + /* By default we are using the Germanic form: singular form only + for `one', the plural form otherwise. Yes, this is also what + English is using since English is a Germanic language. */ + no_plural: + INIT_GERMANIC_PLURAL (); + *pluralp = &GERMANIC_PLURAL; + *npluralsp = 2; + } +} diff -urpP gnupg-1.2.5/intl/plural-exp.h gnupg-1.2.6/intl/plural-exp.h --- gnupg-1.2.5/intl/plural-exp.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/plural-exp.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,118 @@ +/* Expression parsing and evaluation for plural form selection. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + Written by Ulrich Drepper , 2000. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _PLURAL_EXP_H +#define _PLURAL_EXP_H + +#ifndef internal_function +# define internal_function +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + + +/* This is the representation of the expressions to determine the + plural form. */ +struct expression +{ + int nargs; /* Number of arguments. */ + enum operator + { + /* Without arguments: */ + var, /* The variable "n". */ + num, /* Decimal number. */ + /* Unary operators: */ + lnot, /* Logical NOT. */ + /* Binary operators: */ + mult, /* Multiplication. */ + divide, /* Division. */ + module, /* Modulo operation. */ + plus, /* Addition. */ + minus, /* Subtraction. */ + less_than, /* Comparison. */ + greater_than, /* Comparison. */ + less_or_equal, /* Comparison. */ + greater_or_equal, /* Comparison. */ + equal, /* Comparison for equality. */ + not_equal, /* Comparison for inequality. */ + land, /* Logical AND. */ + lor, /* Logical OR. */ + /* Ternary operators: */ + qmop /* Question mark operator. */ + } operation; + union + { + unsigned long int num; /* Number value for `num'. */ + struct expression *args[3]; /* Up to three arguments. */ + } val; +}; + +/* This is the data structure to pass information to the parser and get + the result in a thread-safe way. */ +struct parse_args +{ + const char *cp; + struct expression *res; +}; + + +/* Names for the libintl functions are a problem. This source code is used + 1. in the GNU C Library library, + 2. in the GNU libintl library, + 3. in the GNU gettext tools. + The function names in each situation must be different, to allow for + binary incompatible changes in 'struct expression'. Furthermore, + 1. in the GNU C Library library, the names have a __ prefix, + 2.+3. in the GNU libintl library and in the GNU gettext tools, the names + must follow ANSI C and not start with __. + So we have to distinguish the three cases. */ +#ifdef _LIBC +# define FREE_EXPRESSION __gettext_free_exp +# define PLURAL_PARSE __gettextparse +# define GERMANIC_PLURAL __gettext_germanic_plural +# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural +#elif defined (IN_LIBINTL) +# define FREE_EXPRESSION libintl_gettext_free_exp +# define PLURAL_PARSE libintl_gettextparse +# define GERMANIC_PLURAL libintl_gettext_germanic_plural +# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural +#else +# define FREE_EXPRESSION free_plural_expression +# define PLURAL_PARSE parse_plural_expression +# define GERMANIC_PLURAL germanic_plural +# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression +#endif + +extern void FREE_EXPRESSION (struct expression *exp) + internal_function; +extern int PLURAL_PARSE (void *arg); +extern struct expression GERMANIC_PLURAL attribute_hidden; +extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry, + struct expression **pluralp, + unsigned long int *npluralsp) + internal_function; + +#if !defined (_LIBC) && !defined (IN_LIBINTL) +extern unsigned long int plural_eval (struct expression *pexp, + unsigned long int n); +#endif + +#endif /* _PLURAL_EXP_H */ diff -urpP gnupg-1.2.5/intl/plural.c gnupg-1.2.6/intl/plural.c --- gnupg-1.2.5/intl/plural.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/plural.c 2004-08-09 15:28:50.000000000 +0000 @@ -1,6 +1,5 @@ - -/* A Bison parser, made from plural.y - by GNU Bison version 1.28 */ +/* A Bison parser, made from plural.y + by GNU bison 1.35. */ #define YYBISON 1 /* Identify Bison output. */ @@ -11,16 +10,16 @@ #define yychar __gettextchar #define yydebug __gettextdebug #define yynerrs __gettextnerrs -#define EQUOP2 257 -#define CMPOP2 258 -#define ADDOP2 259 -#define MULOP2 260 -#define NUMBER 261 +# define EQUOP2 257 +# define CMPOP2 258 +# define ADDOP2 259 +# define MULOP2 260 +# define NUMBER 261 #line 1 "plural.y" /* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -50,54 +49,39 @@ # include #endif +#include #include -#include "gettextP.h" +#include "plural-exp.h" -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define FREE_EXPRESSION __gettext_free_exp -#else -# define FREE_EXPRESSION gettext_free_exp__ -# define __gettextparse gettextparse__ +/* The main function generated by the parser is called __gettextparse, + but we want it to be called PLURAL_PARSE. */ +#ifndef _LIBC +# define __gettextparse PLURAL_PARSE #endif #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 53 "plural.y" +#line 49 "plural.y" +#ifndef YYSTYPE typedef union { unsigned long int num; enum operator op; struct expression *exp; -} YYSTYPE; -#line 59 "plural.y" +} yystype; +# define YYSTYPE yystype +# define YYSTYPE_IS_TRIVIAL 1 +#endif +#line 55 "plural.y" /* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); /* Allocation of expressions. */ static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; +new_exp (int nargs, enum operator op, struct expression * const *args) { int i; struct expression *newp; @@ -126,16 +110,13 @@ new_exp (nargs, op, args) } static inline struct expression * -new_exp_0 (op) - enum operator op; +new_exp_0 (enum operator op) { return new_exp (0, op, NULL); } static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; +new_exp_1 (enum operator op, struct expression *right) { struct expression *args[1]; @@ -144,10 +125,7 @@ new_exp_1 (op, right) } static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; +new_exp_2 (enum operator op, struct expression *left, struct expression *right) { struct expression *args[2]; @@ -157,11 +135,8 @@ new_exp_2 (op, left, right) } static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; +new_exp_3 (enum operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) { struct expression *args[3]; @@ -171,12 +146,8 @@ new_exp_3 (op, bexp, tbranch, fbranch) return new_exp (3, op, args); } -#include - -#ifndef __cplusplus -#ifndef __STDC__ -#define const -#endif +#ifndef YYDEBUG +# define YYDEBUG 0 #endif @@ -185,129 +156,152 @@ new_exp_3 (op, bexp, tbranch, fbranch) #define YYFLAG -32768 #define YYNTBASE 16 +/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ #define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18) -static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 10, 2, 2, 2, 2, 5, 2, 14, - 15, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 12, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 13, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 6, 7, 8, 9, - 11 +/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ +static const char yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 10, 2, 2, 2, 2, 5, 2, + 14, 15, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 12, 2, + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 13, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 6, 7, 8, + 9, 11 }; -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 2, 8, 12, 16, 20, 24, 28, 32, 35, - 37, 39 +#if YYDEBUG +static const short yyprhs[] = +{ + 0, 0, 2, 8, 12, 16, 20, 24, 28, 32, + 35, 37, 39 }; - -static const short yyrhs[] = { 17, - 0, 17, 3, 17, 12, 17, 0, 17, 4, 17, - 0, 17, 5, 17, 0, 17, 6, 17, 0, 17, - 7, 17, 0, 17, 8, 17, 0, 17, 9, 17, - 0, 10, 17, 0, 13, 0, 11, 0, 14, 17, - 15, 0 +static const short yyrhs[] = +{ + 17, 0, 17, 3, 17, 12, 17, 0, 17, 4, + 17, 0, 17, 5, 17, 0, 17, 6, 17, 0, + 17, 7, 17, 0, 17, 8, 17, 0, 17, 9, + 17, 0, 10, 17, 0, 13, 0, 11, 0, 14, + 17, 15, 0 }; #endif -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 178, 186, 190, 194, 198, 202, 206, 210, 214, 218, - 222, 227 +#if YYDEBUG +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const short yyrline[] = +{ + 0, 150, 158, 162, 166, 170, 174, 178, 182, 186, + 190, 194, 199 }; #endif -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) +#if (YYDEBUG) || defined YYERROR_VERBOSE -static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'", -"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'", -"start","exp", NULL +/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ +static const char *const yytname[] = +{ + "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", + "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", + "start", "exp", 0 }; #endif -static const short yyr1[] = { 0, - 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const short yyr1[] = +{ + 0, 16, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17 }; -static const short yyr2[] = { 0, - 1, 5, 3, 3, 3, 3, 3, 3, 2, 1, - 1, 3 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const short yyr2[] = +{ + 0, 1, 5, 3, 3, 3, 3, 3, 3, 2, + 1, 1, 3 }; -static const short yydefact[] = { 0, - 0, 11, 10, 0, 1, 9, 0, 0, 0, 0, - 0, 0, 0, 0, 12, 0, 3, 4, 5, 6, - 7, 8, 0, 2, 0, 0, 0 +/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE + doesn't specify something else to do. Zero means the default is an + error. */ +static const short yydefact[] = +{ + 0, 0, 11, 10, 0, 1, 9, 0, 0, 0, + 0, 0, 0, 0, 0, 12, 0, 3, 4, 5, + 6, 7, 8, 0, 2, 0, 0, 0 }; -static const short yydefgoto[] = { 25, - 5 +static const short yydefgoto[] = +{ + 25, 5 }; -static const short yypact[] = { -9, - -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9, - -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26, - -3,-32768, -9, 34, 21, 53,-32768 +static const short yypact[] = +{ + -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, + -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16, + 26, -3,-32768, -9, 34, 21, 53,-32768 }; -static const short yypgoto[] = {-32768, - -1 +static const short yypgoto[] = +{ + -32768, -1 }; #define YYLAST 53 -static const short yytable[] = { 6, - 1, 2, 7, 3, 4, 14, 16, 17, 18, 19, - 20, 21, 22, 8, 9, 10, 11, 12, 13, 14, - 26, 24, 12, 13, 14, 15, 8, 9, 10, 11, - 12, 13, 14, 13, 14, 23, 8, 9, 10, 11, - 12, 13, 14, 10, 11, 12, 13, 14, 11, 12, - 13, 14, 27 +static const short yytable[] = +{ + 6, 1, 2, 7, 3, 4, 14, 16, 17, 18, + 19, 20, 21, 22, 8, 9, 10, 11, 12, 13, + 14, 26, 24, 12, 13, 14, 15, 8, 9, 10, + 11, 12, 13, 14, 13, 14, 23, 8, 9, 10, + 11, 12, 13, 14, 10, 11, 12, 13, 14, 11, + 12, 13, 14, 27 }; -static const short yycheck[] = { 1, - 10, 11, 4, 13, 14, 9, 8, 9, 10, 11, - 12, 13, 14, 3, 4, 5, 6, 7, 8, 9, - 0, 23, 7, 8, 9, 15, 3, 4, 5, 6, - 7, 8, 9, 8, 9, 12, 3, 4, 5, 6, - 7, 8, 9, 5, 6, 7, 8, 9, 6, 7, - 8, 9, 0 +static const short yycheck[] = +{ + 1, 10, 11, 4, 13, 14, 9, 8, 9, 10, + 11, 12, 13, 14, 3, 4, 5, 6, 7, 8, + 9, 0, 23, 7, 8, 9, 15, 3, 4, 5, + 6, 7, 8, 9, 8, 9, 12, 3, 4, 5, + 6, 7, 8, 9, 5, 6, 7, 8, 9, 6, + 7, 8, 9, 0 }; #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" -/* This file comes from bison-1.28. */ +#line 3 "/usr/local/share/bison/bison.simple" /* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -329,62 +323,131 @@ static const short yycheck[] = { 1, This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -#ifdef alloca -#define YYSTACK_USE_ALLOCA -#else /* alloca not defined */ -#ifdef __GNUC__ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* We think this test detects Watcom and Microsoft C. */ -/* This used to test MSDOS, but that is a bad idea - since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -#if 0 /* No need for malloc.h, which pollutes the namespace; - instead, just don't use alloca. */ -#include -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ - #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc */ -#endif /* not GNU C */ -#endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ +/* This is the parser code that is written into each bison parser when + the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# else +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +# define YYSTACK_ALLOC malloc +# define YYSTACK_FREE free +# endif +#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ + + +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + short yyss; + YYSTYPE yyvs; +# if YYLSP_NEEDED + YYLTYPE yyls; +# endif +}; -#ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca -#else -#define YYSTACK_ALLOC malloc -#endif +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# if YYLSP_NEEDED +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + + 2 * YYSTACK_GAP_MAX) +# else +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAX) +# endif + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + register YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (0) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) + +#endif + + +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) @@ -393,131 +456,161 @@ static const short yycheck[] = { 1, #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ #define YYFAIL goto yyerrlab #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ +#define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ + { \ + yychar = (Token); \ + yylval = (Value); \ yychar1 = YYTRANSLATE (yychar); \ YYPOPSTACK; \ goto yybackup; \ } \ else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ + { \ + yyerror ("syntax error: cannot back up"); \ + YYERROR; \ + } \ while (0) #define YYTERROR 1 #define YYERRCODE 256 -#ifndef YYPURE -#define YYLEX yylex() -#endif -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) -#endif -#else /* not YYLSP_NEEDED */ -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval) -#endif -#endif /* not YYLSP_NEEDED */ -#endif - -/* If nonreentrant, generate the variables here */ +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). -#ifndef YYPURE - -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ - -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ + When YYLLOC_DEFAULT is run, CURRENT is set the location of the + first token. By default, to implement support for ranges, extend + its range to the last symbol. */ + +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + Current.last_line = Rhs[N].last_line; \ + Current.last_column = Rhs[N].last_column; #endif -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ - -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ -#endif -/* YYINITDEPTH indicates the initial size of the parser's stacks */ +/* YYLEX -- calling `yylex' with the right arguments. */ + +#if YYPURE +# if YYLSP_NEEDED +# ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +# else +# define YYLEX yylex (&yylval, &yylloc) +# endif +# else /* !YYLSP_NEEDED */ +# ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, YYLEX_PARAM) +# else +# define YYLEX yylex (&yylval) +# endif +# endif /* !YYLSP_NEEDED */ +#else /* !YYPURE */ +# define YYLEX yylex () +#endif /* !YYPURE */ + + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +#endif /* !YYDEBUG */ +/* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH -#define YYINITDEPTH 200 +# define YYINITDEPTH 200 #endif -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ #if YYMAXDEPTH == 0 -#undef YYMAXDEPTH +# undef YYMAXDEPTH #endif #ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 +# define YYMAXDEPTH 10000 #endif -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus +#ifdef YYERROR_VERBOSE -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - unsigned int count; -{ - register char *f = from; - register char *t = to; - register int i = count; +# ifndef yystrlen +# if defined (__GLIBC__) && defined (_STRING_H) +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +static YYSIZE_T +# if defined (__STDC__) || defined (__cplusplus) +yystrlen (const char *yystr) +# else +yystrlen (yystr) + const char *yystr; +# endif +{ + register const char *yys = yystr; - while (i-- > 0) - *t++ = *f++; -} + while (*yys++ != '\0') + continue; -#else /* __cplusplus */ + return yys - yystr - 1; +} +# endif +# endif -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, unsigned int count) +# ifndef yystpcpy +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +static char * +# if defined (__STDC__) || defined (__cplusplus) +yystpcpy (char *yydest, const char *yysrc) +# else +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +# endif { - register char *t = to; - register char *f = from; - register int i = count; + register char *yyd = yydest; + register const char *yys = yysrc; - while (i-- > 0) - *t++ = *f++; -} + while ((*yyd++ = *yys++) != '\0') + continue; -#endif + return yyd - 1; +} +# endif +# endif #endif -#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" +#line 315 "/usr/local/share/bison/bison.simple" + /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -526,76 +619,121 @@ __yy_memcpy (char *to, char *from, unsig to the proper pointer type. */ #ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ +# if defined (__STDC__) || defined (__cplusplus) +# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM +# define YYPARSE_PARAM_DECL +# else +# define YYPARSE_PARAM_ARG YYPARSE_PARAM +# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +# endif +#else /* !YYPARSE_PARAM */ +# define YYPARSE_PARAM_ARG +# define YYPARSE_PARAM_DECL +#endif /* !YYPARSE_PARAM */ /* Prevent warning if -Wstrict-prototypes. */ #ifdef __GNUC__ -#ifdef YYPARSE_PARAM +# ifdef YYPARSE_PARAM int yyparse (void *); -#else +# else int yyparse (void); +# endif #endif + +/* YY_DECL_VARIABLES -- depending whether we use a pure parser, + variables are global, or local to YYPARSE. */ + +#define YY_DECL_NON_LSP_VARIABLES \ +/* The lookahead symbol. */ \ +int yychar; \ + \ +/* The semantic value of the lookahead symbol. */ \ +YYSTYPE yylval; \ + \ +/* Number of parse errors so far. */ \ +int yynerrs; + +#if YYLSP_NEEDED +# define YY_DECL_VARIABLES \ +YY_DECL_NON_LSP_VARIABLES \ + \ +/* Location data for the lookahead symbol. */ \ +YYLTYPE yylloc; +#else +# define YY_DECL_VARIABLES \ +YY_DECL_NON_LSP_VARIABLES #endif + +/* If nonreentrant, generate the variables here. */ + +#if !YYPURE +YY_DECL_VARIABLES +#endif /* !YYPURE */ + int -yyparse(YYPARSE_PARAM_ARG) +yyparse (YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { + /* If reentrant, generate the variables here. */ +#if YYPURE + YY_DECL_VARIABLES +#endif /* !YYPURE */ + register int yystate; register int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Lookahead token as an internal (translated) token number. */ + int yychar1 = 0; + + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; register short *yyssp; - register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + register YYSTYPE *yyvsp; -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ +#if YYLSP_NEEDED + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; +#endif -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) +#if YYLSP_NEEDED +# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) #else -#define YYPOPSTACK (yyvsp--, yyssp--) +# define YYPOPSTACK (yyvsp--, yyssp--) #endif - int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; + YYSIZE_T yystacksize = YYINITDEPTH; -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; -#endif -#endif - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; +#if YYLSP_NEEDED + YYLTYPE yyloc; +#endif + /* When reducing, the number of symbols on the RHS of the reduced + rule. */ int yylen; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; @@ -607,110 +745,110 @@ yyparse(YYPARSE_PARAM_ARG) so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss - 1; + yyssp = yyss; yyvsp = yyvs; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED yylsp = yyls; #endif + goto yysetstate; -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. so pushing a state here evens the stacks. + */ + yyssp++; - *++yyssp = yystate; + yysetstate: + *yyssp = yystate; if (yyssp >= yyss + yystacksize - 1) { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif - /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; + YYSIZE_T yysize = yyssp - yyss + 1; #ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif - - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + short *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. */ +# if YYLSP_NEEDED + YYLTYPE *yyls1 = yyls; + /* This used to be a conditional around just the two extra args, + but that might be undefined if yyoverflow is a macro. */ + yyoverflow ("parser stack overflow", + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + yyls = yyls1; +# else + yyoverflow ("parser stack overflow", + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); +# endif + yyss = yyss1; + yyvs = yyvs1; + } #else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyoverflowlab; +# else /* Extend the stack our own way. */ if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 2; - } + goto yyoverflowlab; yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; -#ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -#endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); -#endif + + { + short *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyoverflowlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); +# if YYLSP_NEEDED + YYSTACK_RELOCATE (yyls); +# endif +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif #endif /* no yyoverflow */ - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; +#if YYLSP_NEEDED + yylsp = yyls + yysize - 1; #endif -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); if (yyssp >= yyss + yystacksize - 1) YYABORT; } -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); goto yybackup; - yybackup: + + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: /* Do appropriate processing given the current state. */ /* Read a lookahead token if we need one and don't already have one. */ @@ -729,10 +867,7 @@ yynewstate: if (yychar == YYEMPTY) { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif + YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } @@ -743,25 +878,25 @@ yynewstate: yychar1 = 0; yychar = YYEOF; /* Don't call YYLEX any more */ -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif + YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE(yychar); + yychar1 = YYTRANSLATE (yychar); -#if YYDEBUG != 0 +#if YYDEBUG + /* We have to keep this `#if YYDEBUG', since we use variables + which are defined only if `YYDEBUG' is set. */ if (yydebug) { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT + YYFPRINTF (stderr, "Next token is %d (%s", + yychar, yytname[yychar1]); + /* Give the individual parser a way to print the precise + meaning of a token, for further debugging info. */ +# ifdef YYPRINT YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); +# endif + YYFPRINTF (stderr, ")\n"); } #endif } @@ -793,177 +928,185 @@ yynewstate: YYACCEPT; /* Shift the lookahead token. */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif + YYDPRINTF ((stderr, "Shifting token %d (%s), ", + yychar, yytname[yychar1])); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; *++yyvsp = yylval; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED *++yylsp = yylloc; #endif - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; yystate = yyn; goto yynewstate; -/* Do the default action for the current state. */ -yydefault: +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: yyn = yydefact[yystate]; if (yyn == 0) goto yyerrlab; + goto yyreduce; -/* Do a reduction. yyn is the number of a rule to reduce with. */ + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ yyreduce: + /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ -#if YYDEBUG != 0 + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to the semantic value of + the lookahead token. This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + +#if YYLSP_NEEDED + /* Similarly for the default location. Let the user run additional + commands if for instance locations are ranges. */ + yyloc = yylsp[1-yylen]; + YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); +#endif + +#if YYDEBUG + /* We have to keep this `#if YYDEBUG', since we use variables which + are defined only if `YYDEBUG' is set. */ if (yydebug) { - int i; + int yyi; - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); + YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", + yyn, yyrline[yyn]); /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); + for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); + YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); } #endif - switch (yyn) { case 1: -#line 179 "plural.y" +#line 151 "plural.y" { if (yyvsp[0].exp == NULL) YYABORT; ((struct parse_args *) arg)->res = yyvsp[0].exp; - ; - break;} + } + break; case 2: -#line 187 "plural.y" +#line 159 "plural.y" { yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 3: -#line 191 "plural.y" +#line 163 "plural.y" { yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 4: -#line 195 "plural.y" +#line 167 "plural.y" { yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 5: -#line 199 "plural.y" +#line 171 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 6: -#line 203 "plural.y" +#line 175 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 7: -#line 207 "plural.y" +#line 179 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 8: -#line 211 "plural.y" +#line 183 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); - ; - break;} + } + break; case 9: -#line 215 "plural.y" +#line 187 "plural.y" { yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); - ; - break;} + } + break; case 10: -#line 219 "plural.y" +#line 191 "plural.y" { yyval.exp = new_exp_0 (var); - ; - break;} + } + break; case 11: -#line 223 "plural.y" +#line 195 "plural.y" { if ((yyval.exp = new_exp_0 (num)) != NULL) yyval.exp->val.num = yyvsp[0].num; - ; - break;} + } + break; case 12: -#line 228 "plural.y" +#line 200 "plural.y" { yyval.exp = yyvsp[-1].exp; - ; - break;} + } + break; } - /* the action file gets copied in in place of this dollarsign */ -#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" + +#line 705 "/usr/local/share/bison/bison.simple" + yyvsp -= yylen; yyssp -= yylen; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED yylsp -= yylen; #endif -#if YYDEBUG != 0 +#if YYDEBUG if (yydebug) { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + short *yyssp1 = yyss - 1; + YYFPRINTF (stderr, "state stack now"); + while (yyssp1 != yyssp) + YYFPRINTF (stderr, " %d", *++yyssp1); + YYFPRINTF (stderr, "\n"); } #endif *++yyvsp = yyval; - -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } +#if YYLSP_NEEDED + *++yylsp = yyloc; #endif - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ yyn = yyr1[yyn]; @@ -975,10 +1118,13 @@ case 12: goto yynewstate; -yyerrlab: /* here on detecting error */ - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) { ++yynerrs; @@ -987,102 +1133,121 @@ yyerrlab: /* here on detecting error * if (yyn > YYFLAG && yyn < YYLAST) { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) + YYSIZE_T yysize = 0; + char *yymsg; + int yyx, yycount; + + yycount = 0; + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + if (yycheck[yyx + yyn] == yyx) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("parse error, unexpected ") + 1; + yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) { - strcpy(msg, "parse error"); + char *yyp = yystpcpy (yymsg, "parse error, unexpected "); + yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); - if (count < 5) + if (yycount < 5) { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx) { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; } } - yyerror(msg); - free(msg); + yyerror (yymsg); + YYSTACK_FREE (yymsg); } else - yyerror ("parse error; also virtual memory exceeded"); + yyerror ("parse error; also virtual memory exhausted"); } else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); +#endif /* defined (YYERROR_VERBOSE) */ + yyerror ("parse error"); } - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ + +/*--------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action | +`--------------------------------------------------*/ +yyerrlab1: if (yyerrstatus == 3) { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ /* return failure if at end of input */ if (yychar == YYEOF) YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif - + YYDPRINTF ((stderr, "Discarding token %d (%s).\n", + yychar, yytname[yychar1])); yychar = YYEMPTY; } - /* Else will try to reuse lookahead token - after shifting the error token. */ + /* Else will try to reuse lookahead token after shifting the error + token. */ yyerrstatus = 3; /* Each real token shifted decrements this */ goto yyerrhandle; -yyerrdefault: /* current state does not do anything special for the error token. */ +/*-------------------------------------------------------------------. +| yyerrdefault -- current state does not do anything special for the | +| error token. | +`-------------------------------------------------------------------*/ +yyerrdefault: #if 0 /* This is wrong; only states that explicitly want error tokens should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; + + /* If its default is to accept any token, ok. Otherwise pop it. */ + yyn = yydefact[yystate]; + if (yyn) + goto yydefault; #endif -yyerrpop: /* pop the current state because it cannot handle the error token */ - if (yyssp == yyss) YYABORT; +/*---------------------------------------------------------------. +| yyerrpop -- pop the current state because it cannot handle the | +| error token | +`---------------------------------------------------------------*/ +yyerrpop: + if (yyssp == yyss) + YYABORT; yyvsp--; yystate = *--yyssp; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED yylsp--; #endif -#if YYDEBUG != 0 +#if YYDEBUG if (yydebug) { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + short *yyssp1 = yyss - 1; + YYFPRINTF (stderr, "Error: state stack now"); + while (yyssp1 != yyssp) + YYFPRINTF (stderr, " %d", *++yyssp1); + YYFPRINTF (stderr, "\n"); } #endif +/*--------------. +| yyerrhandle. | +`--------------*/ yyerrhandle: - yyn = yypact[yystate]; if (yyn == YYFLAG) goto yyerrdefault; @@ -1105,50 +1270,52 @@ yyerrhandle: if (yyn == YYFINAL) YYACCEPT; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif + YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; -#ifdef YYLSP_NEEDED +#if YYLSP_NEEDED *++yylsp = yylloc; #endif yystate = yyn; goto yynewstate; - yyacceptlab: - /* YYACCEPT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 0; - yyabortlab: - /* YYABORT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +/*---------------------------------------------. +| yyoverflowab -- parser overflow comes here. | +`---------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); + yyresult = 2; + /* Fall through. */ + +yyreturn: +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); #endif - } - return 1; + return yyresult; } -#line 233 "plural.y" +#line 205 "plural.y" void internal_function -FREE_EXPRESSION (exp) - struct expression *exp; +FREE_EXPRESSION (struct expression *exp) { if (exp == NULL) return; @@ -1174,9 +1341,7 @@ FREE_EXPRESSION (exp) static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; +yylex (YYSTYPE *lval, const char **pexp) { const char *exp = *pexp; int result; @@ -1319,8 +1484,7 @@ yylex (lval, pexp) static void -yyerror (str) - const char *str; +yyerror (const char *str) { /* Do nothing. We don't print error messages here. */ } diff -urpP gnupg-1.2.5/intl/plural.y gnupg-1.2.6/intl/plural.y --- gnupg-1.2.5/intl/plural.y 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/plural.y 2004-08-09 15:28:48.000000000 +0000 @@ -1,6 +1,6 @@ %{ /* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -30,25 +30,21 @@ # include #endif +#include #include -#include "gettextP.h" +#include "plural-exp.h" -/* Names for the libintl functions are a problem. They must not clash - with existing names and they should follow ANSI C. But this source - code is also used in GNU C Library where the names have a __ - prefix. So we have to make a difference here. */ -#ifdef _LIBC -# define FREE_EXPRESSION __gettext_free_exp -#else -# define FREE_EXPRESSION gettext_free_exp__ -# define __gettextparse gettextparse__ +/* The main function generated by the parser is called __gettextparse, + but we want it to be called PLURAL_PARSE. */ +#ifndef _LIBC +# define __gettextparse PLURAL_PARSE #endif #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg %} %pure_parser -%expect 10 +%expect 7 %union { unsigned long int num; @@ -58,28 +54,13 @@ %{ /* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); /* Allocation of expressions. */ static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; +new_exp (int nargs, enum operator op, struct expression * const *args) { int i; struct expression *newp; @@ -108,16 +89,13 @@ new_exp (nargs, op, args) } static inline struct expression * -new_exp_0 (op) - enum operator op; +new_exp_0 (enum operator op) { return new_exp (0, op, NULL); } static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; +new_exp_1 (enum operator op, struct expression *right) { struct expression *args[1]; @@ -126,10 +104,7 @@ new_exp_1 (op, right) } static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; +new_exp_2 (enum operator op, struct expression *left, struct expression *right) { struct expression *args[2]; @@ -139,11 +114,8 @@ new_exp_2 (op, left, right) } static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; +new_exp_3 (enum operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) { struct expression *args[3]; @@ -234,8 +206,7 @@ exp: exp '?' exp ':' exp void internal_function -FREE_EXPRESSION (exp) - struct expression *exp; +FREE_EXPRESSION (struct expression *exp) { if (exp == NULL) return; @@ -261,9 +232,7 @@ FREE_EXPRESSION (exp) static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; +yylex (YYSTYPE *lval, const char **pexp) { const char *exp = *pexp; int result; @@ -406,8 +375,7 @@ yylex (lval, pexp) static void -yyerror (str) - const char *str; +yyerror (const char *str) { /* Do nothing. We don't print error messages here. */ } diff -urpP gnupg-1.2.5/intl/printf-args.c gnupg-1.2.6/intl/printf-args.c --- gnupg-1.2.5/intl/printf-args.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/printf-args.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,119 @@ +/* Decomposed printf argument list. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "printf-args.h" + +#ifdef STATIC +STATIC +#endif +int +printf_fetchargs (va_list args, arguments *a) +{ + size_t i; + argument *ap; + + for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++) + switch (ap->type) + { + case TYPE_SCHAR: + ap->a.a_schar = va_arg (args, /*signed char*/ int); + break; + case TYPE_UCHAR: + ap->a.a_uchar = va_arg (args, /*unsigned char*/ int); + break; + case TYPE_SHORT: + ap->a.a_short = va_arg (args, /*short*/ int); + break; + case TYPE_USHORT: + ap->a.a_ushort = va_arg (args, /*unsigned short*/ int); + break; + case TYPE_INT: + ap->a.a_int = va_arg (args, int); + break; + case TYPE_UINT: + ap->a.a_uint = va_arg (args, unsigned int); + break; + case TYPE_LONGINT: + ap->a.a_longint = va_arg (args, long int); + break; + case TYPE_ULONGINT: + ap->a.a_ulongint = va_arg (args, unsigned long int); + break; +#ifdef HAVE_LONG_LONG + case TYPE_LONGLONGINT: + ap->a.a_longlongint = va_arg (args, long long int); + break; + case TYPE_ULONGLONGINT: + ap->a.a_ulonglongint = va_arg (args, unsigned long long int); + break; +#endif + case TYPE_DOUBLE: + ap->a.a_double = va_arg (args, double); + break; +#ifdef HAVE_LONG_DOUBLE + case TYPE_LONGDOUBLE: + ap->a.a_longdouble = va_arg (args, long double); + break; +#endif + case TYPE_CHAR: + ap->a.a_char = va_arg (args, int); + break; +#ifdef HAVE_WINT_T + case TYPE_WIDE_CHAR: + ap->a.a_wide_char = va_arg (args, wint_t); + break; +#endif + case TYPE_STRING: + ap->a.a_string = va_arg (args, const char *); + break; +#ifdef HAVE_WCHAR_T + case TYPE_WIDE_STRING: + ap->a.a_wide_string = va_arg (args, const wchar_t *); + break; +#endif + case TYPE_POINTER: + ap->a.a_pointer = va_arg (args, void *); + break; + case TYPE_COUNT_SCHAR_POINTER: + ap->a.a_count_schar_pointer = va_arg (args, signed char *); + break; + case TYPE_COUNT_SHORT_POINTER: + ap->a.a_count_short_pointer = va_arg (args, short *); + break; + case TYPE_COUNT_INT_POINTER: + ap->a.a_count_int_pointer = va_arg (args, int *); + break; + case TYPE_COUNT_LONGINT_POINTER: + ap->a.a_count_longint_pointer = va_arg (args, long int *); + break; +#ifdef HAVE_LONG_LONG + case TYPE_COUNT_LONGLONGINT_POINTER: + ap->a.a_count_longlongint_pointer = va_arg (args, long long int *); + break; +#endif + default: + /* Unknown type. */ + return -1; + } + return 0; +} diff -urpP gnupg-1.2.5/intl/printf-args.h gnupg-1.2.6/intl/printf-args.h --- gnupg-1.2.5/intl/printf-args.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/printf-args.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,137 @@ +/* Decomposed printf argument list. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _PRINTF_ARGS_H +#define _PRINTF_ARGS_H + +/* Get size_t. */ +#include + +/* Get wchar_t. */ +#ifdef HAVE_WCHAR_T +# include +#endif + +/* Get wint_t. */ +#ifdef HAVE_WINT_T +# include +#endif + +/* Get va_list. */ +#include + + +/* Argument types */ +typedef enum +{ + TYPE_NONE, + TYPE_SCHAR, + TYPE_UCHAR, + TYPE_SHORT, + TYPE_USHORT, + TYPE_INT, + TYPE_UINT, + TYPE_LONGINT, + TYPE_ULONGINT, +#ifdef HAVE_LONG_LONG + TYPE_LONGLONGINT, + TYPE_ULONGLONGINT, +#endif + TYPE_DOUBLE, +#ifdef HAVE_LONG_DOUBLE + TYPE_LONGDOUBLE, +#endif + TYPE_CHAR, +#ifdef HAVE_WINT_T + TYPE_WIDE_CHAR, +#endif + TYPE_STRING, +#ifdef HAVE_WCHAR_T + TYPE_WIDE_STRING, +#endif + TYPE_POINTER, + TYPE_COUNT_SCHAR_POINTER, + TYPE_COUNT_SHORT_POINTER, + TYPE_COUNT_INT_POINTER, + TYPE_COUNT_LONGINT_POINTER +#ifdef HAVE_LONG_LONG +, TYPE_COUNT_LONGLONGINT_POINTER +#endif +} arg_type; + +/* Polymorphic argument */ +typedef struct +{ + arg_type type; + union + { + signed char a_schar; + unsigned char a_uchar; + short a_short; + unsigned short a_ushort; + int a_int; + unsigned int a_uint; + long int a_longint; + unsigned long int a_ulongint; +#ifdef HAVE_LONG_LONG + long long int a_longlongint; + unsigned long long int a_ulonglongint; +#endif + float a_float; + double a_double; +#ifdef HAVE_LONG_DOUBLE + long double a_longdouble; +#endif + int a_char; +#ifdef HAVE_WINT_T + wint_t a_wide_char; +#endif + const char* a_string; +#ifdef HAVE_WCHAR_T + const wchar_t* a_wide_string; +#endif + void* a_pointer; + signed char * a_count_schar_pointer; + short * a_count_short_pointer; + int * a_count_int_pointer; + long int * a_count_longint_pointer; +#ifdef HAVE_LONG_LONG + long long int * a_count_longlongint_pointer; +#endif + } + a; +} +argument; + +typedef struct +{ + size_t count; + argument *arg; +} +arguments; + + +/* Fetch the arguments, putting them into a. */ +#ifdef STATIC +STATIC +#else +extern +#endif +int printf_fetchargs (va_list args, arguments *a); + +#endif /* _PRINTF_ARGS_H */ diff -urpP gnupg-1.2.5/intl/printf-parse.c gnupg-1.2.6/intl/printf-parse.c --- gnupg-1.2.5/intl/printf-parse.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/printf-parse.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,537 @@ +/* Formatted output to strings. + Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#if WIDE_CHAR_VERSION +# include "wprintf-parse.h" +#else +# include "printf-parse.h" +#endif + +/* Get size_t, NULL. */ +#include + +/* Get intmax_t. */ +#if HAVE_STDINT_H_WITH_UINTMAX +# include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +# include +#endif + +/* malloc(), realloc(), free(). */ +#include + +/* Checked size_t computations. */ +#include "xsize.h" + +#if WIDE_CHAR_VERSION +# define PRINTF_PARSE wprintf_parse +# define CHAR_T wchar_t +# define DIRECTIVE wchar_t_directive +# define DIRECTIVES wchar_t_directives +#else +# define PRINTF_PARSE printf_parse +# define CHAR_T char +# define DIRECTIVE char_directive +# define DIRECTIVES char_directives +#endif + +#ifdef STATIC +STATIC +#endif +int +PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) +{ + const CHAR_T *cp = format; /* pointer into format */ + size_t arg_posn = 0; /* number of regular arguments consumed */ + size_t d_allocated; /* allocated elements of d->dir */ + size_t a_allocated; /* allocated elements of a->arg */ + size_t max_width_length = 0; + size_t max_precision_length = 0; + + d->count = 0; + d_allocated = 1; + d->dir = malloc (d_allocated * sizeof (DIRECTIVE)); + if (d->dir == NULL) + /* Out of memory. */ + return -1; + + a->count = 0; + a_allocated = 0; + a->arg = NULL; + +#define REGISTER_ARG(_index_,_type_) \ + { \ + size_t n = (_index_); \ + if (n >= a_allocated) \ + { \ + size_t memory_size; \ + argument *memory; \ + \ + a_allocated = xtimes (a_allocated, 2); \ + if (a_allocated <= n) \ + a_allocated = xsum (n, 1); \ + memory_size = xtimes (a_allocated, sizeof (argument)); \ + if (size_overflow_p (memory_size)) \ + /* Overflow, would lead to out of memory. */ \ + goto error; \ + memory = (a->arg \ + ? realloc (a->arg, memory_size) \ + : malloc (memory_size)); \ + if (memory == NULL) \ + /* Out of memory. */ \ + goto error; \ + a->arg = memory; \ + } \ + while (a->count <= n) \ + a->arg[a->count++].type = TYPE_NONE; \ + if (a->arg[n].type == TYPE_NONE) \ + a->arg[n].type = (_type_); \ + else if (a->arg[n].type != (_type_)) \ + /* Ambiguous type for positional argument. */ \ + goto error; \ + } + + while (*cp != '\0') + { + CHAR_T c = *cp++; + if (c == '%') + { + size_t arg_index = ARG_NONE; + DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */ + + /* Initialize the next directive. */ + dp->dir_start = cp - 1; + dp->flags = 0; + dp->width_start = NULL; + dp->width_end = NULL; + dp->width_arg_index = ARG_NONE; + dp->precision_start = NULL; + dp->precision_end = NULL; + dp->precision_arg_index = ARG_NONE; + dp->arg_index = ARG_NONE; + + /* Test for positional argument. */ + if (*cp >= '0' && *cp <= '9') + { + const CHAR_T *np; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + ; + if (*np == '$') + { + size_t n = 0; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + n = xsum (xtimes (n, 10), *np - '0'); + if (n == 0) + /* Positional argument 0. */ + goto error; + if (size_overflow_p (n)) + /* n too large, would lead to out of memory later. */ + goto error; + arg_index = n - 1; + cp = np + 1; + } + } + + /* Read the flags. */ + for (;;) + { + if (*cp == '\'') + { + dp->flags |= FLAG_GROUP; + cp++; + } + else if (*cp == '-') + { + dp->flags |= FLAG_LEFT; + cp++; + } + else if (*cp == '+') + { + dp->flags |= FLAG_SHOWSIGN; + cp++; + } + else if (*cp == ' ') + { + dp->flags |= FLAG_SPACE; + cp++; + } + else if (*cp == '#') + { + dp->flags |= FLAG_ALT; + cp++; + } + else if (*cp == '0') + { + dp->flags |= FLAG_ZERO; + cp++; + } + else + break; + } + + /* Parse the field width. */ + if (*cp == '*') + { + dp->width_start = cp; + cp++; + dp->width_end = cp; + if (max_width_length < 1) + max_width_length = 1; + + /* Test for positional argument. */ + if (*cp >= '0' && *cp <= '9') + { + const CHAR_T *np; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + ; + if (*np == '$') + { + size_t n = 0; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + n = xsum (xtimes (n, 10), *np - '0'); + if (n == 0) + /* Positional argument 0. */ + goto error; + if (size_overflow_p (n)) + /* n too large, would lead to out of memory later. */ + goto error; + dp->width_arg_index = n - 1; + cp = np + 1; + } + } + if (dp->width_arg_index == ARG_NONE) + { + dp->width_arg_index = arg_posn++; + if (dp->width_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ + goto error; + } + REGISTER_ARG (dp->width_arg_index, TYPE_INT); + } + else if (*cp >= '0' && *cp <= '9') + { + size_t width_length; + + dp->width_start = cp; + for (; *cp >= '0' && *cp <= '9'; cp++) + ; + dp->width_end = cp; + width_length = dp->width_end - dp->width_start; + if (max_width_length < width_length) + max_width_length = width_length; + } + + /* Parse the precision. */ + if (*cp == '.') + { + cp++; + if (*cp == '*') + { + dp->precision_start = cp - 1; + cp++; + dp->precision_end = cp; + if (max_precision_length < 2) + max_precision_length = 2; + + /* Test for positional argument. */ + if (*cp >= '0' && *cp <= '9') + { + const CHAR_T *np; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + ; + if (*np == '$') + { + size_t n = 0; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + n = xsum (xtimes (n, 10), *np - '0'); + if (n == 0) + /* Positional argument 0. */ + goto error; + if (size_overflow_p (n)) + /* n too large, would lead to out of memory + later. */ + goto error; + dp->precision_arg_index = n - 1; + cp = np + 1; + } + } + if (dp->precision_arg_index == ARG_NONE) + { + dp->precision_arg_index = arg_posn++; + if (dp->precision_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ + goto error; + } + REGISTER_ARG (dp->precision_arg_index, TYPE_INT); + } + else + { + size_t precision_length; + + dp->precision_start = cp - 1; + for (; *cp >= '0' && *cp <= '9'; cp++) + ; + dp->precision_end = cp; + precision_length = dp->precision_end - dp->precision_start; + if (max_precision_length < precision_length) + max_precision_length = precision_length; + } + } + + { + arg_type type; + + /* Parse argument type/size specifiers. */ + { + int flags = 0; + + for (;;) + { + if (*cp == 'h') + { + flags |= (1 << (flags & 1)); + cp++; + } + else if (*cp == 'L') + { + flags |= 4; + cp++; + } + else if (*cp == 'l') + { + flags += 8; + cp++; + } +#ifdef HAVE_INTMAX_T + else if (*cp == 'j') + { + if (sizeof (intmax_t) > sizeof (long)) + { + /* intmax_t = long long */ + flags += 16; + } + else if (sizeof (intmax_t) > sizeof (int)) + { + /* intmax_t = long */ + flags += 8; + } + cp++; + } +#endif + else if (*cp == 'z' || *cp == 'Z') + { + /* 'z' is standardized in ISO C 99, but glibc uses 'Z' + because the warning facility in gcc-2.95.2 understands + only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */ + if (sizeof (size_t) > sizeof (long)) + { + /* size_t = long long */ + flags += 16; + } + else if (sizeof (size_t) > sizeof (int)) + { + /* size_t = long */ + flags += 8; + } + cp++; + } + else if (*cp == 't') + { + if (sizeof (ptrdiff_t) > sizeof (long)) + { + /* ptrdiff_t = long long */ + flags += 16; + } + else if (sizeof (ptrdiff_t) > sizeof (int)) + { + /* ptrdiff_t = long */ + flags += 8; + } + cp++; + } + else + break; + } + + /* Read the conversion character. */ + c = *cp++; + switch (c) + { + case 'd': case 'i': +#ifdef HAVE_LONG_LONG + if (flags >= 16 || (flags & 4)) + type = TYPE_LONGLONGINT; + else +#endif + if (flags >= 8) + type = TYPE_LONGINT; + else if (flags & 2) + type = TYPE_SCHAR; + else if (flags & 1) + type = TYPE_SHORT; + else + type = TYPE_INT; + break; + case 'o': case 'u': case 'x': case 'X': +#ifdef HAVE_LONG_LONG + if (flags >= 16 || (flags & 4)) + type = TYPE_ULONGLONGINT; + else +#endif + if (flags >= 8) + type = TYPE_ULONGINT; + else if (flags & 2) + type = TYPE_UCHAR; + else if (flags & 1) + type = TYPE_USHORT; + else + type = TYPE_UINT; + break; + case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': + case 'a': case 'A': +#ifdef HAVE_LONG_DOUBLE + if (flags >= 16 || (flags & 4)) + type = TYPE_LONGDOUBLE; + else +#endif + type = TYPE_DOUBLE; + break; + case 'c': + if (flags >= 8) +#ifdef HAVE_WINT_T + type = TYPE_WIDE_CHAR; +#else + goto error; +#endif + else + type = TYPE_CHAR; + break; +#ifdef HAVE_WINT_T + case 'C': + type = TYPE_WIDE_CHAR; + c = 'c'; + break; +#endif + case 's': + if (flags >= 8) +#ifdef HAVE_WCHAR_T + type = TYPE_WIDE_STRING; +#else + goto error; +#endif + else + type = TYPE_STRING; + break; +#ifdef HAVE_WCHAR_T + case 'S': + type = TYPE_WIDE_STRING; + c = 's'; + break; +#endif + case 'p': + type = TYPE_POINTER; + break; + case 'n': +#ifdef HAVE_LONG_LONG + if (flags >= 16 || (flags & 4)) + type = TYPE_COUNT_LONGLONGINT_POINTER; + else +#endif + if (flags >= 8) + type = TYPE_COUNT_LONGINT_POINTER; + else if (flags & 2) + type = TYPE_COUNT_SCHAR_POINTER; + else if (flags & 1) + type = TYPE_COUNT_SHORT_POINTER; + else + type = TYPE_COUNT_INT_POINTER; + break; + case '%': + type = TYPE_NONE; + break; + default: + /* Unknown conversion character. */ + goto error; + } + } + + if (type != TYPE_NONE) + { + dp->arg_index = arg_index; + if (dp->arg_index == ARG_NONE) + { + dp->arg_index = arg_posn++; + if (dp->arg_index == ARG_NONE) + /* arg_posn wrapped around. */ + goto error; + } + REGISTER_ARG (dp->arg_index, type); + } + dp->conversion = c; + dp->dir_end = cp; + } + + d->count++; + if (d->count >= d_allocated) + { + size_t memory_size; + DIRECTIVE *memory; + + d_allocated = xtimes (d_allocated, 2); + memory_size = xtimes (d_allocated, sizeof (DIRECTIVE)); + if (size_overflow_p (memory_size)) + /* Overflow, would lead to out of memory. */ + goto error; + memory = realloc (d->dir, memory_size); + if (memory == NULL) + /* Out of memory. */ + goto error; + d->dir = memory; + } + } + } + d->dir[d->count].dir_start = cp; + + d->max_width_length = max_width_length; + d->max_precision_length = max_precision_length; + return 0; + +error: + if (a->arg) + free (a->arg); + if (d->dir) + free (d->dir); + return -1; +} + +#undef DIRECTIVES +#undef DIRECTIVE +#undef CHAR_T +#undef PRINTF_PARSE diff -urpP gnupg-1.2.5/intl/printf-parse.h gnupg-1.2.6/intl/printf-parse.h --- gnupg-1.2.5/intl/printf-parse.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/printf-parse.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,75 @@ +/* Parse printf format string. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _PRINTF_PARSE_H +#define _PRINTF_PARSE_H + +#include "printf-args.h" + + +/* Flags */ +#define FLAG_GROUP 1 /* ' flag */ +#define FLAG_LEFT 2 /* - flag */ +#define FLAG_SHOWSIGN 4 /* + flag */ +#define FLAG_SPACE 8 /* space flag */ +#define FLAG_ALT 16 /* # flag */ +#define FLAG_ZERO 32 + +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + +/* A parsed directive. */ +typedef struct +{ + const char* dir_start; + const char* dir_end; + int flags; + const char* width_start; + const char* width_end; + size_t width_arg_index; + const char* precision_start; + const char* precision_end; + size_t precision_arg_index; + char conversion; /* d i o u x X f e E g G c s p n U % but not C S */ + size_t arg_index; +} +char_directive; + +/* A parsed format string. */ +typedef struct +{ + size_t count; + char_directive *dir; + size_t max_width_length; + size_t max_precision_length; +} +char_directives; + + +/* Parses the format string. Fills in the number N of directives, and fills + in directives[0], ..., directives[N-1], and sets directives[N].dir_start + to the end of the format string. Also fills in the arg_type fields of the + arguments and the needed count of arguments. */ +#ifdef STATIC +STATIC +#else +extern +#endif +int printf_parse (const char *format, char_directives *d, arguments *a); + +#endif /* _PRINTF_PARSE_H */ diff -urpP gnupg-1.2.5/intl/printf.c gnupg-1.2.6/intl/printf.c --- gnupg-1.2.5/intl/printf.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/printf.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,371 @@ +/* Formatted output to strings, using POSIX/XSI format strings with positions. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +#include + +#if !HAVE_POSIX_PRINTF + +#include +#include + +/* When building a DLL, we must export some functions. Note that because + the functions are only defined for binary backward compatibility, we + don't need to use __declspec(dllimport) in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define DLL_EXPORTED __declspec(dllexport) +#else +# define DLL_EXPORTED +#endif + +#define STATIC static + +/* Define auxiliary functions declared in "printf-args.h". */ +#include "printf-args.c" + +/* Define auxiliary functions declared in "printf-parse.h". */ +#include "printf-parse.c" + +/* Define functions declared in "vasnprintf.h". */ +#define vasnprintf libintl_vasnprintf +#include "vasnprintf.c" +#if 0 /* not needed */ +#define asnprintf libintl_asnprintf +#include "asnprintf.c" +#endif + +DLL_EXPORTED +int +libintl_vfprintf (FILE *stream, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return vfprintf (stream, format, args); + else + { + size_t length; + char *result = libintl_vasnprintf (NULL, &length, format, args); + int retval = -1; + if (result != NULL) + { + if (fwrite (result, 1, length, stream) == length) + retval = length; + free (result); + } + return retval; + } +} + +DLL_EXPORTED +int +libintl_fprintf (FILE *stream, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vfprintf (stream, format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vprintf (const char *format, va_list args) +{ + return libintl_vfprintf (stdout, format, args); +} + +DLL_EXPORTED +int +libintl_printf (const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vprintf (format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vsprintf (char *resultbuf, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return vsprintf (resultbuf, format, args); + else + { + size_t length = (size_t) ~0 / (4 * sizeof (char)); + char *result = libintl_vasnprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + free (result); + return -1; + } + else + return length; + } +} + +DLL_EXPORTED +int +libintl_sprintf (char *resultbuf, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vsprintf (resultbuf, format, args); + va_end (args); + return retval; +} + +#if HAVE_SNPRINTF + +# if HAVE_DECL__SNPRINTF + /* Windows. */ +# define system_vsnprintf _vsnprintf +# else + /* Unix. */ +# define system_vsnprintf vsnprintf +# endif + +DLL_EXPORTED +int +libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return system_vsnprintf (resultbuf, length, format, args); + else + { + size_t maxlength = length; + char *result = libintl_vasnprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + if (maxlength > 0) + { + if (length < maxlength) + abort (); + memcpy (resultbuf, result, maxlength - 1); + resultbuf[maxlength - 1] = '\0'; + } + free (result); + return -1; + } + else + return length; + } +} + +DLL_EXPORTED +int +libintl_snprintf (char *resultbuf, size_t length, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vsnprintf (resultbuf, length, format, args); + va_end (args); + return retval; +} + +#endif + +#if HAVE_ASPRINTF + +DLL_EXPORTED +int +libintl_vasprintf (char **resultp, const char *format, va_list args) +{ + size_t length; + char *result = libintl_vasnprintf (NULL, &length, format, args); + if (result == NULL) + return -1; + *resultp = result; + return length; +} + +DLL_EXPORTED +int +libintl_asprintf (char **resultp, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vasprintf (resultp, format, args); + va_end (args); + return retval; +} + +#endif + +#if HAVE_FWPRINTF + +#include + +#define WIDE_CHAR_VERSION 1 + +/* Define auxiliary functions declared in "wprintf-parse.h". */ +#include "printf-parse.c" + +/* Define functions declared in "vasnprintf.h". */ +#define vasnwprintf libintl_vasnwprintf +#include "vasnprintf.c" +#if 0 /* not needed */ +#define asnwprintf libintl_asnwprintf +#include "asnprintf.c" +#endif + +# if HAVE_DECL__SNWPRINTF + /* Windows. */ +# define system_vswprintf _vsnwprintf +# else + /* Unix. */ +# define system_vswprintf vswprintf +# endif + +DLL_EXPORTED +int +libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args) +{ + if (wcschr (format, '$') == NULL) + return vfwprintf (stream, format, args); + else + { + size_t length; + wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args); + int retval = -1; + if (result != NULL) + { + size_t i; + for (i = 0; i < length; i++) + if (fputwc (result[i], stream) == WEOF) + break; + if (i == length) + retval = length; + free (result); + } + return retval; + } +} + +DLL_EXPORTED +int +libintl_fwprintf (FILE *stream, const wchar_t *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vfwprintf (stream, format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vwprintf (const wchar_t *format, va_list args) +{ + return libintl_vfwprintf (stdout, format, args); +} + +DLL_EXPORTED +int +libintl_wprintf (const wchar_t *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vwprintf (format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args) +{ + if (wcschr (format, '$') == NULL) + return system_vswprintf (resultbuf, length, format, args); + else + { + size_t maxlength = length; + wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + if (maxlength > 0) + { + if (length < maxlength) + abort (); + memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t)); + resultbuf[maxlength - 1] = 0; + } + free (result); + return -1; + } + else + return length; + } +} + +DLL_EXPORTED +int +libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vswprintf (resultbuf, length, format, args); + va_end (args); + return retval; +} + +#endif + +#endif diff -urpP gnupg-1.2.5/intl/relocatable.c gnupg-1.2.6/intl/relocatable.c --- gnupg-1.2.5/intl/relocatable.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/relocatable.c 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,449 @@ +/* Provide relocatable packages. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + + +/* Tell glibc's to provide a prototype for getline(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +/* Specification. */ +#include "relocatable.h" + +#if ENABLE_RELOCATABLE + +#include +#include +#include +#include + +#ifdef NO_XMALLOC +# define xmalloc malloc +#else +# include "xalloc.h" +#endif + +#if defined _WIN32 || defined __WIN32__ +# define WIN32_LEAN_AND_MEAN +# include +#endif + +#if DEPENDS_ON_LIBCHARSET +# include +#endif +#if DEPENDS_ON_LIBICONV && HAVE_ICONV +# include +#endif +#if DEPENDS_ON_LIBINTL && ENABLE_NLS +# include +#endif + +/* Faked cheap 'bool'. */ +#undef bool +#undef false +#undef true +#define bool int +#define false 0 +#define true 1 + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_PATH_WITH_DIR(P) \ + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) +# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) +# define FILESYSTEM_PREFIX_LEN(P) 0 +#endif + +/* Original installation prefix. */ +static char *orig_prefix; +static size_t orig_prefix_len; +/* Current installation prefix. */ +static char *curr_prefix; +static size_t curr_prefix_len; +/* These prefixes do not end in a slash. Anything that will be concatenated + to them must start with a slash. */ + +/* Sets the original and the current installation prefix of this module. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +static void +set_this_relocation_prefix (const char *orig_prefix_arg, + const char *curr_prefix_arg) +{ + if (orig_prefix_arg != NULL && curr_prefix_arg != NULL + /* Optimization: if orig_prefix and curr_prefix are equal, the + relocation is a nop. */ + && strcmp (orig_prefix_arg, curr_prefix_arg) != 0) + { + /* Duplicate the argument strings. */ + char *memory; + + orig_prefix_len = strlen (orig_prefix_arg); + curr_prefix_len = strlen (curr_prefix_arg); + memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1); +#ifdef NO_XMALLOC + if (memory != NULL) +#endif + { + memcpy (memory, orig_prefix_arg, orig_prefix_len + 1); + orig_prefix = memory; + memory += orig_prefix_len + 1; + memcpy (memory, curr_prefix_arg, curr_prefix_len + 1); + curr_prefix = memory; + return; + } + } + orig_prefix = NULL; + curr_prefix = NULL; + /* Don't worry about wasted memory here - this function is usually only + called once. */ +} + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +void +set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg) +{ + set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg); + + /* Now notify all dependent libraries. */ +#if DEPENDS_ON_LIBCHARSET + libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); +#endif +#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109 + libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); +#endif +#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix + libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); +#endif +} + +#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) + +/* Convenience function: + Computes the current installation prefix, based on the original + installation prefix, the original installation directory of a particular + file, and the current pathname of this file. Returns NULL upon failure. */ +#ifdef IN_LIBRARY +#define compute_curr_prefix local_compute_curr_prefix +static +#endif +const char * +compute_curr_prefix (const char *orig_installprefix, + const char *orig_installdir, + const char *curr_pathname) +{ + const char *curr_installdir; + const char *rel_installdir; + + if (curr_pathname == NULL) + return NULL; + + /* Determine the relative installation directory, relative to the prefix. + This is simply the difference between orig_installprefix and + orig_installdir. */ + if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix)) + != 0) + /* Shouldn't happen - nothing should be installed outside $(prefix). */ + return NULL; + rel_installdir = orig_installdir + strlen (orig_installprefix); + + /* Determine the current installation directory. */ + { + const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname); + const char *p = curr_pathname + strlen (curr_pathname); + char *q; + + while (p > p_base) + { + p--; + if (ISSLASH (*p)) + break; + } + + q = (char *) xmalloc (p - curr_pathname + 1); +#ifdef NO_XMALLOC + if (q == NULL) + return NULL; +#endif + memcpy (q, curr_pathname, p - curr_pathname); + q[p - curr_pathname] = '\0'; + curr_installdir = q; + } + + /* Compute the current installation prefix by removing the trailing + rel_installdir from it. */ + { + const char *rp = rel_installdir + strlen (rel_installdir); + const char *cp = curr_installdir + strlen (curr_installdir); + const char *cp_base = + curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir); + + while (rp > rel_installdir && cp > cp_base) + { + bool same = false; + const char *rpi = rp; + const char *cpi = cp; + + while (rpi > rel_installdir && cpi > cp_base) + { + rpi--; + cpi--; + if (ISSLASH (*rpi) || ISSLASH (*cpi)) + { + if (ISSLASH (*rpi) && ISSLASH (*cpi)) + same = true; + break; + } +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS - case insignificant filesystem */ + if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi) + != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi)) + break; +#else + if (*rpi != *cpi) + break; +#endif + } + if (!same) + break; + /* The last pathname component was the same. opi and cpi now point + to the slash before it. */ + rp = rpi; + cp = cpi; + } + + if (rp > rel_installdir) + /* Unexpected: The curr_installdir does not end with rel_installdir. */ + return NULL; + + { + size_t curr_prefix_len = cp - curr_installdir; + char *curr_prefix; + + curr_prefix = (char *) xmalloc (curr_prefix_len + 1); +#ifdef NO_XMALLOC + if (curr_prefix == NULL) + return NULL; +#endif + memcpy (curr_prefix, curr_installdir, curr_prefix_len); + curr_prefix[curr_prefix_len] = '\0'; + + return curr_prefix; + } + } +} + +#endif /* !IN_LIBRARY || PIC */ + +#if defined PIC && defined INSTALLDIR + +/* Full pathname of shared library, or NULL. */ +static char *shared_library_fullname; + +#if defined _WIN32 || defined __WIN32__ + +/* Determine the full pathname of the shared library when it is loaded. */ + +BOOL WINAPI +DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) +{ + (void) reserved; + + if (event == DLL_PROCESS_ATTACH) + { + /* The DLL is being loaded into an application's address range. */ + static char location[MAX_PATH]; + + if (!GetModuleFileName (module_handle, location, sizeof (location))) + /* Shouldn't happen. */ + return FALSE; + + if (!IS_PATH_WITH_DIR (location)) + /* Shouldn't happen. */ + return FALSE; + + shared_library_fullname = strdup (location); + } + + return TRUE; +} + +#else /* Unix */ + +static void +find_shared_library_fullname () +{ +#if defined __linux__ && __GLIBC__ >= 2 + /* Linux has /proc/self/maps. glibc 2 has the getline() function. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ + fp = fopen ("/proc/self/maps", "r"); + if (fp) + { + unsigned long address = (unsigned long) &find_shared_library_fullname; + for (;;) + { + unsigned long start, end; + int c; + + if (fscanf (fp, "%lx-%lx", &start, &end) != 2) + break; + if (address >= start && address <= end - 1) + { + /* Found it. Now see if this line contains a filename. */ + while (c = getc (fp), c != EOF && c != '\n' && c != '/') + continue; + if (c == '/') + { + size_t size; + int len; + + ungetc (c, fp); + shared_library_fullname = NULL; size = 0; + len = getline (&shared_library_fullname, &size, fp); + if (len >= 0) + { + /* Success: filled shared_library_fullname. */ + if (len > 0 && shared_library_fullname[len - 1] == '\n') + shared_library_fullname[len - 1] = '\0'; + } + } + break; + } + while (c = getc (fp), c != EOF && c != '\n') + continue; + } + fclose (fp); + } +#endif +} + +#endif /* WIN32 / Unix */ + +/* Return the full pathname of the current shared library. + Return NULL if unknown. + Guaranteed to work only on Linux and Woe32. */ +static char * +get_shared_library_fullname () +{ +#if !(defined _WIN32 || defined __WIN32__) + static bool tried_find_shared_library_fullname; + if (!tried_find_shared_library_fullname) + { + find_shared_library_fullname (); + tried_find_shared_library_fullname = true; + } +#endif + return shared_library_fullname; +} + +#endif /* PIC */ + +/* Returns the pathname, relocated according to the current installation + directory. */ +const char * +relocate (const char *pathname) +{ +#if defined PIC && defined INSTALLDIR + static int initialized; + + /* Initialization code for a shared library. */ + if (!initialized) + { + /* At this point, orig_prefix and curr_prefix likely have already been + set through the main program's set_program_name_and_installdir + function. This is sufficient in the case that the library has + initially been installed in the same orig_prefix. But we can do + better, to also cover the cases that 1. it has been installed + in a different prefix before being moved to orig_prefix and (later) + to curr_prefix, 2. unlike the program, it has not moved away from + orig_prefix. */ + const char *orig_installprefix = INSTALLPREFIX; + const char *orig_installdir = INSTALLDIR; + const char *curr_prefix_better; + + curr_prefix_better = + compute_curr_prefix (orig_installprefix, orig_installdir, + get_shared_library_fullname ()); + if (curr_prefix_better == NULL) + curr_prefix_better = curr_prefix; + + set_relocation_prefix (orig_installprefix, curr_prefix_better); + + initialized = 1; + } +#endif + + /* Note: It is not necessary to perform case insensitive comparison here, + even for DOS-like filesystems, because the pathname argument was + typically created from the same Makefile variable as orig_prefix came + from. */ + if (orig_prefix != NULL && curr_prefix != NULL + && strncmp (pathname, orig_prefix, orig_prefix_len) == 0) + { + if (pathname[orig_prefix_len] == '\0') + /* pathname equals orig_prefix. */ + return curr_prefix; + if (ISSLASH (pathname[orig_prefix_len])) + { + /* pathname starts with orig_prefix. */ + const char *pathname_tail = &pathname[orig_prefix_len]; + char *result = + (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1); + +#ifdef NO_XMALLOC + if (result != NULL) +#endif + { + memcpy (result, curr_prefix, curr_prefix_len); + strcpy (result + curr_prefix_len, pathname_tail); + return result; + } + } + } + /* Nothing to relocate. */ + return pathname; +} + +#endif diff -urpP gnupg-1.2.5/intl/relocatable.h gnupg-1.2.6/intl/relocatable.h --- gnupg-1.2.5/intl/relocatable.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/relocatable.h 2004-08-09 15:28:48.000000000 +0000 @@ -0,0 +1,77 @@ +/* Provide relocatable packages. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _RELOCATABLE_H +#define _RELOCATABLE_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/* This can be enabled through the configure --enable-relocatable option. */ +#if ENABLE_RELOCATABLE + +/* When building a DLL, we must export some functions. Note that because + this is a private .h file, we don't need to use __declspec(dllimport) + in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport) +#else +# define RELOCATABLE_DLL_EXPORTED +#endif + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +extern RELOCATABLE_DLL_EXPORTED void + set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + +/* Returns the pathname, relocated according to the current installation + directory. */ +extern const char * relocate (const char *pathname); + +/* Memory management: relocate() leaks memory, because it has to construct + a fresh pathname. If this is a problem because your program calls + relocate() frequently, think about caching the result. */ + +/* Convenience function: + Computes the current installation prefix, based on the original + installation prefix, the original installation directory of a particular + file, and the current pathname of this file. Returns NULL upon failure. */ +extern const char * compute_curr_prefix (const char *orig_installprefix, + const char *orig_installdir, + const char *curr_pathname); + +#else + +/* By default, we use the hardwired pathnames. */ +#define relocate(pathname) (pathname) + +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _RELOCATABLE_H */ diff -urpP gnupg-1.2.5/intl/textdomain.c gnupg-1.2.6/intl/textdomain.c --- gnupg-1.2.5/intl/textdomain.c 2002-08-23 08:02:04.000000000 +0000 +++ gnupg-1.2.6/intl/textdomain.c 2004-08-09 15:28:49.000000000 +0000 @@ -1,5 +1,5 @@ /* Implementation of the textdomain(3) function. - Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -44,17 +44,17 @@ names than the internal variables in GNU libc, otherwise programs using libintl.a cannot be linked statically. */ #if !defined _LIBC -# define _nl_default_default_domain _nl_default_default_domain__ -# define _nl_current_default_domain _nl_current_default_domain__ +# define _nl_default_default_domain libintl_nl_default_default_domain +# define _nl_current_default_domain libintl_nl_current_default_domain #endif /* @@ end of prolog @@ */ /* Name of the default text domain. */ -extern const char _nl_default_default_domain[]; +extern const char _nl_default_default_domain[] attribute_hidden; /* Default text domain in which entries for gettext(3) are to be found. */ -extern const char *_nl_current_default_domain; +extern const char *_nl_current_default_domain attribute_hidden; /* Names for the libintl functions are a problem. They must not clash @@ -67,18 +67,17 @@ extern const char *_nl_current_default_d # define strdup(str) __strdup (str) # endif #else -# define TEXTDOMAIN textdomain__ +# define TEXTDOMAIN libintl_textdomain #endif /* Lock variable to protect the global data in the gettext implementation. */ -__libc_rwlock_define (extern, _nl_state_lock) +__libc_rwlock_define (extern, _nl_state_lock attribute_hidden) /* Set the current default message catalog to DOMAINNAME. If DOMAINNAME is null, return the current default. If DOMAINNAME is "", reset to the default of "messages". */ char * -TEXTDOMAIN (domainname) - const char *domainname; +TEXTDOMAIN (const char *domainname) { char *new_domain; char *old_domain; diff -urpP gnupg-1.2.5/intl/vasnprintf.c gnupg-1.2.6/intl/vasnprintf.c --- gnupg-1.2.5/intl/vasnprintf.c 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/vasnprintf.c 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,887 @@ +/* vsprintf with automatic memory allocation. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's to provide a prototype for snprintf(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif +#ifndef IN_LIBINTL +# include +#endif + +/* Specification. */ +#if WIDE_CHAR_VERSION +# include "vasnwprintf.h" +#else +# include "vasnprintf.h" +#endif + +#include /* snprintf(), sprintf() */ +#include /* abort(), malloc(), realloc(), free() */ +#include /* memcpy(), strlen() */ +#include /* errno */ +#include /* CHAR_BIT */ +#include /* DBL_MAX_EXP, LDBL_MAX_EXP */ +#if WIDE_CHAR_VERSION +# include "wprintf-parse.h" +#else +# include "printf-parse.h" +#endif + +/* Checked size_t computations. */ +#include "xsize.h" + +#ifdef HAVE_WCHAR_T +# ifdef HAVE_WCSLEN +# define local_wcslen wcslen +# else + /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid + a dependency towards this library, here is a local substitute. + Define this substitute only once, even if this file is included + twice in the same compilation unit. */ +# ifndef local_wcslen_defined +# define local_wcslen_defined 1 +static size_t +local_wcslen (const wchar_t *s) +{ + const wchar_t *ptr; + + for (ptr = s; *ptr != (wchar_t) 0; ptr++) + ; + return ptr - s; +} +# endif +# endif +#endif + +#if WIDE_CHAR_VERSION +# define VASNPRINTF vasnwprintf +# define CHAR_T wchar_t +# define DIRECTIVE wchar_t_directive +# define DIRECTIVES wchar_t_directives +# define PRINTF_PARSE wprintf_parse +# define USE_SNPRINTF 1 +# if HAVE_DECL__SNWPRINTF + /* On Windows, the function swprintf() has a different signature than + on Unix; we use the _snwprintf() function instead. */ +# define SNPRINTF _snwprintf +# else + /* Unix. */ +# define SNPRINTF swprintf +# endif +#else +# define VASNPRINTF vasnprintf +# define CHAR_T char +# define DIRECTIVE char_directive +# define DIRECTIVES char_directives +# define PRINTF_PARSE printf_parse +# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) +# if HAVE_DECL__SNPRINTF + /* Windows. */ +# define SNPRINTF _snprintf +# else + /* Unix. */ +# define SNPRINTF snprintf +# endif +#endif + +CHAR_T * +VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args) +{ + DIRECTIVES d; + arguments a; + + if (PRINTF_PARSE (format, &d, &a) < 0) + { + errno = EINVAL; + return NULL; + } + +#define CLEANUP() \ + free (d.dir); \ + if (a.arg) \ + free (a.arg); + + if (printf_fetchargs (args, &a) < 0) + { + CLEANUP (); + errno = EINVAL; + return NULL; + } + + { + size_t buf_neededlength; + CHAR_T *buf; + CHAR_T *buf_malloced; + const CHAR_T *cp; + size_t i; + DIRECTIVE *dp; + /* Output string accumulator. */ + CHAR_T *result; + size_t allocated; + size_t length; + + /* Allocate a small buffer that will hold a directive passed to + sprintf or snprintf. */ + buf_neededlength = + xsum4 (7, d.max_width_length, d.max_precision_length, 6); +#if HAVE_ALLOCA + if (buf_neededlength < 4000 / sizeof (CHAR_T)) + { + buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T)); + buf_malloced = NULL; + } + else +#endif + { + size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T)); + if (size_overflow_p (buf_memsize)) + goto out_of_memory_1; + buf = (CHAR_T *) malloc (buf_memsize); + if (buf == NULL) + goto out_of_memory_1; + buf_malloced = buf; + } + + if (resultbuf != NULL) + { + result = resultbuf; + allocated = *lengthp; + } + else + { + result = NULL; + allocated = 0; + } + length = 0; + /* Invariants: + result is either == resultbuf or == NULL or malloc-allocated. + If length > 0, then result != NULL. */ + + /* Ensures that allocated >= needed. Aborts through a jump to + out_of_memory if needed is SIZE_MAX or otherwise too big. */ +#define ENSURE_ALLOCATION(needed) \ + if ((needed) > allocated) \ + { \ + size_t memory_size; \ + CHAR_T *memory; \ + \ + allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \ + if ((needed) > allocated) \ + allocated = (needed); \ + memory_size = xtimes (allocated, sizeof (CHAR_T)); \ + if (size_overflow_p (memory_size)) \ + goto out_of_memory; \ + if (result == resultbuf || result == NULL) \ + memory = (CHAR_T *) malloc (memory_size); \ + else \ + memory = (CHAR_T *) realloc (result, memory_size); \ + if (memory == NULL) \ + goto out_of_memory; \ + if (result == resultbuf && length > 0) \ + memcpy (memory, result, length * sizeof (CHAR_T)); \ + result = memory; \ + } + + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) + { + if (cp != dp->dir_start) + { + size_t n = dp->dir_start - cp; + size_t augmented_length = xsum (length, n); + + ENSURE_ALLOCATION (augmented_length); + memcpy (result + length, cp, n * sizeof (CHAR_T)); + length = augmented_length; + } + if (i == d.count) + break; + + /* Execute a single directive. */ + if (dp->conversion == '%') + { + size_t augmented_length; + + if (!(dp->arg_index == ARG_NONE)) + abort (); + augmented_length = xsum (length, 1); + ENSURE_ALLOCATION (augmented_length); + result[length] = '%'; + length = augmented_length; + } + else + { + if (!(dp->arg_index != ARG_NONE)) + abort (); + + if (dp->conversion == 'n') + { + switch (a.arg[dp->arg_index].type) + { + case TYPE_COUNT_SCHAR_POINTER: + *a.arg[dp->arg_index].a.a_count_schar_pointer = length; + break; + case TYPE_COUNT_SHORT_POINTER: + *a.arg[dp->arg_index].a.a_count_short_pointer = length; + break; + case TYPE_COUNT_INT_POINTER: + *a.arg[dp->arg_index].a.a_count_int_pointer = length; + break; + case TYPE_COUNT_LONGINT_POINTER: + *a.arg[dp->arg_index].a.a_count_longint_pointer = length; + break; +#ifdef HAVE_LONG_LONG + case TYPE_COUNT_LONGLONGINT_POINTER: + *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length; + break; +#endif + default: + abort (); + } + } + else + { + arg_type type = a.arg[dp->arg_index].type; + CHAR_T *p; + unsigned int prefix_count; + int prefixes[2]; +#if !USE_SNPRINTF + size_t tmp_length; + CHAR_T tmpbuf[700]; + CHAR_T *tmp; + + /* Allocate a temporary buffer of sufficient size for calling + sprintf. */ + { + size_t width; + size_t precision; + + width = 0; + if (dp->width_start != dp->width_end) + { + if (dp->width_arg_index != ARG_NONE) + { + int arg; + + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; + width = (arg < 0 ? (unsigned int) (-arg) : arg); + } + else + { + const CHAR_T *digitp = dp->width_start; + + do + width = xsum (xtimes (width, 10), *digitp++ - '0'); + while (digitp != dp->width_end); + } + } + + precision = 6; + if (dp->precision_start != dp->precision_end) + { + if (dp->precision_arg_index != ARG_NONE) + { + int arg; + + if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->precision_arg_index].a.a_int; + precision = (arg < 0 ? 0 : arg); + } + else + { + const CHAR_T *digitp = dp->precision_start + 1; + + precision = 0; + do + precision = xsum (xtimes (precision, 10), *digitp++ - '0'); + while (digitp != dp->precision_end); + } + } + + switch (dp->conversion) + { + + case 'd': case 'i': case 'u': +# ifdef HAVE_LONG_LONG + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else +# endif + if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + break; + + case 'o': +# ifdef HAVE_LONG_LONG + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else +# endif + if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + break; + + case 'x': case 'X': +# ifdef HAVE_LONG_LONG + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading sign or alternate form */ + else +# endif + if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading sign or alternate form */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading sign or alternate form */ + break; + + case 'f': case 'F': +# ifdef HAVE_LONG_DOUBLE + if (type == TYPE_LONGDOUBLE) + tmp_length = + (unsigned int) (LDBL_MAX_EXP + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 10; /* sign, decimal point etc. */ + else +# endif + tmp_length = + (unsigned int) (DBL_MAX_EXP + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 10; /* sign, decimal point etc. */ + tmp_length = xsum (tmp_length, precision); + break; + + case 'e': case 'E': case 'g': case 'G': + case 'a': case 'A': + tmp_length = + 12; /* sign, decimal point, exponent etc. */ + tmp_length = xsum (tmp_length, precision); + break; + + case 'c': +# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION + if (type == TYPE_WIDE_CHAR) + tmp_length = MB_CUR_MAX; + else +# endif + tmp_length = 1; + break; + + case 's': +# ifdef HAVE_WCHAR_T + if (type == TYPE_WIDE_STRING) + { + tmp_length = + local_wcslen (a.arg[dp->arg_index].a.a_wide_string); + +# if !WIDE_CHAR_VERSION + tmp_length = xtimes (tmp_length, MB_CUR_MAX); +# endif + } + else +# endif + tmp_length = strlen (a.arg[dp->arg_index].a.a_string); + break; + + case 'p': + tmp_length = + (unsigned int) (sizeof (void *) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading 0x */ + break; + + default: + abort (); + } + + if (tmp_length < width) + tmp_length = width; + + tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */ + } + + if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T)) + tmp = tmpbuf; + else + { + size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T)); + + if (size_overflow_p (tmp_memsize)) + /* Overflow, would lead to out of memory. */ + goto out_of_memory; + tmp = (CHAR_T *) malloc (tmp_memsize); + if (tmp == NULL) + /* Out of memory. */ + goto out_of_memory; + } +#endif + + /* Construct the format string for calling snprintf or + sprintf. */ + p = buf; + *p++ = '%'; + if (dp->flags & FLAG_GROUP) + *p++ = '\''; + if (dp->flags & FLAG_LEFT) + *p++ = '-'; + if (dp->flags & FLAG_SHOWSIGN) + *p++ = '+'; + if (dp->flags & FLAG_SPACE) + *p++ = ' '; + if (dp->flags & FLAG_ALT) + *p++ = '#'; + if (dp->flags & FLAG_ZERO) + *p++ = '0'; + if (dp->width_start != dp->width_end) + { + size_t n = dp->width_end - dp->width_start; + memcpy (p, dp->width_start, n * sizeof (CHAR_T)); + p += n; + } + if (dp->precision_start != dp->precision_end) + { + size_t n = dp->precision_end - dp->precision_start; + memcpy (p, dp->precision_start, n * sizeof (CHAR_T)); + p += n; + } + + switch (type) + { +#ifdef HAVE_LONG_LONG + case TYPE_LONGLONGINT: + case TYPE_ULONGLONGINT: + *p++ = 'l'; + /*FALLTHROUGH*/ +#endif + case TYPE_LONGINT: + case TYPE_ULONGINT: +#ifdef HAVE_WINT_T + case TYPE_WIDE_CHAR: +#endif +#ifdef HAVE_WCHAR_T + case TYPE_WIDE_STRING: +#endif + *p++ = 'l'; + break; +#ifdef HAVE_LONG_DOUBLE + case TYPE_LONGDOUBLE: + *p++ = 'L'; + break; +#endif + default: + break; + } + *p = dp->conversion; +#if USE_SNPRINTF + p[1] = '%'; + p[2] = 'n'; + p[3] = '\0'; +#else + p[1] = '\0'; +#endif + + /* Construct the arguments for calling snprintf or sprintf. */ + prefix_count = 0; + if (dp->width_arg_index != ARG_NONE) + { + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int; + } + if (dp->precision_arg_index != ARG_NONE) + { + if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) + abort (); + prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int; + } + +#if USE_SNPRINTF + /* Prepare checking whether snprintf returns the count + via %n. */ + ENSURE_ALLOCATION (xsum (length, 1)); + result[length] = '\0'; +#endif + + for (;;) + { + size_t maxlen; + int count; + int retcount; + + maxlen = allocated - length; + count = -1; + retcount = 0; + +#if USE_SNPRINTF +# define SNPRINTF_BUF(arg) \ + switch (prefix_count) \ + { \ + case 0: \ + retcount = SNPRINTF (result + length, maxlen, buf, \ + arg, &count); \ + break; \ + case 1: \ + retcount = SNPRINTF (result + length, maxlen, buf, \ + prefixes[0], arg, &count); \ + break; \ + case 2: \ + retcount = SNPRINTF (result + length, maxlen, buf, \ + prefixes[0], prefixes[1], arg, \ + &count); \ + break; \ + default: \ + abort (); \ + } +#else +# define SNPRINTF_BUF(arg) \ + switch (prefix_count) \ + { \ + case 0: \ + count = sprintf (tmp, buf, arg); \ + break; \ + case 1: \ + count = sprintf (tmp, buf, prefixes[0], arg); \ + break; \ + case 2: \ + count = sprintf (tmp, buf, prefixes[0], prefixes[1],\ + arg); \ + break; \ + default: \ + abort (); \ + } +#endif + + switch (type) + { + case TYPE_SCHAR: + { + int arg = a.arg[dp->arg_index].a.a_schar; + SNPRINTF_BUF (arg); + } + break; + case TYPE_UCHAR: + { + unsigned int arg = a.arg[dp->arg_index].a.a_uchar; + SNPRINTF_BUF (arg); + } + break; + case TYPE_SHORT: + { + int arg = a.arg[dp->arg_index].a.a_short; + SNPRINTF_BUF (arg); + } + break; + case TYPE_USHORT: + { + unsigned int arg = a.arg[dp->arg_index].a.a_ushort; + SNPRINTF_BUF (arg); + } + break; + case TYPE_INT: + { + int arg = a.arg[dp->arg_index].a.a_int; + SNPRINTF_BUF (arg); + } + break; + case TYPE_UINT: + { + unsigned int arg = a.arg[dp->arg_index].a.a_uint; + SNPRINTF_BUF (arg); + } + break; + case TYPE_LONGINT: + { + long int arg = a.arg[dp->arg_index].a.a_longint; + SNPRINTF_BUF (arg); + } + break; + case TYPE_ULONGINT: + { + unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_LONG_LONG + case TYPE_LONGLONGINT: + { + long long int arg = a.arg[dp->arg_index].a.a_longlongint; + SNPRINTF_BUF (arg); + } + break; + case TYPE_ULONGLONGINT: + { + unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_DOUBLE: + { + double arg = a.arg[dp->arg_index].a.a_double; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_LONG_DOUBLE + case TYPE_LONGDOUBLE: + { + long double arg = a.arg[dp->arg_index].a.a_longdouble; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_CHAR: + { + int arg = a.arg[dp->arg_index].a.a_char; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_WINT_T + case TYPE_WIDE_CHAR: + { + wint_t arg = a.arg[dp->arg_index].a.a_wide_char; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_STRING: + { + const char *arg = a.arg[dp->arg_index].a.a_string; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_WCHAR_T + case TYPE_WIDE_STRING: + { + const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_POINTER: + { + void *arg = a.arg[dp->arg_index].a.a_pointer; + SNPRINTF_BUF (arg); + } + break; + default: + abort (); + } + +#if USE_SNPRINTF + /* Portability: Not all implementations of snprintf() + are ISO C 99 compliant. Determine the number of + bytes that snprintf() has produced or would have + produced. */ + if (count >= 0) + { + /* Verify that snprintf() has NUL-terminated its + result. */ + if (count < maxlen && result[length + count] != '\0') + abort (); + /* Portability hack. */ + if (retcount > count) + count = retcount; + } + else + { + /* snprintf() doesn't understand the '%n' + directive. */ + if (p[1] != '\0') + { + /* Don't use the '%n' directive; instead, look + at the snprintf() return value. */ + p[1] = '\0'; + continue; + } + else + { + /* Look at the snprintf() return value. */ + if (retcount < 0) + { + /* HP-UX 10.20 snprintf() is doubly deficient: + It doesn't understand the '%n' directive, + *and* it returns -1 (rather than the length + that would have been required) when the + buffer is too small. */ + size_t bigger_need = + xsum (xtimes (allocated, 2), 12); + ENSURE_ALLOCATION (bigger_need); + continue; + } + else + count = retcount; + } + } +#endif + + /* Attempt to handle failure. */ + if (count < 0) + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EINVAL; + return NULL; + } + +#if !USE_SNPRINTF + if (count >= tmp_length) + /* tmp_length was incorrectly calculated - fix the + code above! */ + abort (); +#endif + + /* Make room for the result. */ + if (count >= maxlen) + { + /* Need at least count bytes. But allocate + proportionally, to avoid looping eternally if + snprintf() reports a too small count. */ + size_t n = + xmax (xsum (length, count), xtimes (allocated, 2)); + + ENSURE_ALLOCATION (n); +#if USE_SNPRINTF + continue; +#endif + } + +#if USE_SNPRINTF + /* The snprintf() result did fit. */ +#else + /* Append the sprintf() result. */ + memcpy (result + length, tmp, count * sizeof (CHAR_T)); + if (tmp != tmpbuf) + free (tmp); +#endif + + length += count; + break; + } + } + } + } + + /* Add the final NUL. */ + ENSURE_ALLOCATION (xsum (length, 1)); + result[length] = '\0'; + + if (result != resultbuf && length + 1 < allocated) + { + /* Shrink the allocated memory if possible. */ + CHAR_T *memory; + + memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T)); + if (memory != NULL) + result = memory; + } + + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + *lengthp = length; + return result; + + out_of_memory: + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + out_of_memory_1: + CLEANUP (); + errno = ENOMEM; + return NULL; + } +} + +#undef SNPRINTF +#undef USE_SNPRINTF +#undef PRINTF_PARSE +#undef DIRECTIVES +#undef DIRECTIVE +#undef CHAR_T +#undef VASNPRINTF diff -urpP gnupg-1.2.5/intl/vasnprintf.h gnupg-1.2.6/intl/vasnprintf.h --- gnupg-1.2.5/intl/vasnprintf.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/vasnprintf.h 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,61 @@ +/* vsprintf with automatic memory allocation. + Copyright (C) 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _VASNPRINTF_H +#define _VASNPRINTF_H + +/* Get va_list. */ +#include + +/* Get size_t. */ +#include + +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# define __attribute__(Spec) /* empty */ +# endif +/* The __-protected variants of `format' and `printf' attributes + are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) +# define __format__ format +# define __printf__ printf +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Write formatted output to a string dynamically allocated with malloc(). + You can pass a preallocated buffer for the result in RESULTBUF and its + size in *LENGTHP; otherwise you pass RESULTBUF = NULL. + If successful, return the address of the string (this may be = RESULTBUF + if no dynamic memory allocation was necessary) and set *LENGTHP to the + number of resulting bytes, excluding the trailing NUL. Upon error, set + errno and return NULL. */ +extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...) + __attribute__ ((__format__ (__printf__, 3, 4))); +extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args) + __attribute__ ((__format__ (__printf__, 3, 0))); + +#ifdef __cplusplus +} +#endif + +#endif /* _VASNPRINTF_H */ diff -urpP gnupg-1.2.5/intl/vasnwprintf.h gnupg-1.2.6/intl/vasnwprintf.h --- gnupg-1.2.5/intl/vasnwprintf.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/vasnwprintf.h 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,46 @@ +/* vswprintf with automatic memory allocation. + Copyright (C) 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _VASNWPRINTF_H +#define _VASNWPRINTF_H + +/* Get va_list. */ +#include + +/* Get wchar_t, size_t. */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* Write formatted output to a string dynamically allocated with malloc(). + You can pass a preallocated buffer for the result in RESULTBUF and its + size in *LENGTHP; otherwise you pass RESULTBUF = NULL. + If successful, return the address of the string (this may be = RESULTBUF + if no dynamic memory allocation was necessary) and set *LENGTHP to the + number of resulting bytes, excluding the trailing NUL. Upon error, set + errno and return NULL. */ +extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...); +extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args); + +#ifdef __cplusplus +} +#endif + +#endif /* _VASNWPRINTF_H */ diff -urpP gnupg-1.2.5/intl/wprintf-parse.h gnupg-1.2.6/intl/wprintf-parse.h --- gnupg-1.2.5/intl/wprintf-parse.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/wprintf-parse.h 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,75 @@ +/* Parse printf format string. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _WPRINTF_PARSE_H +#define _WPRINTF_PARSE_H + +#include "printf-args.h" + + +/* Flags */ +#define FLAG_GROUP 1 /* ' flag */ +#define FLAG_LEFT 2 /* - flag */ +#define FLAG_SHOWSIGN 4 /* + flag */ +#define FLAG_SPACE 8 /* space flag */ +#define FLAG_ALT 16 /* # flag */ +#define FLAG_ZERO 32 + +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + +/* A parsed directive. */ +typedef struct +{ + const wchar_t* dir_start; + const wchar_t* dir_end; + int flags; + const wchar_t* width_start; + const wchar_t* width_end; + size_t width_arg_index; + const wchar_t* precision_start; + const wchar_t* precision_end; + size_t precision_arg_index; + wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */ + size_t arg_index; +} +wchar_t_directive; + +/* A parsed format string. */ +typedef struct +{ + size_t count; + wchar_t_directive *dir; + size_t max_width_length; + size_t max_precision_length; +} +wchar_t_directives; + + +/* Parses the format string. Fills in the number N of directives, and fills + in directives[0], ..., directives[N-1], and sets directives[N].dir_start + to the end of the format string. Also fills in the arg_type fields of the + arguments and the needed count of arguments. */ +#ifdef STATIC +STATIC +#else +extern +#endif +int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a); + +#endif /* _WPRINTF_PARSE_H */ diff -urpP gnupg-1.2.5/intl/xsize.h gnupg-1.2.6/intl/xsize.h --- gnupg-1.2.5/intl/xsize.h 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/intl/xsize.h 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,109 @@ +/* xsize.h -- Checked size_t computations. + + Copyright (C) 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _XSIZE_H +#define _XSIZE_H + +/* Get size_t. */ +#include + +/* Get SIZE_MAX. */ +#include +#if HAVE_STDINT_H +# include +#endif + +/* The size of memory objects is often computed through expressions of + type size_t. Example: + void* p = malloc (header_size + n * element_size). + These computations can lead to overflow. When this happens, malloc() + returns a piece of memory that is way too small, and the program then + crashes while attempting to fill the memory. + To avoid this, the functions and macros in this file check for overflow. + The convention is that SIZE_MAX represents overflow. + malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc + implementation that uses mmap --, it's recommended to use size_overflow_p() + or size_in_bounds_p() before invoking malloc(). + The example thus becomes: + size_t size = xsum (header_size, xtimes (n, element_size)); + void *p = (size_in_bounds_p (size) ? malloc (size) : NULL); +*/ + +/* Convert an arbitrary value >= 0 to type size_t. */ +#define xcast_size_t(N) \ + ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX) + +/* Sum of two sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xsum (size_t size1, size_t size2) +{ + size_t sum = size1 + size2; + return (sum >= size1 ? sum : SIZE_MAX); +} + +/* Sum of three sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xsum3 (size_t size1, size_t size2, size_t size3) +{ + return xsum (xsum (size1, size2), size3); +} + +/* Sum of four sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xsum4 (size_t size1, size_t size2, size_t size3, size_t size4) +{ + return xsum (xsum (xsum (size1, size2), size3), size4); +} + +/* Maximum of two sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xmax (size_t size1, size_t size2) +{ + /* No explicit check is needed here, because for any n: + max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */ + return (size1 >= size2 ? size1 : size2); +} + +/* Multiplication of a count with an element size, with overflow check. + The count must be >= 0 and the element size must be > 0. + This is a macro, not an inline function, so that it works correctly even + when N is of a wider tupe and N > SIZE_MAX. */ +#define xtimes(N, ELSIZE) \ + ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX) + +/* Check for overflow. */ +#define size_overflow_p(SIZE) \ + ((SIZE) == SIZE_MAX) +/* Check against overflow. */ +#define size_in_bounds_p(SIZE) \ + ((SIZE) != SIZE_MAX) + +#endif /* _XSIZE_H */ diff -urpP gnupg-1.2.5/keyserver/ChangeLog gnupg-1.2.6/keyserver/ChangeLog --- gnupg-1.2.5/keyserver/ChangeLog 2004-07-20 15:05:42.000000000 +0000 +++ gnupg-1.2.6/keyserver/ChangeLog 2004-08-09 16:35:02.000000000 +0000 @@ -1,3 +1,7 @@ +2004-08-09 Werner Koch + + * Makefile.am (gpgkeys_hkp_LDADD): Replaced INTLLIBS by LIBINTL. + 2004-07-20 Werner Koch * gpgkeys_ldap.c [_WIN32]: Include Windows specific header files. diff -urpP gnupg-1.2.5/keyserver/Makefile.am gnupg-1.2.6/keyserver/Makefile.am --- gnupg-1.2.5/keyserver/Makefile.am 2003-07-30 07:44:44.000000000 +0000 +++ gnupg-1.2.6/keyserver/Makefile.am 2004-08-09 16:35:07.000000000 +0000 @@ -28,4 +28,4 @@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@ diff -urpP gnupg-1.2.5/keyserver/Makefile.in gnupg-1.2.6/keyserver/Makefile.in --- gnupg-1.2.5/keyserver/Makefile.in 2004-07-26 12:26:35.000000000 +0000 +++ gnupg-1.2.6/keyserver/Makefile.in 2004-08-25 14:48:20.000000000 +0000 @@ -215,7 +215,7 @@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@ subdir = keyserver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -urpP gnupg-1.2.5/m4/ChangeLog gnupg-1.2.6/m4/ChangeLog --- gnupg-1.2.5/m4/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/ChangeLog 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,32 @@ +2004-08-09 gettextize + + * codeset.m4: New file, from gettext-0.14.1. + * gettext.m4: New file, from gettext-0.14.1. + * glibc21.m4: New file, from gettext-0.14.1. + * iconv.m4: New file, from gettext-0.14.1. + * intdiv0.m4: New file, from gettext-0.14.1. + * intmax.m4: New file, from gettext-0.14.1. + * inttypes.m4: New file, from gettext-0.14.1. + * inttypes_h.m4: New file, from gettext-0.14.1. + * inttypes-pri.m4: New file, from gettext-0.14.1. + * isc-posix.m4: New file, from gettext-0.14.1. + * lcmessage.m4: New file, from gettext-0.14.1. + * lib-ld.m4: New file, from gettext-0.14.1. + * lib-link.m4: New file, from gettext-0.14.1. + * lib-prefix.m4: New file, from gettext-0.14.1. + * longdouble.m4: New file, from gettext-0.14.1. + * longlong.m4: New file, from gettext-0.14.1. + * nls.m4: New file, from gettext-0.14.1. + * po.m4: New file, from gettext-0.14.1. + * printf-posix.m4: New file, from gettext-0.14.1. + * progtest.m4: New file, from gettext-0.14.1. + * signed.m4: New file, from gettext-0.14.1. + * size_max.m4: New file, from gettext-0.14.1. + * stdint_h.m4: New file, from gettext-0.14.1. + * uintmax_t.m4: New file, from gettext-0.14.1. + * ulonglong.m4: New file, from gettext-0.14.1. + * wchar_t.m4: New file, from gettext-0.14.1. + * wint_t.m4: New file, from gettext-0.14.1. + * xsize.m4: New file, from gettext-0.14.1. + * Makefile.am: New file. + diff -urpP gnupg-1.2.5/m4/Makefile.am gnupg-1.2.6/m4/Makefile.am --- gnupg-1.2.5/m4/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/Makefile.am 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1 @@ +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 diff -urpP gnupg-1.2.5/m4/Makefile.in gnupg-1.2.6/m4/Makefile.in --- gnupg-1.2.5/m4/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/Makefile.in 2004-08-25 14:48:20.000000000 +0000 @@ -0,0 +1,329 @@ +# Makefile.in generated by automake 1.7.9 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CAPLIBS = @CAPLIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLIBS = @DLLIBS@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ +DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGDLIBS = @EGDLIBS@ +EGREP = @EGREP@ +ENABLE_BZIP2_SUPPORT_FALSE = @ENABLE_BZIP2_SUPPORT_FALSE@ +ENABLE_BZIP2_SUPPORT_TRUE = @ENABLE_BZIP2_SUPPORT_TRUE@ +ENABLE_LOCAL_ZLIB_FALSE = @ENABLE_LOCAL_ZLIB_FALSE@ +ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_ZLIB_TRUE@ +EXEEXT = @EXEEXT@ +FAQPROG = @FAQPROG@ +GENCAT = @GENCAT@ +GETOPT = @GETOPT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +GPGKEYS_HKP = @GPGKEYS_HKP@ +GPGKEYS_LDAP = @GPGKEYS_LDAP@ +GPGKEYS_MAILTO = @GPGKEYS_MAILTO@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_DOCBOOK_TO_MAN_FALSE = @HAVE_DOCBOOK_TO_MAN_FALSE@ +HAVE_DOCBOOK_TO_MAN_TRUE = @HAVE_DOCBOOK_TO_MAN_TRUE@ +HAVE_DOCBOOK_TO_TEXI_FALSE = @HAVE_DOCBOOK_TO_TEXI_FALSE@ +HAVE_DOCBOOK_TO_TEXI_TRUE = @HAVE_DOCBOOK_TO_TEXI_TRUE@ +HAVE_DOSISH_SYSTEM_FALSE = @HAVE_DOSISH_SYSTEM_FALSE@ +HAVE_DOSISH_SYSTEM_TRUE = @HAVE_DOSISH_SYSTEM_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +IDEA_O = @IDEA_O@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDAPLIBS = @LDAPLIBS@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ +MPI_OPT_FLAGS = @MPI_OPT_FLAGS@ +MPI_SFLAGS = @MPI_SFLAGS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NETLIBS = @NETLIBS@ +NM = @NM@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SENDMAIL = @SENDMAIL@ +SET_MAKE = @SET_MAKE@ +SHA512_O = @SHA512_O@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TIGER_O = @TIGER_O@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +W32LIBS = @W32LIBS@ +WORKING_FAQPROG_FALSE = @WORKING_FAQPROG_FALSE@ +WORKING_FAQPROG_TRUE = @WORKING_FAQPROG_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIBS = @ZLIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 +subdir = m4 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu m4/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile + +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urpP gnupg-1.2.5/m4/codeset.m4 gnupg-1.2.6/m4/codeset.m4 --- gnupg-1.2.5/m4/codeset.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/codeset.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,23 @@ +# codeset.m4 serial AM1 (gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have and nl_langinfo(CODESET).]) + fi +]) diff -urpP gnupg-1.2.5/m4/gettext.m4 gnupg-1.2.6/m4/gettext.m4 --- gnupg-1.2.5/m4/gettext.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/gettext.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,487 @@ +# gettext.m4 serial 28 (gettext-0.13) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +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 , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to 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_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + 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 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: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not + dnl documented, we avoid it. + ifelse(gt_included_intl, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Set USE_NLS. + AM_NLS + + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) + dnl User does not insist on using GNU NLS library. Figure out what + 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 +]ifelse([$2], [need-formatstring-macros], +[#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]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + 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_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 +]ifelse([$2], [need-formatstring-macros], +[#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]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_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 + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#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]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi + + dnl If an already present or preinstalled GNU gettext() is found, + 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" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. + CATOBJEXT=.gmo + fi + ]) + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) + else + USE_NLS=no + fi + fi + + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + 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 + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE(HAVE_DCGETTEXT, 1, + [Define if the GNU dcgettext() function is already present or preinstalled.]) + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + + ifelse(gt_included_intl, yes, [ + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi + + dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATOBJEXT) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST(GENCAT) + + dnl For backward compatibility. Some Makefiles may be using this. + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + AC_SUBST(INTLOBJS) + + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + ]) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST(INTLLIBS) + + dnl Make all documented variables known to autoconf. + AC_SUBST(LIBINTL) + AC_SUBST(LTLIBINTL) + AC_SUBST(POSUB) +]) + + +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_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([bh_C_SIGNED])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([jm_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([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gt_TYPE_INTMAX_T]) + AC_REQUIRE([gt_PRINTF_POSIX]) + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gt_INTDIV0])dnl + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl + AC_REQUIRE([gt_INTTYPES_PRI])dnl + AC_REQUIRE([gl_XSIZE])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([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ +__fsetlocking]) + + 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 ]) + gt_CHECK_DECL(_snwprintf, [#include ]) + + 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 ]) + gt_CHECK_DECL(fgets_unlocked, [#include ]) + gt_CHECK_DECL(getc_unlocked, [#include ]) + + 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_ICONV + AM_LANGINFO_CODESET + if test $ac_cv_header_locale_h = yes; then + AM_LC_MESSAGES + 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.]) +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff -urpP gnupg-1.2.5/m4/glibc21.m4 gnupg-1.2.6/m4/glibc21.m4 --- gnupg-1.2.5/m4/glibc21.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/glibc21.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,32 @@ +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) diff -urpP gnupg-1.2.5/m4/iconv.m4 gnupg-1.2.6/m4/iconv.m4 --- gnupg-1.2.5/m4/iconv.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/iconv.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,103 @@ +# iconv.m4 serial AM4 (gettext-0.11.3) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST(LIBICONV) + AC_SUBST(LTLIBICONV) +]) + +AC_DEFUN([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi +]) diff -urpP gnupg-1.2.5/m4/intdiv0.m4 gnupg-1.2.6/m4/intdiv0.m4 --- gnupg-1.2.5/m4/intdiv0.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/intdiv0.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,72 @@ +# intdiv0.m4 serial 1 (gettext-0.11.3) +dnl Copyright (C) 2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gt_INTDIV0], +[ + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], + gt_cv_int_divbyzero_sigfpe, + [ + AC_TRY_RUN([ +#include +#include + +static void +#ifdef __cplusplus +sigfpe_handler (int sig) +#else +sigfpe_handler (sig) int sig; +#endif +{ + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ + exit (sig != SIGFPE); +} + +int x = 1; +int y = 0; +int z; +int nan; + +int main () +{ + signal (SIGFPE, sigfpe_handler); +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) + signal (SIGTRAP, sigfpe_handler); +#endif +/* Linux/SPARC yields signal SIGILL. */ +#if defined (__sparc__) && defined (__linux__) + signal (SIGILL, sigfpe_handler); +#endif + + z = x / y; + nan = y / y; + exit (1); +} +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, + [ + # Guess based on the CPU. + case "$host_cpu" in + alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; + esac + ]) + ]) + case "$gt_cv_int_divbyzero_sigfpe" in + *yes) value=1;; + *) value=0;; + esac + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, + [Define if integer division by zero raises signal SIGFPE.]) +]) diff -urpP gnupg-1.2.5/m4/intmax.m4 gnupg-1.2.6/m4/intmax.m4 --- gnupg-1.2.5/m4/intmax.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/intmax.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,32 @@ +# intmax.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the system has the 'intmax_t' type, but don't attempt to +dnl find a replacement if it is lacking. + +AC_DEFUN([gt_TYPE_INTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, + [AC_TRY_COMPILE([ +#include +#include +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#endif +], [intmax_t x = -1;], 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 or .]) + fi +]) diff -urpP gnupg-1.2.5/m4/inttypes-pri.m4 gnupg-1.2.6/m4/inttypes-pri.m4 --- gnupg-1.2.5/m4/inttypes-pri.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/inttypes-pri.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,32 @@ +# inttypes-pri.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +# Define PRI_MACROS_BROKEN if 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([gt_HEADER_INTTYPES_H]) + if test $gt_cv_header_inttypes_h = yes; then + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], + gt_cv_inttypes_pri_broken, + [ + AC_TRY_COMPILE([#include +#ifdef PRId32 +char *p = PRId32; +#endif +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) + ]) + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, + [Define if exists and defines unusable PRI* macros.]) + fi +]) diff -urpP gnupg-1.2.5/m4/inttypes.m4 gnupg-1.2.6/m4/inttypes.m4 --- gnupg-1.2.5/m4/inttypes.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/inttypes.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,27 @@ +# inttypes.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H if exists and doesn't clash with +# . + +AC_DEFUN([gt_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, + [ + AC_TRY_COMPILE( + [#include +#include ], + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) + ]) + if test $gt_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, + [Define if exists and doesn't clash with .]) + fi +]) diff -urpP gnupg-1.2.5/m4/inttypes_h.m4 gnupg-1.2.6/m4/inttypes_h.m4 --- gnupg-1.2.5/m4/inttypes_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/inttypes_h.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,28 @@ +# inttypes_h.m4 serial 5 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_inttypes_h=yes, + jm_ac_cv_header_inttypes_h=no)]) + if test $jm_ac_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, + [Define if exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) diff -urpP gnupg-1.2.5/m4/isc-posix.m4 gnupg-1.2.6/m4/isc-posix.m4 --- gnupg-1.2.5/m4/isc-posix.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/isc-posix.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,26 @@ +# isc-posix.m4 serial 2 (gettext-0.11.2) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. + +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) diff -urpP gnupg-1.2.5/m4/lcmessage.m4 gnupg-1.2.6/m4/lcmessage.m4 --- gnupg-1.2.5/m4/lcmessage.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/lcmessage.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,32 @@ +# lcmessage.m4 serial 3 (gettext-0.11.3) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +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 , 1995. + +# Check whether LC_MESSAGES is available in . + +AC_DEFUN([AM_LC_MESSAGES], +[ + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi +]) diff -urpP gnupg-1.2.5/m4/lib-ld.m4 gnupg-1.2.6/m4/lib-ld.m4 --- gnupg-1.2.5/m4/lib-ld.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/lib-ld.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,112 @@ +# lib-ld.m4 serial 3 (gettext-0.13) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(acl_cv_path_LD, +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT($LD) +else + AC_MSG_RESULT(no) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) diff -urpP gnupg-1.2.5/m4/lib-link.m4 gnupg-1.2.6/m4/lib-link.m4 --- gnupg-1.2.5/m4/lib-link.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/lib-link.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,551 @@ +# lib-link.m4 serial 4 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + undefine([Name]) + undefine([NAME]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. If found, it +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + undefine([Name]) + undefine([NAME]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, +dnl hardcode_direct, hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE(rpath, + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib$1-prefix], +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) diff -urpP gnupg-1.2.5/m4/lib-prefix.m4 gnupg-1.2.6/m4/lib-prefix.m4 --- gnupg-1.2.5/m4/lib-prefix.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/lib-prefix.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,155 @@ +# lib-prefix.m4 serial 3 (gettext-0.13) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) diff -urpP gnupg-1.2.5/m4/longdouble.m4 gnupg-1.2.6/m4/longdouble.m4 --- gnupg-1.2.5/m4/longdouble.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/longdouble.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,30 @@ +# longdouble.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the compiler supports the 'long double' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_LONGDOUBLE], +[ + AC_CACHE_CHECK([for long double], gt_cv_c_long_double, + [if test "$GCC" = yes; then + gt_cv_c_long_double=yes + else + AC_TRY_COMPILE([ + /* The Stardent Vistra knows sizeof(long double), but does not support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + int array [2*(sizeof(long double) >= sizeof(double)) - 1]; + ], , + gt_cv_c_long_double=yes, gt_cv_c_long_double=no) + fi]) + if test $gt_cv_c_long_double = yes; then + AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) + fi +]) diff -urpP gnupg-1.2.5/m4/longlong.m4 gnupg-1.2.6/m4/longlong.m4 --- gnupg-1.2.5/m4/longlong.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/longlong.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,25 @@ +# longlong.m4 serial 4 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_LONG_LONG if 'long long' works. + +AC_DEFUN([jm_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)]) + if test $ac_cv_type_long_long = yes; then + AC_DEFINE(HAVE_LONG_LONG, 1, + [Define if you have the 'long long' type.]) + fi +]) diff -urpP gnupg-1.2.5/m4/nls.m4 gnupg-1.2.6/m4/nls.m4 --- gnupg-1.2.5/m4/nls.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/nls.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,49 @@ +# nls.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +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 , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate it. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +]) diff -urpP gnupg-1.2.5/m4/po.m4 gnupg-1.2.6/m4/po.m4 --- gnupg-1.2.5/m4/po.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/po.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,426 @@ +# po.m4 serial 3 (gettext-0.14) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +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 , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Checks for all prerequisites of the po subdirectory. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AM_NLS])dnl + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + AC_MSG_RESULT( + [found $GMSGFMT program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + fi + + AC_OUTPUT_COMMANDS([ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done], + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) + +dnl Postprocesses a Makefile in a directory containing PO files. +AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], +[ + # When this code is run, in config.status, two variables have already been + # set: + # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, + # - LINGUAS is the value of the environment variable LINGUAS at configure + # time. + +changequote(,)dnl + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + # Find a way to echo strings without interpreting backslash. + if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='echo' + else + if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='printf %s\n' + else + echo_func () { + cat < "$ac_file.tmp" + if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + cat >> "$ac_file.tmp" < /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/_/-/g'` + cat >> "$ac_file.tmp" <> "$ac_file.tmp" < +#include +/* The string "%2$d %1$d", with dollar characters protected from the shell's + dollar expansion (possibly an autoconf bug). */ +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; +static char buf[100]; +int main () +{ + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); +}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, + [ + AC_EGREP_CPP(notposix, [ +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ + notposix +#endif + ], gt_cv_func_printf_posix="guessing no", + gt_cv_func_printf_posix="guessing yes") + ]) + ]) + case $gt_cv_func_printf_posix in + *yes) + AC_DEFINE(HAVE_POSIX_PRINTF, 1, + [Define if your printf() function supports format strings with positions.]) + ;; + esac +]) diff -urpP gnupg-1.2.5/m4/progtest.m4 gnupg-1.2.6/m4/progtest.m4 --- gnupg-1.2.5/m4/progtest.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/progtest.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,91 @@ +# progtest.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +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 , 1996. + +# Search path for a program which passes the given test. + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) diff -urpP gnupg-1.2.5/m4/signed.m4 gnupg-1.2.6/m4/signed.m4 --- gnupg-1.2.5/m4/signed.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/signed.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,19 @@ +# signed.m4 serial 1 (gettext-0.10.40) +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([bh_C_SIGNED], +[ + AC_CACHE_CHECK([for signed], bh_cv_c_signed, + [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) + if test $bh_cv_c_signed = no; then + AC_DEFINE(signed, , + [Define to empty if the C compiler doesn't support this keyword.]) + fi +]) diff -urpP gnupg-1.2.5/m4/size_max.m4 gnupg-1.2.6/m4/size_max.m4 --- gnupg-1.2.5/m4/size_max.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/size_max.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,61 @@ +# size_max.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +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], [ +#include +#if HAVE_STDINT_H +#include +#endif +#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'. + dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', + dnl which is guaranteed to work from LONG_MIN to LONG_MAX. + _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, + [#include ], result=?) + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, + [#include ], result=?) + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + [#include ], result=?) + 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 + extern size_t foo; + extern unsigned long foo; + ], [], fits_in_uint=0) + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + dnl Shouldn't happen, but who knows... + result='~(size_t)0' + fi + fi + AC_MSG_RESULT([$result]) + if test "$result" != yes; then + AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) + fi +]) diff -urpP gnupg-1.2.5/m4/stdint_h.m4 gnupg-1.2.6/m4/stdint_h.m4 --- gnupg-1.2.5/m4/stdint_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/stdint_h.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,28 @@ +# stdint_h.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_STDINT_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_STDINT_H], +[ + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_stdint_h=yes, + jm_ac_cv_header_stdint_h=no)]) + if test $jm_ac_cv_header_stdint_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, + [Define if exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) diff -urpP gnupg-1.2.5/m4/uintmax_t.m4 gnupg-1.2.6/m4/uintmax_t.m4 --- gnupg-1.2.5/m4/uintmax_t.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/uintmax_t.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,32 @@ +# uintmax_t.m4 serial 7 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +AC_PREREQ(2.13) + +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in or . + +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, + [Define to unsigned long or unsigned long long + if and don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in or .]) + fi +]) diff -urpP gnupg-1.2.5/m4/ulonglong.m4 gnupg-1.2.6/m4/ulonglong.m4 --- gnupg-1.2.5/m4/ulonglong.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/ulonglong.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,25 @@ +# ulonglong.m4 serial 3 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. + +AC_DEFUN([jm_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)]) + 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.]) + fi +]) diff -urpP gnupg-1.2.5/m4/wchar_t.m4 gnupg-1.2.6/m4/wchar_t.m4 --- gnupg-1.2.5/m4/wchar_t.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/wchar_t.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,22 @@ +# wchar_t.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether has the 'wchar_t' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_WCHAR_T], +[ + AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, + [AC_TRY_COMPILE([#include + wchar_t foo = (wchar_t)'\0';], , + gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) + if test $gt_cv_c_wchar_t = yes; then + AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) + fi +]) diff -urpP gnupg-1.2.5/m4/wint_t.m4 gnupg-1.2.6/m4/wint_t.m4 --- gnupg-1.2.5/m4/wint_t.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/wint_t.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,22 @@ +# wint_t.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether has the 'wint_t' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_WINT_T], +[ + AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, + [AC_TRY_COMPILE([#include + wint_t foo = (wchar_t)'\0';], , + gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) + if test $gt_cv_c_wint_t = yes; then + AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) + fi +]) diff -urpP gnupg-1.2.5/m4/xsize.m4 gnupg-1.2.6/m4/xsize.m4 --- gnupg-1.2.5/m4/xsize.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/m4/xsize.m4 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,14 @@ +# xsize.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_XSIZE], +[ + dnl Prerequisites of lib/xsize.h. + AC_REQUIRE([gl_SIZE_MAX]) + AC_CHECK_HEADERS(stdint.h) +]) diff -urpP gnupg-1.2.5/po/ChangeLog gnupg-1.2.6/po/ChangeLog --- gnupg-1.2.5/po/ChangeLog 2004-07-20 14:01:26.000000000 +0000 +++ gnupg-1.2.6/po/ChangeLog 2004-08-09 19:18:15.000000000 +0000 @@ -1,3 +1,22 @@ +2004-08-09 Werner Koch + + * ca.po: Updated. + + * LINGUAS: New. + + * Makevars: New. + +2004-08-09 gettextize + + * Makefile.in.in: Upgrade to gettext-0.14.1. + * Rules-quot: New file, from gettext-0.14.1. + * boldquot.sed: New file, from gettext-0.14.1. + * en@boldquot.header: New file, from gettext-0.14.1. + * en@quot.header: New file, from gettext-0.14.1. + * insert-header.sin: New file, from gettext-0.14.1. + * quot.sed: New file, from gettext-0.14.1. + * remove-potcdate.sin: New file, from gettext-0.14.1. + 2004-07-20 Werner Koch * fr.po, cs.po, et.po, el.po, id.po, pl.po, ro.po, sk.po, tr.po diff -urpP gnupg-1.2.5/po/LINGUAS gnupg-1.2.6/po/LINGUAS --- gnupg-1.2.5/po/LINGUAS 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/LINGUAS 2004-08-09 19:19:24.000000000 +0000 @@ -0,0 +1,21 @@ +# Set of available languages. +be +ca cs +da de +eo el es et +fi fr +gl +hu +id it +ja +nl +pl pt_BR pt +ro ru +sk sv +tr +zh_TW zh_CN + + + + + diff -urpP gnupg-1.2.5/po/Makefile.in.in gnupg-1.2.6/po/Makefile.in.in --- gnupg-1.2.5/po/Makefile.in.in 2002-06-29 13:43:03.000000000 +0000 +++ gnupg-1.2.6/po/Makefile.in.in 2004-08-09 15:28:49.000000000 +0000 @@ -1,18 +1,18 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper # -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# 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.14 PACKAGE = @PACKAGE@ VERSION = @VERSION@ -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - SHELL = /bin/sh @SET_MAKE@ @@ -29,74 +29,128 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -CC = @CC@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ MSGMERGE = msgmerge - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter POFILES = @POFILES@ GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -$(POFILES) $(GMOFILES) +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) POTFILES = \ CATALOGS = @CATALOGS@ -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo - -.c.o: - $(COMPILE) $< +# Makevars gets inserted here. (Don't remove this line!) -.po.pox: - $(MAKE) $(PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .po.mo: - $(MSGFMT) -o $@ $< + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ .po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ all: all-@USE_NLS@ -all-yes: $(CATALOGS) +all-yes: stamp-po all-no: -# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @echo "touch stamp-po" + @echo timestamp > stamp-poT + @mv stamp-poT stamp-po + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. -$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ - && test ! -f $(PACKAGE).po \ - || ( rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ + else \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi @@ -106,41 +160,118 @@ install-data-yes: all @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - echo "installing $(srcdir)/$$cat as" \ - "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ - fi; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ + fi; \ + done; \ done -# Define this as empty until I found a useful application. -installcheck: +install-strip: install -uninstall: - catalogs='$(CATALOGS)'; \ +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + $(mkinstalldirs) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ done - if test "$(PACKAGE)" = "gettext"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ + done check: all -dvi info tags TAGS ID: +info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.new.po + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean @@ -151,7 +282,7 @@ distclean: clean maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) + rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: @@ -160,37 +291,76 @@ dist distdir: # This is a separate target because 'update-po' must be executed before. dist2: $(DISTFILES) dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ - cp -p $$dir/$$file $(distdir); \ + if test -f $$file; then \ + cp -p $$file $(distdir); \ + else \ + cp -p $(srcdir)/$$file $(distdir); \ + fi; \ done update-po: Makefile - $(MAKE) $(PACKAGE).pot - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - catalogs='$(GMOFILES)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ - mv -f $$lang.new.po $$lang.po; \ + if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.new.po; \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ fi; \ - done - $(MAKE) update-gmo + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +$(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: -Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in +Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status +force: + # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urpP gnupg-1.2.5/po/Makevars gnupg-1.2.6/po/Makevars --- gnupg-1.2.5/po/Makevars 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/Makevars 2004-08-09 18:38:04.000000000 +0000 @@ -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 = translations@gnupg.org + +# 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 -urpP gnupg-1.2.5/po/Rules-quot gnupg-1.2.6/po/Rules-quot --- gnupg-1.2.5/po/Rules-quot 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/Rules-quot 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,47 @@ +# Special Makefile rules for English message catalogs with quotation marks. + +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot + +.SUFFIXES: .insert-header .po-update-en + +en@quot.po-create: + $(MAKE) en@quot.po-update +en@boldquot.po-create: + $(MAKE) en@boldquot.po-update + +en@quot.po-update: en@quot.po-update-en +en@boldquot.po-update: en@boldquot.po-update-en + +.insert-header.po-update-en: + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + ll=`echo $$lang | sed -e 's/@.*//'`; \ + LC_ALL=C; export LC_ALL; \ + cd $(srcdir); \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "creation of $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +en@quot.insert-header: insert-header.sin + sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header + +en@boldquot.insert-header: insert-header.sin + sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header + +mostlyclean: mostlyclean-quot +mostlyclean-quot: + rm -f *.insert-header diff -urpP gnupg-1.2.5/po/be.po gnupg-1.2.6/po/be.po --- gnupg-1.2.5/po/be.po 2004-07-26 12:26:37.000000000 +0000 +++ gnupg-1.2.6/po/be.po 2004-08-25 14:59:12.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -32,7 +32,6 @@ msgstr "迡郱迮郇郇迮 郇迮邾訄迣 msgid "(you may have used the wrong program for this task)\n" msgstr "" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 #, fuzzy msgid "yes" @@ -42,7 +41,6 @@ msgstr "yes [訄郕]" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no [郇迮]" @@ -51,7 +49,6 @@ msgstr "no [郇迮]" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit [赲邿]" @@ -256,7 +253,6 @@ msgstr "" msgid "not processed" msgstr "" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "" @@ -723,19 +719,19 @@ msgstr "" msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -743,7 +739,7 @@ msgstr "" "@\n" "(郅迡郱迮 man 訄郋郇郕, 迡郅 訇郋郅 郈郋郇訄迣訄 訄郈訄郇郇 郱訄迣訄迡訄 赲訇訄訄)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -763,15 +759,15 @@ msgstr "" " --list-keys [郇訄郱赲] 郈訄郕訄郱訄 郕郅\n" " --fingerprint [郇訄郱赲] 郈訄郕訄郱訄 訄迡訇郕 郈訄郅訄\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "訄郅 郅訄郕訄, 郈訄赲迮迡訄邾郅邿迮 郈訄 郈訄邾郅郕 郇訄 .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "郕訄訄郇郇迮: gpg [赲訇訄] [訄邿郅] (-h 迡郅 迡訄赲迮迡郕)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -781,7 +777,7 @@ msgstr "" "sign, check, encrypt decrypt\n" "訄郈郋邾郇訄迮 迡郱迮郇郇迮 郱訄郅迮迠 訄迡 赲訄郋迡郇 迡訄郇郇\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -789,386 +785,386 @@ msgstr "" "\n" "郅迣訄邾, 郕 郈訄迡邾郅赲訄訄:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "" -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "郕訄訄郇郇迮: gpg [赲訇訄] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "郇迮邾訄郅郇 郱訄迣訄迡\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s - 迣訄 郇迮迡訄郈訄郅郇訄迮 邾郇郋赲訄 郱郇訄郕訄\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 郇迮迡訄郈訄郅郇 赲訇訄 邾郈訄訄赲訄郇郇\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "郇迮迡訄郈訄郅郇 赲訇訄 邾郈訄訄赲訄郇郇\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 郇迮迡訄郈訄郅郇 赲訇訄 郕郈訄訄赲訄郇郇\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "郇迮迡訄郈訄郅郇 赲訇訄 郕郈訄訄赲訄郇郇\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 郇迮 迡訄郱赲訄郅迮訄 訄郱訄邾 郱 %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 郇 邾訄迮 郇 訄郱訄邾 郱 %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "郇迮迡訄郈訄郅郇 迡訄郈郋邾郇 郈迮訄赲訄迣\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s 郇 邾訄迮 郇 訄郱訄邾 郱 %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [郱訄迣訄迡]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "郇迮邾訄迣邾訄 訄迡郕 %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "郱訇郋邿 郈訄迡郈訄郇郇: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "郱訇郋邿 郈訄迡郈訄郇郇: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "郱訇郋邿 郈訄迡郈訄郇郇: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "郱訇郋邿 郈訄迡郈訄郇郇: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "郇迮訄郇 -訄郅迣訄邾 \"%s\"\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[郇訄郱赲訄_訄邿郅訄]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "郇迮邾訄迣邾訄 訄迡郕 \"%s\"\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "" @@ -1293,7 +1289,6 @@ msgstr "" msgid "revocation comment: " msgstr "" -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "" @@ -1342,7 +1337,6 @@ msgstr "" msgid " %d = I trust ultimately\n" msgstr "" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr "" @@ -1640,14 +1634,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1716,7 +1702,6 @@ msgstr "" msgid "%s does not expire at all\n" msgstr "" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2008,7 +1993,6 @@ msgstr "" msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2022,9 +2006,7 @@ msgstr "" msgid "too many entries in pk cache - disabled\n" msgstr "" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "" @@ -2252,7 +2234,6 @@ msgstr "" msgid "key %08lX: secret key imported\n" msgstr "" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2479,8 +2460,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2808,7 +2787,6 @@ msgstr "" msgid "delete user ID" msgstr "" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "" @@ -3107,8 +3085,6 @@ msgstr "" msgid " (sensitive)" msgstr "" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3226,9 +3202,6 @@ msgstr "" msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3316,7 +3289,6 @@ msgstr "" msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "" @@ -3357,10 +3329,6 @@ msgstr "" msgid "user ID \"%s\" is already revoked\n" msgstr "" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3424,7 +3392,6 @@ msgstr "" msgid " Subkey fingerprint:" msgstr "" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr "" @@ -3434,8 +3401,6 @@ msgstr "" msgid "weird size for an encrypted session key (%d)\n" msgstr "" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3547,7 +3512,6 @@ msgstr "訄郅郕訄:" msgid "signature verification suppressed\n" msgstr "" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "" @@ -3557,10 +3521,6 @@ msgstr "" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "郋迡郈 赲郋訄郇 %.*s 郱 赲郕訄訄郇郇迮邾 %s ID 郕郅訄 %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3722,7 +3682,7 @@ msgstr "" msgid "gpg-agent protocol version %d is not supported\n" msgstr "" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "" @@ -3731,11 +3691,11 @@ msgstr "" msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "" @@ -3767,16 +3727,16 @@ msgstr "郈訄郋郅 郱訄郇訄迡訄 迡郋 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "郕訄訄赲訄郇訄 郕訄訄郅郇郕訄邾\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3786,20 +3746,20 @@ msgstr "" "訄邾 郇迮訄訇郋迡郇訄 赲迮 郈訄郋郅, 郕訄訇 訄迡郇 訄郕郇 郕郅 迡郅\n" "郕訄訄郅郇郕訄: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-訇訄赲 %s 郕郅, ID %08lX, 赲郋訄郇 %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "苺赲迡郱迮 郈訄郋郅: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "訄訄迮 郈訄郋郅: " @@ -3865,41 +3825,41 @@ msgstr "" msgid "NOTE: key has been revoked" msgstr "" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "" @@ -4303,9 +4263,6 @@ msgstr "" msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4348,7 +4305,6 @@ msgid "" "signatures!\n" msgstr "" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4414,7 +4370,7 @@ msgstr "" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA 郈訄訄訇迮 赲郕訄訄郇郇 160- 訇訄赲訄迣訄 -訄郅迣訄邾\n" @@ -4703,17 +4659,17 @@ msgstr "訄赲迮迡郕訄 訄迡郇 msgid "No help available for `%s'" msgstr "郅 \"%s\" 迡訄赲迮迡郕訄 訄迡郇訄迮" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "" @@ -4810,7 +4766,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -4888,7 +4843,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "郱訇郋邿 郈訄迡郈訄郇郇: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "" @@ -4922,7 +4876,6 @@ msgstr "郇迮赲迡郋邾 訄郅迣訄 msgid "NOTE: This key is not protected!\n" msgstr "郅 訄訇訄郋郇迮郇.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -4995,7 +4948,6 @@ msgstr "郈訄郕訄郱訄 郕郅 邿 msgid "error: no ownertrust value\n" msgstr "" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/boldquot.sed gnupg-1.2.6/po/boldquot.sed --- gnupg-1.2.5/po/boldquot.sed 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/boldquot.sed 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,10 @@ +s/"\([^"]*\)"/\1/g +s/`\([^`']*\)'/\1/g +s/ '\([^`']*\)' / \1 /g +s/ '\([^`']*\)'$/ \1/g +s/^'\([^`']*\)' /\1 /g +s//""/g +s///g +s///g +s///g +s///g diff -urpP gnupg-1.2.5/po/ca.po gnupg-1.2.6/po/ca.po --- gnupg-1.2.5/po/ca.po 2004-07-26 12:26:37.000000000 +0000 +++ gnupg-1.2.6/po/ca.po 2004-08-25 14:59:12.000000000 +0000 @@ -1,69 +1,68 @@ -# Missatges de gnupg en catal嚙. -# Copyright 嚙 2001, 2002, 2003 Free Software Foundation, Inc. -# Carles Sadurn嚙 Anguita , 2001. -# Jordi Mallach , 2001, 2002, 2003. +# Missatges de gnupg en catal. +# Copyright 穢 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Carles Sadurn穩 Anguita , 2001. +# Jordi Mallach , 2001, 2002, 2003, 2004. # # Coses (jm): -# ID d'usuari 嚙編 mascul嚙? Hi ha una mescla... -# (ivb: ID == identificador -> mascul嚙) +# ID d'usuari 矇s mascul穩? Hi ha una mescla... +# (ivb: ID == identificador -> mascul穩) # Canviar ID -> ID d'usuari # Xifratge vs. Xifrat -# (ivb: xifratge -> acci嚙, xifrat -> adjectiu) +# (ivb: xifratge -> acci籀, xifrat -> adjectiu) # + coses (ivb): -# - Algunes frases incompletes 嚙綞 desconegut嚙 -> 嚙綞 嚙編 desconegut嚙. -# - 嚙窮lgoritme嚙 o 嚙窮lgorisme嚙? (ambd嚙編 s嚙緯 correctes) +# - Algunes frases incompletes 竄x desconegut罈 -> 竄x 矇s desconegut罈. +# - 竄algoritme罈 o 竄algorisme罈? (ambd籀s s籀n correctes) # - digest -> resum -# - 嚙窮nell嚙 o 嚙箱lauer嚙? (key ring -> clauer) +# - 竄anell罈 o 竄clauer罈? (key ring -> clauer) # - bug -> error? (del recull) -# - Crec q uses m嚙編 嚙編ignatura嚙 q 嚙篆irma嚙; unifique. -# - Usar maj嚙編cules x ressaltar (com original)? +# - Crec q uses m矇s 竄signatura罈 q 竄firma罈; unifique. +# - Usar maj繳scules x ressaltar (com original)? # - Hi ha cert desordre en les cometes ;) -# - Frases 嚙緯dies completades. -# - Algunes incoher嚙緯cies: error {en la lectura,en llegir,mentre es llegia} +# - Frases 穩ndies completades. +# - Algunes incoher癡ncies: error {en la lectura,en llegir,mentre es llegia} # - Probablement he clavat la pota en tots els Photo ID :P -# - Nom嚙編 es maneja amb les mans. -# - sapigueu -> sapieu? (x coher嚙緯cia) +# - Nom矇s es maneja amb les mans. +# - sapigueu -> sapieu? (x coher癡ncia) +# msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.4rc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Project-Id-Version: gnupg 1.2.5\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-05 19:15+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: util/secmem.c:88 msgid "WARNING: using insecure memory!\n" -msgstr "AV嚙磅: esteu usant mem嚙緝ia insegura!\n" +msgstr "AVS: esteu usant mem簷ria insegura!\n" #: util/secmem.c:89 msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "" -"si us plau, visiteu http://www.gnupg.org/faq.html per a m嚙編 informaci嚙穀n" +"si us plau, visiteu http://www.gnupg.org/faq.html per a m矇s informaci籀\n" -# 嚙締timament pense si 嚙箠niciar嚙 no ser嚙 millor que 嚙箠nicialitzar嚙? ivb -# Segons SC, hi ha difer嚙緯cia. jm +# ltimament pense si 竄iniciar罈 no ser millor que 竄inicialitzar罈? ivb +# Segons SC, hi ha difer癡ncia. jm #: util/secmem.c:338 msgid "operation is not possible without initialized secure memory\n" -msgstr "l'operaci嚙 no 嚙編 possible sense mem嚙緝ia segura inicialitzada\n" +msgstr "l'operaci籀 no 矇s possible sense mem簷ria segura inicialitzada\n" #: util/secmem.c:339 msgid "(you may have used the wrong program for this task)\n" msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" -msgstr "s嚙罵si" +msgstr "s穩|si" #: util/miscutil.c:308 util/miscutil.c:349 msgid "yY" msgstr "sS" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no" @@ -72,12 +71,11 @@ msgstr "no" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "ix" -# 嚙綞X嚙? ivb +# 竄xX罈? ivb #: util/miscutil.c:351 msgid "qQ" msgstr "xX" @@ -88,47 +86,47 @@ msgstr "error general" #: util/errors.c:55 msgid "unknown packet type" -msgstr "el tipus de paquet 嚙編 desconegut" +msgstr "el tipus de paquet 矇s desconegut" #: util/errors.c:56 msgid "unknown version" -msgstr "la versi嚙 嚙編 desconeguda" +msgstr "la versi籀 矇s desconeguda" #: util/errors.c:57 msgid "unknown pubkey algorithm" -msgstr "l'algoritme de clau p嚙箭lica 嚙編 desconegut" +msgstr "l'algoritme de clau p繳blica 矇s desconegut" #: util/errors.c:58 msgid "unknown digest algorithm" -msgstr "l'algoritme de resum 嚙編 desconegut" +msgstr "l'algoritme de resum 矇s desconegut" #: util/errors.c:59 msgid "bad public key" -msgstr "la clau p嚙箭lica 嚙編 err嚙緯ia" +msgstr "la clau p繳blica 矇s err簷nia" #: util/errors.c:60 msgid "bad secret key" -msgstr "la clau secreta 嚙編 err嚙緯ia" +msgstr "la clau secreta 矇s err簷nia" #: util/errors.c:61 msgid "bad signature" -msgstr "la signatura 嚙編 err嚙緯ia" +msgstr "la signatura 矇s err簷nia" #: util/errors.c:62 msgid "checksum error" -msgstr "la suma de control 嚙編 err嚙緯ia" +msgstr "la suma de control 矇s err簷nia" #: util/errors.c:63 msgid "bad passphrase" -msgstr "la contrasenya 嚙編 err嚙緯ia" +msgstr "la contrasenya 矇s err簷nia" #: util/errors.c:64 msgid "public key not found" -msgstr "no s'ha trobat la clau p嚙箭lica" +msgstr "no s'ha trobat la clau p繳blica" #: util/errors.c:65 msgid "unknown cipher algorithm" -msgstr "l'algoritme de xifratge 嚙編 desconegut" +msgstr "l'algoritme de xifratge 矇s desconegut" #: util/errors.c:66 msgid "can't open the keyring" @@ -136,11 +134,11 @@ msgstr "no s'ha pogut obrir l'anell" #: util/errors.c:67 msgid "invalid packet" -msgstr "el paquet 嚙編 inv嚙締id" +msgstr "el paquet 矇s invlid" #: util/errors.c:68 msgid "invalid armor" -msgstr "l'armadura 嚙編 inv嚙締ida" +msgstr "l'armadura 矇s invlida" #: util/errors.c:69 msgid "no such user id" @@ -148,22 +146,22 @@ msgstr "no s'ha trobat l'id de l'usuari" #: util/errors.c:70 msgid "secret key not available" -msgstr "la clau secreta no est嚙 disponible" +msgstr "la clau secreta no est disponible" #: util/errors.c:71 msgid "wrong secret key used" msgstr "s'ha utilitzat una clau secreta incorrecta" -# G嚙緯ere? Nombre? ivb +# G癡nere? Nombre? ivb # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm #: util/errors.c:72 msgid "not supported" -msgstr "no 嚙編 suportat" +msgstr "no 矇s suportat" #: util/errors.c:73 msgid "bad key" -msgstr "la clau 嚙編 incorrecta" +msgstr "la clau 矇s incorrecta" #: util/errors.c:74 msgid "file read error" @@ -175,7 +173,7 @@ msgstr "error d'escriptura" #: util/errors.c:76 msgid "unknown compress algorithm" -msgstr "l'algoritme de compressi嚙 嚙編 desconegut" +msgstr "l'algoritme de compressi籀 矇s desconegut" #: util/errors.c:77 msgid "file open error" @@ -183,47 +181,47 @@ msgstr "error en l'obertura del fitxer" #: util/errors.c:78 msgid "file create error" -msgstr "error en la creaci嚙 del fitxer" +msgstr "error en la creaci籀 del fitxer" #: util/errors.c:79 msgid "invalid passphrase" -msgstr "la contrasenya 嚙編 inv嚙締ida" +msgstr "la contrasenya 矇s invlida" #: util/errors.c:80 msgid "unimplemented pubkey algorithm" -msgstr "l'algoritme de clau p嚙箭lica no 嚙編 implementat" +msgstr "l'algoritme de clau p繳blica no 矇s implementat" #: util/errors.c:81 msgid "unimplemented cipher algorithm" -msgstr "l'algoritme de xifratge no 嚙編 implementat" +msgstr "l'algoritme de xifratge no 矇s implementat" #: util/errors.c:82 msgid "unknown signature class" -msgstr "la classe de signatura 嚙編 desconeguda" +msgstr "la classe de signatura 矇s desconeguda" #: util/errors.c:83 msgid "trust database error" -msgstr "error de la base de dades de confian嚙窮" +msgstr "error de la base de dades de confian癟a" #: util/errors.c:84 msgid "bad MPI" -msgstr "l'MPI 嚙編 erroni" +msgstr "l'MPI 矇s erroni" #: util/errors.c:85 msgid "resource limit" -msgstr "l嚙練it de recursos" +msgstr "l穩mit de recursos" #: util/errors.c:86 msgid "invalid keyring" -msgstr "l'anell no 嚙編 v嚙締id" +msgstr "l'anell no 矇s vlid" #: util/errors.c:87 msgid "bad certificate" -msgstr "el certificat 嚙編 incorrecte" +msgstr "el certificat 矇s incorrecte" #: util/errors.c:88 msgid "malformed user id" -msgstr "l'id d'usuari 嚙編 malformat" +msgstr "l'id d'usuari 矇s malformat" #: util/errors.c:89 msgid "file close error" @@ -235,7 +233,7 @@ msgstr "error en el reanomenament del fi #: util/errors.c:91 msgid "file delete error" -msgstr "error en l'eliminaci嚙 del fitxer" +msgstr "error en l'eliminaci籀 del fitxer" #: util/errors.c:92 msgid "unexpected data" @@ -245,63 +243,62 @@ msgstr "dades inesperades" msgid "timestamp conflict" msgstr "conflicte de data" -# Ac嚙 veus pq jo pose 嚙緯o 嚙編 v嚙締id嚙 en comptes de 嚙踝蕭s inv嚙締id嚙. ivb +# Ac穩 veus pq jo pose 竄no 矇s vlid罈 en comptes de 竄矇s invlid罈. ivb #: util/errors.c:94 msgid "unusable pubkey algorithm" -msgstr "l'algoritme de clau p嚙箭lica 嚙編 inusable" +msgstr "l'algoritme de clau p繳blica 矇s inusable" #: util/errors.c:95 msgid "file exists" msgstr "el fitxer existeix" -# Segons context: la clau 嚙編 feble? ivb +# Segons context: la clau 矇s feble? ivb #: util/errors.c:96 msgid "weak key" msgstr "clau feble" #: util/errors.c:97 msgid "invalid argument" -msgstr "l'argument 嚙編 inv嚙締id" +msgstr "l'argument 矇s invlid" -# La 嚙磊嚙 嚙編 masculina o femenina? ivb +# La 竄U罈 矇s masculina o femenina? ivb #: util/errors.c:98 msgid "bad URI" -msgstr "l'URI 嚙編 err嚙緯ia" +msgstr "l'URI 矇s err簷nia" -# 嚙範em. ivb +# dem. ivb #: util/errors.c:99 msgid "unsupported URI" -msgstr "l'URI no 嚙編 suportada" +msgstr "l'URI no 矇s suportada" #: util/errors.c:100 msgid "network error" msgstr "error de la xarxa" -# G嚙緯ere? Nombre? ivb +# G癡nere? Nombre? ivb # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm #: util/errors.c:102 msgid "not encrypted" -msgstr "no 嚙編 xifrat" +msgstr "no 矇s xifrat" -# G嚙緯ere? Nombre? Passat, futur? ivb -# Probablement 嚙編 una clau, femen嚙. jm +# G癡nere? Nombre? Passat, futur? ivb +# Probablement 矇s una clau, femen穩. jm # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm #: util/errors.c:103 msgid "not processed" msgstr "no processat" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" -msgstr "ls clau p嚙箭lica 嚙編 inusable" +msgstr "ls clau p繳blica 矇s inusable" #: util/errors.c:106 msgid "unusable secret key" -msgstr "la clau secreta 嚙編 inusable" +msgstr "la clau secreta 矇s inusable" -# 嚙範el servidor嚙, 嚙箴n el servidor嚙? ivb +# 竄del servidor罈, 竄en el servidor罈? ivb #: util/errors.c:107 msgid "keyserver error" msgstr "error de servidor de claus" @@ -309,7 +306,7 @@ msgstr "error de servidor de claus" #: util/logger.c:249 #, c-format msgid "... this is a bug (%s:%d:%s)\n" -msgstr "... a嚙踝蕭 嚙編 un bug (%s:%d:%s)\n" +msgstr "... a癟簷 矇s un bug (%s:%d:%s)\n" #: util/logger.c:255 #, c-format @@ -318,37 +315,36 @@ msgstr "heu trobat un bug... (%s:%d)\n" #: cipher/random.c:163 msgid "no entropy gathering module detected\n" -msgstr "no s'ha trobat cap m嚙範ul d'acumulaci嚙 d'entropia\n" +msgstr "no s'ha trobat cap m簷dul d'acumulaci籀 d'entropia\n" #: cipher/random.c:387 g10/keygen.c:1931 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" -msgstr "no s'ha pogut obrir 嚙%s嚙: %s\n" +msgstr "no s'ha pogut obrir 竄%s罈: %s\n" #: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" -msgstr "no es pot fer stat de 嚙%s嚙: %s\n" +msgstr "no es pot fer stat de 竄%s罈: %s\n" -# Descartar, deixar passar... ignorar 嚙編 un anglicisme. ivb +# Descartar, deixar passar... ignorar 矇s un anglicisme. ivb #: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" -msgstr "嚙%s嚙 no 嚙編 un fitxer regular: es descarta\n" +msgstr "竄%s罈 no 矇s un fitxer regular: es descarta\n" #: cipher/random.c:401 msgid "note: random_seed file is empty\n" -msgstr "nota: el fitxer random_seed 嚙編 buit\n" +msgstr "nota: el fitxer random_seed 矇s buit\n" #: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" -msgstr "" -"AV嚙磅: el tamany del fitxer random_seed no 嚙編 v嚙締id - no s'usar嚙穀n" +msgstr "AVS: el tamany del fitxer random_seed no 矇s vlid - no s'usar\n" #: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" -msgstr "no s'ha pogut llegir 嚙%s嚙: %s\n" +msgstr "no s'ha pogut llegir 竄%s罈: %s\n" #: cipher/random.c:453 msgid "note: random_seed file not updated\n" @@ -357,22 +353,22 @@ msgstr "nota: el fitxer random_seed no s #: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" -msgstr "no s'ha pogut crear 嚙%s嚙: %s\n" +msgstr "no s'ha pogut crear 竄%s罈: %s\n" #: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" -msgstr "no s'ha pogut escriure 嚙%s嚙: %s\n" +msgstr "no s'ha pogut escriure 竄%s罈: %s\n" # No em passe! ;) ivb #: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" -msgstr "no s'ha pogut tancar 嚙%s嚙: %s\n" +msgstr "no s'ha pogut tancar 竄%s罈: %s\n" #: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" -msgstr "AV嚙磅: esteu usant un generador de nombres aleatoris insegur!!\n" +msgstr "AVS: esteu usant un generador de nombres aleatoris insegur!!\n" #: cipher/random.c:729 msgid "" @@ -382,8 +378,8 @@ msgid "" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" msgstr "" -"El generador de nombres aleatoris 嚙編 nom嚙編 un peda嚙穀n" -"per a que funcioni - de cap manera 嚙編 un GNA fort!\n" +"El generador de nombres aleatoris 矇s nom矇s un peda癟\n" +"per a que funcioni - de cap manera 矇s un GNA fort!\n" "\n" "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n" "\n" @@ -397,21 +393,18 @@ msgid "" msgstr "" "\n" "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n" -"sistema tinga oportunitat de recollir m嚙編 entropia. (Calen %d bytes " -"m嚙編)\n" +"sistema tinga oportunitat de recollir m矇s entropia. (Calen %d bytes m矇s)\n" #: cipher/md.c:140 #, c-format msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" -"l'algorisme de resum 嚙%s嚙 es de nom嚙編 lectura en aquesta versi嚙穀n" +msgstr "l'algorisme de resum 竄%s罈 es de nom矇s lectura en aquesta versi籀\n" #: cipher/md.c:147 #, c-format msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" msgstr "" -"AV嚙磅: el resum 嚙%s嚙 no 嚙編 part d'OpenPGP. Utilitzeu-lo assumint el " -"risc!\n" +"AVS: el resum 竄%s罈 no 矇s part d'OpenPGP. Utilitzeu-lo assumint el risc!\n" #: cipher/rndegd.c:204 msgid "" @@ -420,7 +413,7 @@ msgid "" "of the entropy.\n" msgstr "" "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n" -"vos ajuda no avorrir-vos, ja que ajudar嚙 a la qualitat de la entropia.\n" +"vos ajuda no avorrir-vos, ja que ajudar a la qualitat de la entropia.\n" #: cipher/primegen.c:310 #, c-format @@ -457,11 +450,11 @@ msgstr "|[fitxers]|xifra fitxers" #: g10/g10.c:330 msgid "encryption only with symmetric cipher" -msgstr "xifra nom嚙編 amb xifratge sim嚙緣ric" +msgstr "xifra nom矇s amb xifratge sim癡tric" #: g10/g10.c:331 msgid "store only" -msgstr "nom嚙編 emmagatzema" +msgstr "nom矇s emmagatzema" #: g10/g10.c:332 msgid "decrypt data (default)" @@ -483,12 +476,12 @@ msgstr "llista claus" msgid "list keys and signatures" msgstr "llista claus i signatures" -# 嚙範e les claus嚙 o 嚙範e la clau嚙? ivb +# 竄de les claus罈 o 竄de la clau罈? ivb #: g10/g10.c:339 msgid "check key signatures" msgstr "comprova les signatures de la claus" -# 嚙範actilars嚙 o 嚙範igitals嚙? ivb +# 竄dactilars罈 o 竄digitals罈? ivb #: g10/g10.c:340 msgid "list keys and fingerprints" msgstr "llista claus i empremtes digitals" @@ -503,7 +496,7 @@ msgstr "genera un nou parell de claus" #: g10/g10.c:343 msgid "remove keys from the public keyring" -msgstr "elimina claus de l'anell p嚙箭lic" +msgstr "elimina claus de l'anell p繳blic" #: g10/g10.c:345 msgid "remove keys from the secret keyring" @@ -521,7 +514,7 @@ msgstr "signa una clau localment" msgid "sign a key non-revocably" msgstr "signa una clau irrevocablement" -# D'altres formes o no queda clar o 嚙編 massa literari :P ivb +# D'altres formes o no queda clar o 矇s massa literari :P ivb #: g10/g10.c:349 msgid "sign a key locally and non-revocably" msgstr "signa una clau de forma local i irrevocable" @@ -532,7 +525,7 @@ msgstr "signa o edita una clau" #: g10/g10.c:351 msgid "generate a revocation certificate" -msgstr "genera un certificat de revocaci嚙" +msgstr "genera un certificat de revocaci籀" #: g10/g10.c:353 msgid "export keys" @@ -560,27 +553,27 @@ msgstr "importa/fon claus" #: g10/g10.c:367 msgid "list only the sequence of packets" -msgstr "llista nom嚙編 la seq嚙踝蕭ncia de paquets" +msgstr "llista nom矇s la seq羹癡ncia de paquets" #: g10/g10.c:369 msgid "export the ownertrust values" -msgstr "exporta els valors de confian嚙窮" +msgstr "exporta els valors de confian癟a" #: g10/g10.c:371 msgid "import ownertrust values" -msgstr "importa els valors de confian嚙窮" +msgstr "importa els valors de confian癟a" #: g10/g10.c:373 msgid "update the trust database" -msgstr "actualitza la base de dades de confian嚙窮" +msgstr "actualitza la base de dades de confian癟a" #: g10/g10.c:375 msgid "unattended trust database update" -msgstr "actualitzaci嚙 no atesa de la base de dades de confian嚙窮" +msgstr "actualitzaci籀 no atesa de la base de dades de confian癟a" #: g10/g10.c:376 msgid "fix a corrupted trust database" -msgstr "arregla una base de dades de confian嚙窮 corrompuda" +msgstr "arregla una base de dades de confian癟a corrompuda" #: g10/g10.c:377 msgid "De-Armor a file or stdin" @@ -626,24 +619,24 @@ msgstr "usa aquest id per a signar o des #: g10/g10.c:401 msgid "|N|set compress level N (0 disables)" -msgstr "|N|nivell de compressi嚙 N (0 no comprimeix)" +msgstr "|N|nivell de compressi籀 N (0 no comprimeix)" #: g10/g10.c:404 msgid "use canonical text mode" -msgstr "usa el mode de text can嚙緯ic" +msgstr "usa el mode de text can簷nic" #: g10/g10.c:414 msgid "use as output file" msgstr "fitxer d'eixida" -# Un dels dos 嚙編 en la llista d'opcions amb --help. Urgh. jm +# Un dels dos 矇s en la llista d'opcions amb --help. Urgh. jm #: g10/g10.c:416 g10/gpgv.c:66 msgid "verbose" msgstr "detall" #: g10/g10.c:417 g10/gpgv.c:67 msgid "be somewhat more quiet" -msgstr "una mica m嚙編 silenci嚙編" +msgstr "una mica m矇s silenci籀s" #: g10/g10.c:418 msgid "don't use the terminal at all" @@ -651,19 +644,19 @@ msgstr "no usa el terminal en absolut" #: g10/g10.c:419 msgid "force v3 signatures" -msgstr "for嚙窮 signatures v3" +msgstr "for癟a signatures v3" #: g10/g10.c:420 msgid "do not force v3 signatures" -msgstr "no for嚙窮 signatures v3" +msgstr "no for癟a signatures v3" #: g10/g10.c:421 msgid "force v4 key signatures" -msgstr "for嚙窮 signatures de clau v4" +msgstr "for癟a signatures de clau v4" #: g10/g10.c:422 msgid "do not force v4 key signatures" -msgstr "no for嚙窮 signatures de clau v4" +msgstr "no for癟a signatures de clau v4" #: g10/g10.c:423 msgid "always use a MDC for encryption" @@ -685,18 +678,18 @@ msgstr "pregunta abans de sobreescriure" msgid "use the gpg-agent" msgstr "utilitza el gpg-agent" -# Mode desat嚙編 (SC) ivb +# Mode desat癡s (SC) ivb #: g10/g10.c:432 msgid "batch mode: never ask" -msgstr "mode desat嚙編: no pregunta mai" +msgstr "mode desat癡s: no pregunta mai" #: g10/g10.c:433 msgid "assume yes on most questions" -msgstr "suposa 嚙編嚙踝蕭 en la majoria de les preguntes" +msgstr "suposa 竄s穩罈 en la majoria de les preguntes" #: g10/g10.c:434 msgid "assume no on most questions" -msgstr "suposa 嚙緯o嚙 en la majoria de les preguntes" +msgstr "suposa 竄no罈 en la majoria de les preguntes" #: g10/g10.c:435 msgid "add this keyring to the list of keyrings" @@ -708,7 +701,7 @@ msgstr "afegeix aquest anell secret a la #: g10/g10.c:437 msgid "show which keyring a listed key is on" -msgstr "mostra en quin anell de claus est嚙 una clau llistada" +msgstr "mostra en quin anell de claus est una clau llistada" #: g10/g10.c:438 msgid "|NAME|use NAME as default secret key" @@ -720,7 +713,7 @@ msgstr "|HOST|usa aquest servidor per a #: g10/g10.c:443 msgid "|NAME|set terminal charset to NAME" -msgstr "|NOM|el joc de car嚙箱ters ser嚙 NOM" +msgstr "|NOM|el joc de carcters ser NOM" #: g10/g10.c:445 msgid "read options from file" @@ -728,11 +721,11 @@ msgstr "llig opcions del fitxer" #: g10/g10.c:449 g10/gpgv.c:71 msgid "|FD|write status info to this FD" -msgstr "|FD|escriu informaci嚙 d'estat en aquest FD" +msgstr "|FD|escriu informaci籀 d'estat en aquest FD" #: g10/g10.c:451 msgid "|[file]|write status info to file" -msgstr "|fitxer|escriu informaci嚙 d'estat en un fitxer" +msgstr "|fitxer|escriu informaci籀 d'estat en un fitxer" #: g10/g10.c:463 msgid "|KEYID|ultimately trust this key" @@ -740,7 +733,7 @@ msgstr "|IDCLAU|confia absolutament en a #: g10/g10.c:464 msgid "|FILE|load extension module FILE" -msgstr "|FITXER|carrega el m嚙範ul d'extensi嚙 especificat" +msgstr "|FITXER|carrega el m簷dul d'extensi籀 especificat" #: g10/g10.c:470 msgid "emulate the mode described in RFC1991" @@ -780,7 +773,7 @@ msgstr "|NOM|usa l'algoritme de resum de #: g10/g10.c:486 msgid "|N|use compress algorithm N" -msgstr "|N|usa l'algoritme de compressi嚙 N" +msgstr "|N|usa l'algoritme de compressi籀 N" # elimina o descarta? jm #: g10/g10.c:487 @@ -788,32 +781,32 @@ msgid "throw keyid field of encrypted pa msgstr "descarta el camp keyid dels paquets xifrats" # Werner FIXME: uncapitalize -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "mostra els Photo ID" # Werner FIXME: uncapitalize -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "no mostra els Photo ID" # Werner FIXME: uncapitalize -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "fixa l'ordre per a veure Photo ID" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" "@\n" -"(En la p嚙篇ina del man hi ha una llista completa d'ordres i d'opcions)\n" +"(En la pgina del man hi ha una llista completa d'ordres i d'opcions)\n" -# Crec q (A)lice (orig.), (B)ob (dest.), etc. s嚙緯 noms usats pel Zimmerman +# 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嚙編 endavant. Els deixe com a l'original. jm -#: g10/g10.c:500 +# En efecte. Idem per a Mallory m矇s endavant. Els deixe com a l'original. jm +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -833,15 +826,15 @@ msgstr "" " --list-keys [noms] mostra claus\n" " --fingerprint [noms] mostra empremtes digitals\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Si us plau, informeu sobre els errors a .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" -msgstr "Forma d'嚙編: gpg [opcions] [fitxers] (-h per a veure l'ajuda)" +msgstr "Forma d'繳s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -849,14 +842,14 @@ msgid "" msgstr "" "Sintaxi: gpg [opcions] [fitxers]\n" "signa, comprova, xifra o desxifra\n" -"l'operaci嚙 predeterminada dep嚙緯 de les dades introdu嚙範es\n" +"l'operaci籀 predeterminada dep矇n de les dades introdu簿des\n" # Suportats? ivb -# A Softcatal嚙 diuen molt 嚙箠mplementat?. jm -# Precissament acabem de parlar d'嚙箠mplementat a la llista del GNOME -# i s'ha dit que 嚙編 erroni, igual que 嚙編uportat嚙 :) Les alternatives +# A Softcatal diuen molt 竄implementat罈. jm +# 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/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -864,407 +857,398 @@ msgstr "" "\n" "Algoritmes suportats:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " -msgstr "Clau p嚙箭lica: " +msgstr "Clau p繳blica: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Xifratge: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " -msgstr "Dispersi嚙: " +msgstr "Dispersi籀: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " -msgstr "Compressi嚙: " +msgstr "Compressi籀: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " -msgstr "forma d'嚙編: gpg [opcions] " +msgstr "forma d'繳s: gpg [opcions] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "les ordres entren en conflicte\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" -msgstr "no s'ha trobat cap signe = en la definici嚙 de grup 嚙%s嚙穀n" +msgstr "no s'ha trobat cap signe = en la definici籀 de grup 竄%s罈\n" # Indi. ivb -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" -msgstr "AV嚙磅: el propietari 嚙編 insegur en %s 嚙%s嚙穀n" +msgstr "AVS: el propietari 矇s insegur en %s 竄%s罈\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" -msgstr "AV嚙磅: els permissos s嚙緯 insegurs en %s 嚙%s嚙穀n" +msgstr "AVS: els permissos s籀n insegurs en %s 竄%s罈\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" -msgstr "" -"AV嚙磅: el propietari del directori envoltant 嚙編 insegur en %s 嚙%s嚙穀n" +msgstr "AVS: el propietari del directori envoltant 矇s insegur en %s 竄%s罈\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" -msgstr "" -"AV嚙磅: els permissos del directori envoltant s嚙緯 insegurs en %s 嚙%s嚙穀n" +msgstr "AVS: els permissos del directori envoltant s籀n insegurs en %s 竄%s罈\n" -#: g10/g10.c:1223 -#, fuzzy, c-format +#: g10/g10.c:1224 +#, c-format msgid "unknown configuration item \"%s\"\n" -msgstr "s'ha creat el nou fitxer d'opcions 嚙%s嚙穀n" +msgstr "l'element de configuraci籀 竄%s罈 矇s desconegut\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" -msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic 嚙%s嚙穀n" +msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic 竄%s罈\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" -msgstr "NOTA: no existeix el fitxer d'opcions predeterminades 嚙%s嚙穀n" +msgstr "NOTA: no existeix el fitxer d'opcions predeterminades 竄%s罈\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" -msgstr "fitxer d'opcions 嚙%s嚙: %s\n" +msgstr "fitxer d'opcions 竄%s罈: %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" -msgstr "s'estan llegint opcions de 嚙%s嚙穀n" +msgstr "s'estan llegint opcions de 竄%s罈\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -"la extensi嚙 de xifrat 嚙%s嚙 no s'ha carregat per tindre permissos " -"insegurs\n" +"la extensi籀 de xifrat 竄%s罈 no s'ha carregat per tindre permissos insegurs\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" -msgstr "%s no 嚙編 un joc de car嚙箱ters v嚙締id\n" +msgstr "%s no 矇s un joc de carcters vlid\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" -msgstr "" -"no s'ha pogut analitzar sint嚙箱ticament la URI del servidor de claus\n" +msgstr "no s'ha pogut analitzar sintcticament la URI del servidor de claus\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" -msgstr "%s:%d: opcions d'importanci嚙 no v嚙締ides\n" +msgstr "%s:%d: opcions d'importanci籀 no vlides\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" -msgstr "opcions d'importaci嚙 no v嚙締ides\n" +msgstr "opcions d'importaci籀 no vlides\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" -msgstr "%s:%d opcions d'exportaci嚙 no v嚙締ides\n" +msgstr "%s:%d opcions d'exportaci籀 no vlides\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" -msgstr "opcions d'exportaci嚙 no v嚙締ides\n" +msgstr "opcions d'exportaci籀 no vlides\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "no s'ha pogut fixar l'exec-path a %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" -msgstr "AV嚙磅: el programa podria crear un fitxer core!\n" +msgstr "AVS: el programa podria crear un fitxer core!\n" -# FIXME: prefer嚙緯cia? jm -# Ho discut嚙緝em en la llista, segur. Deu ser als arxius. ivb -#: g10/g10.c:2036 +# FIXME: prefer癡ncia? jm +# Ho discut穩rem en la llista, segur. Deu ser als arxius. ivb +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" -msgstr "AV嚙磅: %s t嚙 prefer嚙緯cia sobre %s\n" +msgstr "AVS: %s t矇 prefer癡ncia sobre %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" -msgstr "NOTA: %s no 嚙編 per a 嚙編 normal!\n" +msgstr "NOTA: %s no 矇s per a 繳s normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" -msgstr "%s no 嚙編 perm嚙編 amb %s!\n" +msgstr "%s no 矇s perm矇s amb %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" -msgstr "%s no t嚙 sentit amb %s!\n" +msgstr "%s no t矇 sentit amb %s!\n" # clares -> en clar? ivb -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" -msgstr "nom嚙編 podeu fer signatures separades o en clar en el mode --pgp2\n" +msgstr "nom矇s podeu fer signatures separades o en clar en el mode --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 " "habilitat.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 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/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" -msgstr "l'algorisme de xifratge triat no 嚙編 v嚙締id\n" +msgstr "l'algorisme de xifratge triat no 矇s vlid\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" -msgstr "l'algorisme de resum seleccionat no 嚙編 v嚙締id\n" +msgstr "l'algorisme de resum seleccionat no 矇s vlid\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" -msgstr "l'algorisme de resum de certificaci嚙 seleccionat no 嚙編 v嚙締id\n" +msgstr "l'algorisme de resum de certificaci籀 seleccionat no 矇s vlid\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" -msgstr "" -"l'algorisme de compressi嚙 嚙%s嚙 es de nom嚙編 lectura en aquesta " -"versi嚙穀n" +msgstr "l'algorisme de compressi籀 竄%s罈 es de nom矇s lectura en aquesta versi籀\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" -msgstr "l'algoritme de compressi嚙 ha d'estar en l'interval %d..%d\n" +msgstr "l'algoritme de compressi籀 ha d'estar en l'interval %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ha de ser major que 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ha de ser major que 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n" -#: g10/g10.c:2201 -#, fuzzy +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" -msgstr "default-check-level 嚙編 inv嚙締id; ha de ser 0, 1, 2 o 3\n" +msgstr "default-cert-level 矇s invlid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2203 -#, fuzzy +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" -msgstr "default-check-level 嚙編 inv嚙締id; ha de ser 0, 1, 2 o 3\n" +msgstr "min-cert-level 矇s invlid; ha de ser 1, 2 o 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "NOTA: el mode S2K simple (0) no 嚙編 gens recomanable\n" +msgstr "NOTA: el mode S2K simple (0) no 矇s gens recomanable\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" -msgstr "el mode S2K 嚙編 inv嚙締id; ha de ser 0, 1 o 3\n" +msgstr "el mode S2K 矇s invlid; ha de ser 0, 1 o 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" -msgstr "les prefer嚙緯cies per defecte s嚙緯 inv嚙締ides\n" +msgstr "les prefer癡ncies per defecte s籀n invlides\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" -msgstr "les prefer嚙緯cies personals de xifrat s嚙緯 inv嚙締ides\n" +msgstr "les prefer癡ncies personals de xifrat s籀n invlides\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" -msgstr "les prefer嚙緯cies personals de digest s嚙緯 inv嚙締ides\n" +msgstr "les prefer癡ncies personals de digest s籀n invlides\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" -msgstr "les prefer嚙緯cies personals de compressi嚙 s嚙緯 inv嚙締ides\n" +msgstr "les prefer癡ncies personals de compressi籀 s籀n invlides\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s encara no funciona amb %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" -msgstr "" -"no podeu usar l'algorisme de xifratge 嚙%s嚙 mentre esteu en mode %s\n" +msgstr "no podeu usar l'algorisme de xifratge 竄%s罈 mentre esteu en mode %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" -msgstr "no podeu usar l'algorisme de compressi嚙 %s mentre esteu en mode %s\n" +msgstr "no podeu usar l'algorisme de compressi籀 %s mentre esteu en mode %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" -msgstr "no s'ha pogut inicialitzar la base de dades de confian嚙窮: %s\n" +msgstr "no s'ha pogut inicialitzar la base de dades de confian癟a: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -"AV嚙磅: s'han donat destinataris (-r) sense usar xifratge de clau p嚙箭lica\n" +"AVS: s'han donat destinataris (-r) sense usar xifratge de clau p繳blica\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nom_del_fitxer]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nom_del_fitxer]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nom_del_fitxer]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nom_del_fitxer]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom_del_fitxer]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nom_del_fitxer]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nom_del_fitxer]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [ordres]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "no s'ha pogut obrir %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [anell]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'enviament al servidor de claus ha fallat: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" -msgstr "la recepci嚙 des del servidor de claus ha fallat: %s\n" +msgstr "la recepci籀 des del servidor de claus ha fallat: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" -msgstr "l'exportaci嚙 de la clau ha fallat: %s\n" +msgstr "l'exportaci籀 de la clau ha fallat: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "ha fallat la cerca al servidor de claus: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "ha fallat el refresc des del servidor de claus: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "no s'ha pogut llevar l'armadura: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" -msgstr "l'algoritme de dispersi嚙 嚙編 inv嚙締id 嚙%s嚙穀n" +msgstr "l'algoritme de dispersi籀 矇s invlid 竄%s罈\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nom_del_fitxer]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Endavant, escriviu el missatge...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" -msgstr "no s'ha pogut obrir 嚙%s嚙穀n" +msgstr "no s'ha pogut obrir 竄%s罈\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -"un nom de notaci嚙 nom嚙編 pot tenir car嚙箱ters imprimibles o espais i " -"acabar amb el signe 嚙=嚙穀n" +"un nom de notaci籀 nom矇s pot tenir carcters imprimibles o espais i acabar " +"amb el signe 竄=罈\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" -msgstr "un nom de notaci嚙 d'usuari no pot contenir el car嚙箱ter 嚙瑾嚙穀n" +msgstr "un nom de notaci籀 d'usuari no pot contenir el carcter 竄@罈\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" -msgstr "un valor de notaci嚙 no pot utilitzar cap car嚙箱ter de control\n" +msgstr "un valor de notaci籀 no pot utilitzar cap carcter de control\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" -msgstr "la URL de pol嚙緣ica de certificaci嚙 donada no 嚙編 v嚙締ida\n" +msgstr "la URL de pol穩tica de certificaci籀 donada no 矇s vlida\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" -msgstr "la URL de pol嚙緣ica de signatura donada no 嚙編 v嚙締ida\n" +msgstr "la URL de pol穩tica de signatura donada no 矇s vlida\n" #: g10/gpgv.c:68 msgid "take the keys from this keyring" @@ -1272,20 +1256,20 @@ msgstr "pren les claus d'aquest anell" #: g10/gpgv.c:70 msgid "make timestamp conflicts only a warning" -msgstr "fes els conflictes de marques de temps nom嚙編 un av嚙編" +msgstr "fes els conflictes de marques de temps nom矇s un av穩s" #: g10/gpgv.c:99 msgid "Usage: gpgv [options] [files] (-h for help)" -msgstr "Forma d'嚙編: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)" +msgstr "Forma d'繳s: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)" -# Werner FIXME: should it use 嚙磊sage嚙? +# Werner FIXME: should it use 竄Usage罈? #: g10/gpgv.c:102 msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "Sintaxi: gpg [opcions] [fitxers]\n" -"Comprova signatures amb claus conegudes amb confian嚙窮\n" +"Comprova signatures amb claus conegudes amb confian癟a\n" #: g10/armor.c:321 #, c-format @@ -1294,25 +1278,25 @@ msgstr "armadura: %s\n" #: g10/armor.c:350 msgid "invalid armor header: " -msgstr "la cap嚙窮lera d'armadura 嚙編 inv嚙締ida: " +msgstr "la cap癟alera d'armadura 矇s invlida: " #: g10/armor.c:357 msgid "armor header: " -msgstr "cap嚙窮lera d'armadura: " +msgstr "cap癟alera d'armadura: " #: g10/armor.c:368 msgid "invalid clearsig header\n" -msgstr "la cap嚙窮lera de signatura clara 嚙編 inv嚙締ida\n" +msgstr "la cap癟alera de signatura clara 矇s invlida\n" -# 嚙編 un missatge d'error? ivb -# 嚙璀nidada嚙 嚙編 un castellanisme. Niuades? Imbricades (SC)?? ivb +# s un missatge d'error? ivb +# 竄Anidada罈 矇s un castellanisme. Niuades? Imbricades (SC)?? ivb #: g10/armor.c:420 msgid "nested clear text signatures\n" msgstr "signatures en text pla imbricades\n" #: g10/armor.c:544 msgid "invalid dash escaped line: " -msgstr "la l嚙緯ia escapada amb gui嚙 嚙編 inv嚙締ida: " +msgstr "la l穩nia escapada amb gui籀 矇s invlida: " # FIXME: un-indiar. jm #: g10/armor.c:556 @@ -1322,7 +1306,7 @@ msgstr "armadura inesperada:" #: g10/armor.c:682 g10/armor.c:1258 #, c-format msgid "invalid radix64 character %02x skipped\n" -msgstr "el car嚙箱ter radix64 %02x inv嚙締id s'ha om嚙編\n" +msgstr "el carcter radix64 %02x invlid s'ha om矇s\n" #: g10/armor.c:725 msgid "premature eof (no CRC)\n" @@ -1343,36 +1327,35 @@ msgstr "error de CRC; %06lx - %06lx\n" #: g10/armor.c:787 msgid "premature eof (in Trailer)\n" -msgstr "f嚙 de fitxer prematur (al final)\n" +msgstr "f穩 de fitxer prematur (al final)\n" #: g10/armor.c:791 msgid "error in trailer line\n" -msgstr "error en l'嚙締tima l嚙緯ia\n" +msgstr "error en l'繳ltima l穩nia\n" #: g10/armor.c:1073 msgid "no valid OpenPGP data found.\n" -msgstr "no s'han trobat dades OpenPGP v嚙締ides.\n" +msgstr "no s'han trobat dades OpenPGP vlides.\n" #: g10/armor.c:1078 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "" -"l'armadura 嚙編 inv嚙締ida: la l嚙緯ia 嚙編 m嚙編 llarga que %d car嚙箱ters\n" +msgstr "l'armadura 矇s invlida: la l穩nia 矇s m矇s llarga que %d carcters\n" #: g10/armor.c:1082 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -"hi ha un car嚙箱ter 嚙緬uoted printable嚙 en l'armadura - probablement s'ha " +"hi ha un carcter 竄quoted printable罈 en l'armadura - probablement s'ha " "utilitzat un MTA amb errors\n" #: g10/pkclist.c:63 g10/revoke.c:603 msgid "No reason specified" -msgstr "No s'ha especificat cap ra嚙" +msgstr "No s'ha especificat cap ra籀" #: g10/pkclist.c:65 g10/revoke.c:605 msgid "Key is superseded" -msgstr "La clau ha estat substitu嚙範a" +msgstr "La clau ha estat substitu簿da" #: g10/pkclist.c:67 g10/revoke.c:604 msgid "Key has been compromised" @@ -1384,17 +1367,16 @@ msgstr "La clau ja no s'usa" #: g10/pkclist.c:71 g10/revoke.c:607 msgid "User ID is no longer valid" -msgstr "L'ID d'usuari ja no 嚙編 v嚙締id" +msgstr "L'ID d'usuari ja no 矇s vlid" #: g10/pkclist.c:75 msgid "reason for revocation: " -msgstr "ra嚙 de la revocaci嚙: " +msgstr "ra籀 de la revocaci籀: " #: g10/pkclist.c:92 msgid "revocation comment: " -msgstr "comentari de la revocaci嚙: " +msgstr "comentari de la revocaci籀: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMxXoO" @@ -1405,7 +1387,7 @@ msgid "" "No trust value assigned to:\n" "%4u%c/%08lX %s \"" msgstr "" -"No hi ha cap valor de confian嚙窮 assignat a:\n" +"No hi ha cap valor de confian癟a assignat a:\n" "%4u%c/%08lX %s \"" #: g10/pkclist.c:290 g10/mainproc.c:1503 @@ -1426,7 +1408,7 @@ msgstr "" #: g10/pkclist.c:305 #, c-format msgid " %d = Don't know\n" -msgstr " %d = No ho s嚙穀n" +msgstr " %d = No ho s矇\n" #: g10/pkclist.c:306 #, c-format @@ -1448,14 +1430,13 @@ msgstr " %d = Hi confie plenament\n" msgid " %d = I trust ultimately\n" msgstr " %d = Hi confie absolutament\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" -msgstr " i = mostra m嚙編 informaci嚙穀n" +msgstr " i = mostra m矇s informaci籀\n" #: g10/pkclist.c:316 msgid " m = back to the main menu\n" -msgstr " m = torna al men嚙 principal\n" +msgstr " m = torna al men繳 principal\n" #: g10/pkclist.c:319 msgid " s = skip this key\n" @@ -1467,15 +1448,15 @@ msgstr " x = ix\n" #: g10/pkclist.c:327 g10/revoke.c:632 msgid "Your decision? " -msgstr "La vostra decisi嚙? " +msgstr "La vostra decisi籀? " #: g10/pkclist.c:348 msgid "Do you really want to set this key to ultimate trust? " -msgstr "Realment voleu assignar confian嚙窮 absoluta a aquesta clau? " +msgstr "Realment voleu assignar confian癟a absoluta a aquesta clau? " #: g10/pkclist.c:362 msgid "Certificates leading to an ultimately trusted key:\n" -msgstr "Certificats que duen a una clau de confian嚙窮 absoluta:\n" +msgstr "Certificats que duen a una clau de confian癟a absoluta:\n" #: g10/pkclist.c:437 #, c-format @@ -1506,7 +1487,7 @@ msgstr "" #: g10/pkclist.c:486 #, c-format msgid "%08lX: We do NOT trust this key\n" -msgstr "%08lX: La clau NO 嚙編 de confian嚙窮\n" +msgstr "%08lX: La clau NO 矇s de confian癟a\n" #: g10/pkclist.c:492 #, c-format @@ -1515,7 +1496,7 @@ msgid "" "but it is accepted anyway\n" msgstr "" "%08lX: No hi ha garanties que aquesta clau pertanya realment al seu\n" -"propietari per嚙 s'accepta de tota manera\n" +"propietari per簷 s'accepta de tota manera\n" #: g10/pkclist.c:498 msgid "This key probably belongs to the owner\n" @@ -1523,7 +1504,7 @@ msgstr "Aquesta clau pertany probablemen #: g10/pkclist.c:503 msgid "This key belongs to us\n" -msgstr "Aquesta clau 嚙編 nostra\n" +msgstr "Aquesta clau 矇s nostra\n" #: g10/pkclist.c:551 msgid "" @@ -1532,38 +1513,36 @@ msgid "" "you may answer the next question with yes\n" "\n" msgstr "" -"NO 嚙編 segur que la clau pertanya a la persona esmentada en\n" -"l'ID d'usuari. Si *realment* sabeu qu嚙 feu, podeu respondre\n" -"嚙編嚙踝蕭 a la seg嚙箴nt pregunta\n" +"NO 矇s segur que la clau pertanya a la persona esmentada en\n" +"l'ID d'usuari. Si *realment* sabeu qu癡 feu, podeu respondre\n" +"竄s穩罈 a la seg羹ent pregunta\n" "\n" #: g10/pkclist.c:565 g10/pkclist.c:595 msgid "WARNING: Using untrusted key!\n" -msgstr "AV嚙磅: S'est嚙 usant una clau no fiable!\n" +msgstr "AVS: S'est usant una clau no fiable!\n" #: g10/pkclist.c:602 -#, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" -"AV嚙磅: la clau %08lX pot estar revocada: la clau de revocaci嚙 %08lX no " -"est嚙 present.\n" +"AVS: aquesta clau pot estar revocada (la clau de revocaci籀 no est " +"present)\n" #: g10/pkclist.c:611 -#, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "AV嚙磅: Aquesta clau ha estat revocada pel propietari!\n" +msgstr "AVS: Aquesta clau ha estat revocada pel revocador designat!\n" #: g10/pkclist.c:614 msgid "WARNING: This key has been revoked by its owner!\n" -msgstr "AV嚙磅: Aquesta clau ha estat revocada pel propietari!\n" +msgstr "AVS: Aquesta clau ha estat revocada pel propietari!\n" #: g10/pkclist.c:615 msgid " This could mean that the signature is forgery.\n" -msgstr " A嚙踝蕭 podria significar que la signatura 嚙編 falsificada.\n" +msgstr " A癟簷 podria significar que la signatura 矇s falsificada.\n" #: g10/pkclist.c:621 msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "AV嚙磅: Aquesta subclau ha estat revocada pel propietari!\n" +msgstr "AVS: Aquesta subclau ha estat revocada pel propietari!\n" #: g10/pkclist.c:626 msgid "Note: This key has been disabled.\n" @@ -1575,8 +1554,7 @@ msgstr "Nota: La clau ha caducat!\n" #: g10/pkclist.c:642 msgid "WARNING: This key is not certified with a trusted signature!\n" -msgstr "" -"AV嚙磅: Aquesta clau no ve certificada per una signatura de confian嚙窮!\n" +msgstr "AVS: Aquesta clau no ve certificada per una signatura de confian癟a!\n" #: g10/pkclist.c:644 msgid "" @@ -1586,20 +1564,20 @@ msgstr "" #: g10/pkclist.c:652 msgid "WARNING: We do NOT trust this key!\n" -msgstr "AV嚙磅: La clau NO 嚙編 de confian嚙窮!\n" +msgstr "AVS: La clau NO 矇s de confian癟a!\n" #: g10/pkclist.c:653 msgid " The signature is probably a FORGERY.\n" -msgstr " Probablement la signatura 嚙編 FALSA.\n" +msgstr " Probablement la signatura 矇s FALSA.\n" #: g10/pkclist.c:661 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -msgstr "AV嚙磅: Aquesta clau no ve certificada per signatures prou fiables!\n" +msgstr "AVS: Aquesta clau no ve certificada per signatures prou fiables!\n" #: g10/pkclist.c:663 msgid " It is not certain that the signature belongs to the owner.\n" -msgstr "No 嚙編 segur que la signatura pertanya al seu propietari.\n" +msgstr "No 矇s segur que la signatura pertanya al seu propietari.\n" #: g10/pkclist.c:817 g10/pkclist.c:841 g10/pkclist.c:999 g10/pkclist.c:1059 #, c-format @@ -1609,11 +1587,11 @@ msgstr "%s: es descarta: %s\n" #: g10/pkclist.c:827 g10/pkclist.c:1031 #, c-format msgid "%s: skipped: public key already present\n" -msgstr "%s: es descarta: la clau p嚙箭lica ja est嚙 present\n" +msgstr "%s: es descarta: la clau p繳blica ja est present\n" #: g10/pkclist.c:858 msgid "You did not specify a user ID. (you may use \"-r\")\n" -msgstr "No heu especificat un ID d'usuari. (podeu usar 嚙-r嚙)\n" +msgstr "No heu especificat un ID d'usuari. (podeu usar 竄-r罈)\n" #: g10/pkclist.c:871 msgid "" @@ -1621,7 +1599,7 @@ msgid "" "Enter the user ID. End with an empty line: " msgstr "" "\n" -"Introdu嚙線 l'ID d'usuari. Finalitzeu amb una l嚙緯ia en blanc: " +"Introdu簿u l'ID d'usuari. Finalitzeu amb una l穩nia en blanc: " #: g10/pkclist.c:887 msgid "No such user ID.\n" @@ -1629,65 +1607,65 @@ msgstr "Usuari inexistent.\n" #: g10/pkclist.c:892 g10/pkclist.c:974 msgid "skipped: public key already set as default recipient\n" -msgstr "es descarta: la clau p嚙箭lica ja s'ha especificat com a destinatari\n" +msgstr "es descarta: la clau p繳blica ja s'ha especificat com a destinatari\n" #: g10/pkclist.c:910 msgid "Public key is disabled.\n" -msgstr "La clau p嚙箭lica est嚙 desactivada.\n" +msgstr "La clau p繳blica est desactivada.\n" #: g10/pkclist.c:917 msgid "skipped: public key already set\n" -msgstr "es descarta: la clau p嚙箭lica ja est嚙 establida\n" +msgstr "es descarta: la clau p繳blica ja est establida\n" #: g10/pkclist.c:966 #, c-format msgid "unknown default recipient `%s'\n" -msgstr "el destinatari predeterminat 嚙編 desconegut 嚙%s嚙穀n" +msgstr "el destinatari predeterminat 矇s desconegut 竄%s罈\n" #: g10/pkclist.c:1011 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: es descarta: la clau p嚙箭lica est嚙 desactivada\n" +msgstr "%s: es descarta: la clau p繳blica est desactivada\n" #: g10/pkclist.c:1066 msgid "no valid addressees\n" -msgstr "no hi ha adreces v嚙締ides\n" +msgstr "no hi ha adreces vlides\n" #: g10/keygen.c:198 #, c-format msgid "preference %c%lu is not valid\n" -msgstr "la prefer嚙緯cia %c%lu no 嚙編 v嚙締ida\n" +msgstr "la prefer癡ncia %c%lu no 矇s vlida\n" #: g10/keygen.c:205 #, c-format msgid "preference %c%lu duplicated\n" -msgstr "la prefer嚙緯cia %c%lu 嚙編 duplicada\n" +msgstr "la prefer癡ncia %c%lu 矇s duplicada\n" #: g10/keygen.c:210 #, c-format msgid "too many `%c' preferences\n" -msgstr "hi ha massa prefer嚙緯cies 嚙%c嚙穀n" +msgstr "hi ha massa prefer癡ncies 竄%c罈\n" #: g10/keygen.c:280 msgid "invalid character in preference string\n" -msgstr "hi ha un car嚙箱ter inv嚙締id en la cadena de prefer嚙緯cia\n" +msgstr "hi ha un carcter invlid en la cadena de prefer癡ncia\n" #: g10/keygen.c:638 msgid "writing direct signature\n" -msgstr "s'est嚙 escrivint una signatura directa\n" +msgstr "s'est escrivint una signatura directa\n" #: g10/keygen.c:677 msgid "writing self signature\n" -msgstr "s'est嚙 escrivint l'autosignatura\n" +msgstr "s'est escrivint l'autosignatura\n" #: g10/keygen.c:723 msgid "writing key binding signature\n" -msgstr "s'est嚙 escrivint la signatura de comprovaci嚙 de la clau\n" +msgstr "s'est escrivint la signatura de comprovaci籀 de la clau\n" #: g10/keygen.c:785 g10/keygen.c:869 g10/keygen.c:960 #, c-format msgid "keysize invalid; using %u bits\n" -msgstr "la mida de la clau 嚙編 inv嚙締ida; s'hi usaran %u bits\n" +msgstr "la mida de la clau 矇s invlida; s'hi usaran %u bits\n" #: g10/keygen.c:790 g10/keygen.c:874 g10/keygen.c:965 #, c-format @@ -1706,22 +1684,22 @@ msgstr " (%d) DSA i ElGamal (predeterm #: g10/keygen.c:1068 #, c-format msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (nom嚙編 signar)\n" +msgstr " (%d) DSA (nom矇s signar)\n" #: g10/keygen.c:1070 #, c-format msgid " (%d) ElGamal (encrypt only)\n" -msgstr " (%d) ElGamal (nom嚙編 xifrar)\n" +msgstr " (%d) ElGamal (nom矇s xifrar)\n" #: g10/keygen.c:1071 #, c-format msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (nom嚙編 signar)\n" +msgstr " (%d) RSA (nom矇s signar)\n" #: g10/keygen.c:1073 #, c-format msgid " (%d) RSA (encrypt only)\n" -msgstr " (%d) RSA (nom嚙編 xifrar)\n" +msgstr " (%d) RSA (nom矇s xifrar)\n" #: g10/keygen.c:1075 #, c-format @@ -1734,7 +1712,7 @@ msgstr "Seleccioneu: " #: g10/keygen.c:1112 g10/keyedit.c:682 g10/revoke.c:665 msgid "Invalid selection.\n" -msgstr "La selecci嚙 嚙編 inv嚙締ida.\n" +msgstr "La selecci籀 矇s invlida.\n" #: g10/keygen.c:1125 #, c-format @@ -1745,66 +1723,57 @@ msgid "" " highest suggested keysize is 2048 bits\n" msgstr "" "Preparat per a generar un nou parell de claus %s.\n" -" grand嚙緝ia m嚙緯ima: 768 bits\n" -" grand嚙緝ia predeterminada: 1024 bits\n" -" grand嚙緝ia m嚙綞ima aconsellada: 2048 bits\n" +" grandria m穩nima: 768 bits\n" +" grandria predeterminada: 1024 bits\n" +" grandria mxima aconsellada: 2048 bits\n" #: g10/keygen.c:1134 msgid "What keysize do you want? (1024) " -msgstr "Quina grand嚙緝ia voleu? (1024) " +msgstr "Quina grandria voleu? (1024) " #: g10/keygen.c:1139 msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA nom嚙編 permet claus entre 512 i 1024 bits\n" +msgstr "DSA nom矇s permet claus entre 512 i 1024 bits\n" #: g10/keygen.c:1141 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "" -"la clau 嚙編 massa petita; 1024 bits ?s el m嚙緯im perm嚙編 per a claus " -"RSA.\n" +"la clau 矇s massa petita; 1024 bits 矇s el m穩nim perm矇s per a claus RSA.\n" #: g10/keygen.c:1144 msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "la clau 嚙編 massa petita; 768 bits 嚙編 el m嚙緯im perm嚙編.\n" +msgstr "la clau 矇s massa petita; 768 bits 矇s el m穩nim perm矇s.\n" # Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons. ivb -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "la clau 嚙編 massa llarga; %d 嚙編 el m嚙綞im perm嚙編.\n" +msgstr "la clau 矇s massa llarga; %d 矇s el mxim perm矇s.\n" #: g10/keygen.c:1160 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -"No es recomanen claus m嚙編 llargues de 2048 bits perqu嚙穀n" -"els c嚙締culs s嚙緯 VERITABLEMENT llargs!\n" +"No es recomanen claus m矇s llargues de 2048 bits perqu癡\n" +"els clculs s籀n VERITABLEMENT llargs!\n" #: g10/keygen.c:1163 msgid "Are you sure that you want this keysize? " -msgstr "Segur que voleu aquesta grand嚙緝ia? " +msgstr "Segur que voleu aquesta grandria? " #: g10/keygen.c:1164 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" msgstr "" -"D'acord, per嚙 sapieu que la radiaci嚙 del monitor i del teclat tamb嚙 " -"son molt vulnerables als atacs!\n" +"D'acord, per簷 sapieu que la radiaci籀 del monitor i del teclat tamb矇 son molt " +"vulnerables als atacs!\n" #: g10/keygen.c:1173 #, c-format msgid "Requested keysize is %u bits\n" -msgstr "La grand嚙緝ia sol嚙締icitada 嚙編 %u bits\n" +msgstr "La grandria sol繚licitada 矇s %u bits\n" #: g10/keygen.c:1176 g10/keygen.c:1180 #, c-format @@ -1853,32 +1822,31 @@ msgstr "Indiqueu la validesa de la signa #: g10/keygen.c:1269 msgid "invalid value\n" -msgstr "el valor no 嚙編 v嚙締id\n" +msgstr "el valor no 矇s vlid\n" #: g10/keygen.c:1274 #, c-format msgid "%s does not expire at all\n" msgstr "%s no caduca en absolut\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca el %s\n" -# Amb 嚙箠t嚙 es refereix a les dates? ivb -# Aix嚙 vaig entendre jo. jm +# Amb 竄it罈 es refereix a les dates? ivb +# Aix簷 vaig entendre jo. jm #: g10/keygen.c:1287 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" "El vostre sistema no pot representar dates posteriors a l'any 2038.\n" -"Tanmateix, les tractar嚙 b嚙 fins l'any 2106.\n" +"Tanmateix, les tractar b矇 fins l'any 2106.\n" #: g10/keygen.c:1292 msgid "Is this correct (y/n)? " -msgstr "嚙編 correcte? (s/n)" +msgstr "s correcte? (s/n)" #: g10/keygen.c:1335 msgid "" @@ -1891,7 +1859,7 @@ msgid "" msgstr "" "\n" "Necessiteu un ID d'usuari per a identificar la vostra clau; el programa\n" -"construeix l'id de l'usuari amb el Nom, Comentari i Adre嚙窮 electr嚙緯ica\n" +"construeix l'id de l'usuari amb el Nom, Comentari i Adre癟a electr簷nica\n" "d'aquesta forma:\n" " \"Heinrich Heine (Der Dichter) \"\n" "\n" @@ -1902,23 +1870,23 @@ msgstr "Nom i cognoms: " #: g10/keygen.c:1355 msgid "Invalid character in name\n" -msgstr "Hi ha un car嚙箱ter inv嚙締id en el camp *nom*\n" +msgstr "Hi ha un carcter invlid en el camp *nom*\n" #: g10/keygen.c:1357 msgid "Name may not start with a digit\n" -msgstr "El nom no pot comen嚙窮r amb un d嚙篇it\n" +msgstr "El nom no pot comen癟ar amb un d穩git\n" #: g10/keygen.c:1359 msgid "Name must be at least 5 characters long\n" -msgstr "El nom ha de tenir, si m嚙編 no, 5 car嚙箱ters\n" +msgstr "El nom ha de tenir, si m矇s no, 5 carcters\n" #: g10/keygen.c:1367 msgid "Email address: " -msgstr "Adre嚙窮 electr嚙緯ica: " +msgstr "Adre癟a electr簷nica: " #: g10/keygen.c:1378 msgid "Not a valid email address\n" -msgstr "No 嚙編 una adre嚙窮 v嚙締ida\n" +msgstr "No 矇s una adre癟a vlida\n" #: g10/keygen.c:1386 msgid "Comment: " @@ -1926,12 +1894,12 @@ msgstr "Comentari: " #: g10/keygen.c:1392 msgid "Invalid character in comment\n" -msgstr "Hi ha un car嚙箱ter inv嚙締id en el camp *comentari*\n" +msgstr "Hi ha un carcter invlid en el camp *comentari*\n" #: g10/keygen.c:1415 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "Esteu usant el joc de car嚙箱ters `%s'.\n" +msgstr "Esteu usant el joc de carcters `%s'.\n" #: g10/keygen.c:1421 #, c-format @@ -1946,11 +1914,10 @@ msgstr "" #: g10/keygen.c:1427 msgid "Please don't put the email address into the real name or the comment\n" -msgstr "" -"No inclogueu l'adre嚙窮 ni en el camp *nom* ni en el camp *comentari*\n" +msgstr "No inclogueu l'adre癟a ni en el camp *nom* ni en el camp *comentari*\n" # xX? ivb -# Hmm... s嚙. jm +# Hmm... s穩. jm #: g10/keygen.c:1432 msgid "NnCcEeOoQq" msgstr "NnCcEeOoXx" @@ -1991,9 +1958,9 @@ msgid "" "using this program with the option \"--edit-key\".\n" "\n" msgstr "" -"No voleu contrasenya: 嚙編 una mala idea!\n" -"B嚙. Si voleu canviar-la m嚙編 endavant,\n" -"useu aquest programa amb l'opci嚙 \"--edit-key\".\n" +"No voleu contrasenya: 矇s una mala idea!\n" +"B矇. Si voleu canviar-la m矇s endavant,\n" +"useu aquest programa amb l'opci籀 \"--edit-key\".\n" "\n" #: g10/keygen.c:1539 @@ -2003,10 +1970,9 @@ msgid "" "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" msgstr "" -"Cal generar molts bits aleat?riament. 嚙編 bona idea fer alguna altra cosa\n" -"(teclejar, moure el ratol嚙, usar els discos) durant la generaci嚙 de\n" -"nombres primers; a嚙踝蕭 d嚙緯a oportunitat al generador de nombres " -"aleatoris\n" +"Cal generar molts bits aleat簷riament. s bona idea fer alguna altra cosa\n" +"(teclejar, moure el ratol穩, usar els discos) durant la generaci籀 de\n" +"nombres primers; a癟簷 d籀na oportunitat al generador de nombres aleatoris\n" "d'aconseguir prou entropia.\n" #: g10/keygen.c:2114 @@ -2015,23 +1981,23 @@ msgstr "La parella de claus DSA ha de te #: g10/keygen.c:2178 msgid "Key generation canceled.\n" -msgstr "La generaci嚙 de claus ha estat cancel嚙締ada.\n" +msgstr "La generaci籀 de claus ha estat cancel繚lada.\n" #: g10/keygen.c:2293 g10/keygen.c:2381 #, c-format msgid "writing public key to `%s'\n" -msgstr "s'est嚙 escrivint la clau p嚙箭lica a 嚙%s嚙穀n" +msgstr "s'est escrivint la clau p繳blica a 竄%s罈\n" #: g10/keygen.c:2294 g10/keygen.c:2383 #, c-format msgid "writing secret key to `%s'\n" -msgstr "s'est嚙 escrivint la clau secreta a 嚙%s嚙穀n" +msgstr "s'est escrivint la clau secreta a 竄%s罈\n" # Potser no hi haja cap anell! ivb #: g10/keygen.c:2370 #, c-format msgid "no writable public keyring found: %s\n" -msgstr "no s'ha trobat cap anell p嚙箭lic escrivible: %s\n" +msgstr "no s'ha trobat cap anell p繳blic escrivible: %s\n" #: g10/keygen.c:2376 #, c-format @@ -2043,22 +2009,20 @@ msgstr "" #: g10/keygen.c:2390 #, c-format msgid "error writing public keyring `%s': %s\n" -msgstr "" -"s'ha produ嚙緣 un error mentre s'escrivia l'anell p嚙箭lic 嚙%s嚙: %s\n" +msgstr "s'ha produ簿t un error mentre s'escrivia l'anell p繳blic 竄%s罈: %s\n" #: g10/keygen.c:2397 #, c-format msgid "error writing secret keyring `%s': %s\n" -msgstr "" -"s'ha produ嚙緣 un error mentre s'escrivia l'anell secret 嚙%s嚙: %s\n" +msgstr "s'ha produ簿t un error mentre s'escrivia l'anell secret 竄%s罈: %s\n" #: g10/keygen.c:2417 msgid "public and secret key created and signed.\n" -msgstr "s'han creat i signat les claus p嚙箭lica i secreta.\n" +msgstr "s'han creat i signat les claus p繳blica i secreta.\n" #: g10/keygen.c:2418 msgid "key marked as ultimately trusted.\n" -msgstr "s'ha marcat la clau com a de confian嚙窮 absoluta.\n" +msgstr "s'ha marcat la clau com a de confian癟a absoluta.\n" #: g10/keygen.c:2429 msgid "" @@ -2066,12 +2030,12 @@ msgid "" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n" -"\"--edit-key\" per a generar una clau secund嚙緝ia per a tal prop嚙編it.\n" +"\"--edit-key\" per a generar una clau secundria per a tal prop簷sit.\n" #: g10/keygen.c:2441 g10/keygen.c:2563 #, c-format msgid "Key generation failed: %s\n" -msgstr "La generaci嚙 de claus ha fallat: %s\n" +msgstr "La generaci籀 de claus ha fallat: %s\n" # Werner FIXME: Use ngettext. jm #: g10/keygen.c:2491 g10/sign.c:261 @@ -2093,7 +2057,7 @@ msgstr "" #: g10/keygen.c:2502 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" -msgstr "NOTA: crear subclaus per a claus v3 no 嚙編 conforme amb OpenPGP\n" +msgstr "NOTA: crear subclaus per a claus v3 no 矇s conforme amb OpenPGP\n" #: g10/keygen.c:2530 msgid "Really create? " @@ -2112,36 +2076,36 @@ msgstr "%s: no s'ha pogut obrir: %s\n" #: g10/encode.c:207 g10/sign.c:1063 #, c-format msgid "error creating passphrase: %s\n" -msgstr "error en la creaci嚙 de la contrasenya: %s\n" +msgstr "error en la creaci籀 de la contrasenya: %s\n" #: g10/encode.c:212 msgid "can't use a symmetric ESK packet due to the S2K mode\n" -msgstr "no es pot usar un paquet asim嚙緣ric ESK al estar en mode S2K\n" +msgstr "no es pot usar un paquet asim癡tric ESK al estar en mode S2K\n" #: g10/encode.c:223 -#, fuzzy, c-format +#, c-format msgid "using cipher %s\n" -msgstr "Ha fallat el proc嚙編 de signatura: %s\n" +msgstr "s'est utilitzant el xifratge %s\n" #: g10/encode.c:233 g10/encode.c:494 #, c-format msgid "`%s' already compressed\n" -msgstr "嚙%s嚙 ja est嚙 comprimida\n" +msgstr "竄%s罈 ja est comprimida\n" #: g10/encode.c:302 g10/encode.c:531 #, c-format msgid "%s: WARNING: empty file\n" -msgstr "%s: AV嚙磅: el fitxer 嚙編 buit\n" +msgstr "%s: AVS: el fitxer 矇s buit\n" #: g10/encode.c:414 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" -"nom嚙編 podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n" +"nom矇s podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n" #: g10/encode.c:429 #, c-format msgid "reading from `%s'\n" -msgstr "s'est嚙 llegint des de 嚙%s嚙穀n" +msgstr "s'est llegint des de 竄%s罈\n" #: g10/encode.c:465 msgid "" @@ -2154,14 +2118,13 @@ msgstr "" #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -"for嚙窮r el xifrat asim嚙緣ric %s (%d) viola les prefer嚙緯cies del " -"destinatari\n" +"for癟ar el xifrat asim癡tric %s (%d) viola les prefer癡ncies del destinatari\n" #: g10/encode.c:573 g10/sign.c:781 #, c-format msgid "forcing compression algorithm %s (%d) violates recipient preferences\n" msgstr "" -"for嚙窮r l'algoritme de compressi嚙 %s (%d) viola les prefer嚙緯cies del " +"for癟ar l'algoritme de compressi籀 %s (%d) viola les prefer癡ncies del " "destinatari\n" #: g10/encode.c:717 @@ -2172,52 +2135,48 @@ msgstr "no podeu usar %s mentre esteu en #: g10/encode.c:744 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" -msgstr "%s/%s xifrat per a: 嚙%s嚙穀n" +msgstr "%s/%s xifrat per a: 竄%s罈\n" #: g10/export.c:157 g10/keyedit.c:2501 g10/delkey.c:74 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" -msgstr "no s'ha trobat la clau 嚙%s嚙: %s\n" +msgstr "no s'ha trobat la clau 竄%s罈: %s\n" #: g10/export.c:180 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" -msgstr "s'ha produ嚙緣 un error en llegir el bloc de claus: %s\n" +msgstr "s'ha produ簿t un error en llegir el bloc de claus: %s\n" #: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "clau %08lX: no 嚙編 una clau rfc2440 - es descarta\n" +msgstr "clau %08lX: no 矇s una clau rfc2440 - es descarta\n" #: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" -msgstr "clau %08lX: no est嚙 protegida - es descarta\n" +msgstr "clau %08lX: no est protegida - es descarta\n" #: g10/export.c:213 #, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "" -"AV嚙磅: la clau secreta %08lX no te una simple suma de comprovaci嚙 SK\n" +msgstr "AVS: la clau secreta %08lX no te una simple suma de comprovaci籀 SK\n" #: g10/export.c:310 msgid "WARNING: nothing exported\n" -msgstr "AV嚙磅: no s'ha exportat res\n" +msgstr "AVS: no s'ha exportat res\n" #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" msgstr "" -"hi ha massa entrades en la mem嚙緝ia cau de claus p嚙箭liques - desactivada\n" +"hi ha massa entrades en la mem簷ria cau de claus p繳bliques - desactivada\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[No s'ha trobat l'id d'usuari]" @@ -2225,23 +2184,23 @@ msgstr "[No s'ha trobat l'id d'usuari]" #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -"La clau inv嚙締ida %08lX s'ha fet v嚙締ida amb --allow-non-selfsigned-uid\n" +"La clau invlida %08lX s'ha fet vlida amb --allow-non-selfsigned-uid\n" #: g10/getkey.c:2160 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" -"no hi ha una clau secreta per a la subclau p嚙箭lica %08lX - es descarta\n" +"no hi ha una clau secreta per a la subclau p繳blica %08lX - es descarta\n" #: g10/getkey.c:2388 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" -msgstr "s'usar嚙 la clau secund嚙緝ia %08lX en lloc de la prim嚙緝ia %08lX\n" +msgstr "s'usar la clau secundria %08lX en lloc de la primria %08lX\n" #: g10/getkey.c:2435 #, c-format msgid "key %08lX: secret key without public key - skipped\n" -msgstr "clau %08lX: clau secreta sense clau p嚙箭lica - es descarta\n" +msgstr "clau %08lX: clau secreta sense clau p繳blica - es descarta\n" #: g10/import.c:227 #, c-format @@ -2256,7 +2215,7 @@ msgstr "fins ara s'han processat %lu cla #: g10/import.c:241 #, c-format msgid "error reading `%s': %s\n" -msgstr "error en la lectura de 嚙%s嚙: %s\n" +msgstr "error en la lectura de 竄%s罈: %s\n" #: g10/import.c:253 #, c-format @@ -2327,8 +2286,8 @@ msgstr " importades: %lu\n" msgid "" "NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "" -"NOTA: s'ha detectat una clau prim嚙緝ia Elgamal - a嚙踝蕭 pot trigar un " -"temps en importar-se\n" +"NOTA: s'ha detectat una clau primria Elgamal - a癟簷 pot trigar un temps en " +"importar-se\n" #: g10/import.c:565 g10/import.c:832 #, c-format @@ -2338,26 +2297,26 @@ msgstr "clau %08lX: sense ID\n" #: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" -msgstr "clau %08lX: corrupci嚙 de la subclau HKP reparada\n" +msgstr "clau %08lX: corrupci籀 de la subclau HKP reparada\n" #: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" -msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada 嚙%s嚙穀n" +msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada 竄%s罈\n" #: g10/import.c:608 #, c-format msgid "key %08lX: no valid user IDs\n" -msgstr "clau %08lX: l'ID no 嚙編 v嚙締id\n" +msgstr "clau %08lX: l'ID no 矇s vlid\n" #: g10/import.c:610 msgid "this may be caused by a missing self-signature\n" -msgstr "a嚙踝蕭 pot ser causat per l'abs嚙緯cia d'autosignatura\n" +msgstr "a癟簷 pot ser causat per l'abs癡ncia d'autosignatura\n" #: g10/import.c:619 g10/import.c:912 #, c-format msgid "key %08lX: public key not found: %s\n" -msgstr "clau %08lX: no s'ha trobat la clau p嚙箭lica: %s\n" +msgstr "clau %08lX: no s'ha trobat la clau p繳blica: %s\n" #: g10/import.c:624 #, c-format @@ -2372,22 +2331,22 @@ msgstr "no s'ha trobat cap anell escrivi #: g10/import.c:639 g10/sign.c:688 g10/sign.c:924 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" -msgstr "s'est嚙 escrivint en 嚙%s嚙穀n" +msgstr "s'est escrivint en 竄%s罈\n" #: g10/import.c:645 g10/import.c:730 g10/import.c:859 g10/import.c:972 #, c-format msgid "error writing keyring `%s': %s\n" -msgstr "error mentre s'escrivia l'anell 嚙%s嚙: %s\n" +msgstr "error mentre s'escrivia l'anell 竄%s罈: %s\n" #: g10/import.c:662 #, c-format msgid "key %08lX: public key \"%s\" imported\n" -msgstr "clau %08lX: s'ha importat la clau p嚙箭lica 嚙%s嚙穀n" +msgstr "clau %08lX: s'ha importat la clau p繳blica 竄%s罈\n" #: g10/import.c:684 #, c-format msgid "key %08lX: doesn't match our copy\n" -msgstr "clau %08lX: no correspon a la nostra c嚙緘ia\n" +msgstr "clau %08lX: no correspon a la nostra c簷pia\n" #: g10/import.c:701 g10/import.c:929 #, c-format @@ -2402,42 +2361,42 @@ msgstr "clau %08lX: no s'ha pogut llegir #: g10/import.c:739 #, c-format msgid "key %08lX: \"%s\" 1 new user ID\n" -msgstr "clau %08lX: 嚙%s嚙 1 ID d'usuari nou\n" +msgstr "clau %08lX: 竄%s罈 1 ID d'usuari nou\n" #: g10/import.c:742 #, c-format msgid "key %08lX: \"%s\" %d new user IDs\n" -msgstr "clau %08lX: 嚙%s嚙 %d ID d'usuari nous\n" +msgstr "clau %08lX: 竄%s罈 %d ID d'usuari nous\n" #: g10/import.c:745 #, c-format msgid "key %08lX: \"%s\" 1 new signature\n" -msgstr "clau %08lX: 嚙%s嚙 1 signatura nova\n" +msgstr "clau %08lX: 竄%s罈 1 signatura nova\n" #: g10/import.c:748 #, c-format msgid "key %08lX: \"%s\" %d new signatures\n" -msgstr "clau %08lX: 嚙%s嚙 %d signatures noves\n" +msgstr "clau %08lX: 竄%s罈 %d signatures noves\n" #: g10/import.c:751 #, c-format msgid "key %08lX: \"%s\" 1 new subkey\n" -msgstr "clau %08lX: 嚙%s嚙 1 subclau nova\n" +msgstr "clau %08lX: 竄%s罈 1 subclau nova\n" #: g10/import.c:754 #, c-format msgid "key %08lX: \"%s\" %d new subkeys\n" -msgstr "clau %08lX: 嚙%s嚙 %d subclaus noves\n" +msgstr "clau %08lX: 竄%s罈 %d subclaus noves\n" #: g10/import.c:773 #, c-format msgid "key %08lX: \"%s\" not changed\n" -msgstr "clau %08lX: 嚙%s嚙 no ha estat modificada\n" +msgstr "clau %08lX: 竄%s罈 no ha estat modificada\n" #: g10/import.c:838 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" -msgstr "clau %08lX: clau secreta amb xifrat %d no v嚙締id - es descarta\n" +msgstr "clau %08lX: clau secreta amb xifrat %d no vlid - es descarta\n" #: g10/import.c:853 #, c-format @@ -2449,7 +2408,6 @@ msgstr "no hi ha anell secret predetermi msgid "key %08lX: secret key imported\n" msgstr "clau %08lX: s'ha importat la clau secreta\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2464,22 +2422,21 @@ msgstr "clau %08lX: no s'ha trobat la cl #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" -"clau %08lX: falta la clau p嚙箭lica: no es pot aplicar el certificat\n" -"de revocaci嚙穀n" +"clau %08lX: falta la clau p繳blica: no es pot aplicar el certificat\n" +"de revocaci籀\n" -# O 嚙緝ebutjara嚙? ivb -# Per tots els canvis d'anglicisme 嚙箠gnorat嚙 -> 嚙箴s descarta嚙, -# 嚙箴s rebutja嚙 est嚙 b嚙. jm +# O 竄rebutjara罈? ivb +# Per tots els canvis d'anglicisme 竄ignorat罈 -> 竄es descarta罈, +# 竄es rebutja罈 est b矇. jm #: g10/import.c:946 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" -msgstr "" -"clau %08lX: el certificat de revocaci嚙 嚙編 inv嚙締id: %s: es rebutja\n" +msgstr "clau %08lX: el certificat de revocaci籀 矇s invlid: %s: es rebutja\n" #: g10/import.c:978 #, c-format msgid "key %08lX: \"%s\" revocation certificate imported\n" -msgstr "clau %08lX: s'ha importat el certificat de revocaci嚙 嚙%s嚙穀n" +msgstr "clau %08lX: s'ha importat el certificat de revocaci籀 竄%s罈\n" #: g10/import.c:1041 #, c-format @@ -2490,50 +2447,49 @@ msgstr "clau %08lX: no hi ha ID per a la #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" msgstr "" -"clau %08lX: l'algoritme de clau p嚙箭lica no es suporta sobre l'id d'usuari " -"嚙%s嚙穀n" +"clau %08lX: l'algoritme de clau p繳blica no es suporta sobre l'id d'usuari 竄%" +"s罈\n" "\n" #: g10/import.c:1058 #, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" -msgstr "" -"clau %08lX: l'autosignatura no 嚙編 v嚙締ida en l'id d'usuari 嚙%s嚙穀n" +msgstr "clau %08lX: l'autosignatura no 矇s vlida en l'id d'usuari 竄%s罈\n" #: g10/import.c:1075 #, c-format msgid "key %08lX: no subkey for key binding\n" -msgstr "clau %08lX: no hi ha una subclau per a l'enlla嚙 de la clau\n" +msgstr "clau %08lX: no hi ha una subclau per a l'enlla癟 de la clau\n" #: g10/import.c:1084 g10/import.c:1128 #, c-format msgid "key %08lX: unsupported public key algorithm\n" -msgstr "clau %08lX: l'algoritme de clau p嚙箭lica no 嚙編 suportat\n" +msgstr "clau %08lX: l'algoritme de clau p繳blica no 矇s suportat\n" #: g10/import.c:1085 #, c-format msgid "key %08lX: invalid subkey binding\n" -msgstr "clau %08lX: l'enlla嚙 de subclau 嚙編 inv嚙締id\n" +msgstr "clau %08lX: l'enlla癟 de subclau 矇s invlid\n" #: g10/import.c:1098 #, c-format msgid "key %08lX: removed multiple subkey binding\n" -msgstr "clau %08lX: s'ha eliminat un enlla嚙 de subclau m嚙締tiple\n" +msgstr "clau %08lX: s'ha eliminat un enlla癟 de subclau m繳ltiple\n" #: g10/import.c:1119 #, c-format msgid "key %08lX: no subkey for key revocation\n" -msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci嚙穀n" +msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci籀\n" #: g10/import.c:1129 #, c-format msgid "key %08lX: invalid subkey revocation\n" -msgstr "clau %08lX: Subclau de revocaci嚙 no v嚙締ida\n" +msgstr "clau %08lX: Subclau de revocaci籀 no vlida\n" #: g10/import.c:1142 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" -msgstr "clau %08lX: s'han eliminat subclaus de revocaci嚙 m嚙締tiples\n" +msgstr "clau %08lX: s'han eliminat subclaus de revocaci籀 m繳ltiples\n" #: g10/import.c:1179 #, c-format @@ -2548,34 +2504,32 @@ msgstr "clau %08lX: es descarta la subcl #: g10/import.c:1229 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "" -"clau %08lX: la signatura 嚙編 inexportable (classe %02x) - es descarta\n" +msgstr "clau %08lX: la signatura 矇s inexportable (classe %02x) - es descarta\n" #: g10/import.c:1238 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -"clau %08lX: el certificat de revocaci嚙 嚙編 en el lloc equivocat - es " +"clau %08lX: el certificat de revocaci籀 矇s en el lloc equivocat - es " "descarta\n" #: g10/import.c:1255 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "" -"clau %08lX: el certificat de revocaci嚙 嚙編 inv嚙締id: %s - es descarta\n" +msgstr "clau %08lX: el certificat de revocaci籀 矇s invlid: %s - es descarta\n" #: g10/import.c:1268 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" msgstr "" -"clau %08lX: la signatura de la subclau 嚙編 en el lloc equivocat - es " +"clau %08lX: la signatura de la subclau 矇s en el lloc equivocat - es " "descarta\n" #: g10/import.c:1276 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" msgstr "" -"clau %08lX: la classe de signatura 嚙編 inesperada (0x%02x) - es descarta\n" +"clau %08lX: la classe de signatura 矇s inesperada (0x%02x) - es descarta\n" #: g10/import.c:1375 #, c-format @@ -2586,20 +2540,20 @@ msgstr "clau %08lX: s'ha detectat un ID #, c-format msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" msgstr "" -"AV嚙磅: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci嚙 " -"%08lX\n" +"AVS: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci籀 %" +"08lX\n" #: g10/import.c:1448 #, c-format msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" msgstr "" -"AV嚙磅: la clau %08lX pot estar revocada: la clau de revocaci嚙 %08lX no " -"est嚙 present.\n" +"AVS: la clau %08lX pot estar revocada: la clau de revocaci籀 %08lX no est " +"present.\n" #: g10/import.c:1506 #, c-format msgid "key %08lX: \"%s\" revocation certificate added\n" -msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci嚙 嚙%s嚙穀n" +msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci籀 竄%s罈\n" #: g10/import.c:1539 #, c-format @@ -2608,7 +2562,7 @@ msgstr "clau %08lX: s'ha afegit la signa #: g10/keyedit.c:149 msgid "[revocation]" -msgstr "[revocaci嚙稽" +msgstr "[revocaci籀]" #: g10/keyedit.c:150 msgid "[self-signature]" @@ -2616,12 +2570,12 @@ msgstr "[autosignatura]" #: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" -msgstr "1 signatura err嚙緯ia\n" +msgstr "1 signatura err簷nia\n" #: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" -msgstr "%d signatures err嚙緯ies\n" +msgstr "%d signatures err簷nies\n" #: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" @@ -2643,17 +2597,17 @@ msgstr "%d signatures no comprovades a c #: g10/keyedit.c:233 msgid "1 user ID without valid self-signature detected\n" -msgstr "Ha estat detectat 1 ID sense autosignatura v嚙締ida\n" +msgstr "Ha estat detectat 1 ID sense autosignatura vlida\n" #: g10/keyedit.c:235 #, c-format msgid "%d user IDs without valid self-signatures detected\n" -msgstr "Han estat detectats %d IDs sense autosignatura v嚙締ida\n" +msgstr "Han estat detectats %d IDs sense autosignatura vlida\n" #: g10/keyedit.c:362 #, c-format msgid "User ID \"%s\" is revoked." -msgstr "L'ID d'usuari 嚙%s嚙 est嚙 revocat." +msgstr "L'ID d'usuari 竄%s罈 est revocat." #: g10/keyedit.c:371 g10/keyedit.c:397 g10/keyedit.c:422 g10/keyedit.c:576 #: g10/keyedit.c:634 g10/keyedit.c:1237 @@ -2670,12 +2624,12 @@ msgstr " No es pot signar.\n" #: g10/keyedit.c:388 #, c-format msgid "User ID \"%s\" is expired." -msgstr "L'ID d'usuari 嚙%s嚙 ha caducat." +msgstr "L'ID d'usuari 竄%s罈 ha caducat." #: g10/keyedit.c:414 #, c-format msgid "User ID \"%s\" is not self-signed." -msgstr "L'ID d'usuari 嚙%s嚙 no est嚙 autosignat." +msgstr "L'ID d'usuari 竄%s罈 no est autosignat." #: g10/keyedit.c:453 #, c-format @@ -2683,8 +2637,8 @@ msgid "" "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -"La vostra signatura en 嚙%s嚙穀n" -"嚙編 una signatura d'estil PGP 2.x.\n" +"La vostra signatura en 竄%s罈\n" +"矇s una signatura d'estil PGP 2.x.\n" #: g10/keyedit.c:462 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " @@ -2696,23 +2650,21 @@ msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -"La vostra signatura actual en 嚙%s嚙穀n" +"La vostra signatura actual en 竄%s罈\n" "ha caducat.\n" #: g10/keyedit.c:480 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " -msgstr "Voleu crear una nova signatura per a reempla嚙窮r la caducada? (s/N) " +msgstr "Voleu crear una nova signatura per a reempla癟ar la caducada? (s/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -"La vostra signatura en 嚙%s嚙穀n" -"嚙編 una signatura local.\n" +"La vostra signatura en 竄%s罈\n" +"矇s una signatura local.\n" #: g10/keyedit.c:505 msgid "Do you want to promote it to a full exportable signature? (y/N) " @@ -2721,12 +2673,12 @@ msgstr "Voleu ascendir-la a una signatur #: g10/keyedit.c:526 #, c-format msgid "\"%s\" was already locally signed by key %08lX\n" -msgstr "嚙%s嚙 ja estava signada localment amb la clau %08lX\n" +msgstr "竄%s罈 ja estava signada localment amb la clau %08lX\n" #: g10/keyedit.c:530 #, c-format msgid "\"%s\" was already signed by key %08lX\n" -msgstr "嚙%s嚙 ja estava signada amb la clau %08lX\n" +msgstr "竄%s罈 ja estava signada amb la clau %08lX\n" #: g10/keyedit.c:535 msgid "Do you want to sign it again anyway? (y/N) " @@ -2744,7 +2696,7 @@ msgstr "La clau ha caducat!" #: g10/keyedit.c:590 #, c-format msgid "This key is due to expire on %s.\n" -msgstr "Aquesta clau caducar嚙 el %s.\n" +msgstr "Aquesta clau caducar el %s.\n" #: g10/keyedit.c:594 msgid "Do you want your signature to expire at the same time? (Y/n) " @@ -2759,7 +2711,7 @@ msgstr "" #: g10/keyedit.c:629 msgid "This would make the key unusable in PGP 2.x.\n" -msgstr "A嚙踝蕭 inutilitzaria la clau en PGP 2.x.\n" +msgstr "A癟簷 inutilitzaria la clau en PGP 2.x.\n" #: g10/keyedit.c:652 msgid "" @@ -2768,8 +2720,8 @@ msgid "" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" "Amb quanta cura heu verificat que la clau que esteu a punt de signar \n" -"pertany realment a la persona esmentada anteriorment? Si no sabeu qu嚙 \n" -"contestar, entreu 嚙0嚙.\n" +"pertany realment a la persona esmentada anteriorment? Si no sabeu qu癡 \n" +"contestar, entreu 竄0罈.\n" #: g10/keyedit.c:656 #, c-format @@ -2797,9 +2749,7 @@ msgstr " (3) He fet comprovacions molt #: g10/keyedit.c:668 msgid "Your selection? (enter '?' for more information): " -msgstr "" -"Seleccioneu una opci嚙 (introdu嚙線 嚙?嚙 per obtindre m嚙編 " -"informaci嚙):" +msgstr "Seleccioneu una opci籀 (introdu簿u 竄?罈 per obtindre m矇s informaci籀):" #: g10/keyedit.c:688 msgid "" @@ -2815,7 +2765,7 @@ msgid "" "This will be a self-signature.\n" msgstr "" "\n" -"A嚙踝蕭 ser嚙 una autosignatura.\n" +"A癟簷 ser una autosignatura.\n" #: g10/keyedit.c:701 msgid "" @@ -2823,7 +2773,7 @@ msgid "" "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" "\n" -"AV嚙磅: la signatura no es marcar嚙 com a inexportable.\n" +"AVS: la signatura no es marcar com a inexportable.\n" #: g10/keyedit.c:706 msgid "" @@ -2831,7 +2781,7 @@ msgid "" "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" "\n" -"AV嚙磅: la signatura no es marcar嚙 com a irrevocable.\n" +"AVS: la signatura no es marcar com a irrevocable.\n" #: g10/keyedit.c:713 msgid "" @@ -2839,7 +2789,7 @@ msgid "" "The signature will be marked as non-exportable.\n" msgstr "" "\n" -"La signatura es marcar嚙 com a inexportable.\n" +"La signatura es marcar com a inexportable.\n" #: g10/keyedit.c:717 msgid "" @@ -2847,7 +2797,7 @@ msgid "" "The signature will be marked as non-revocable.\n" msgstr "" "\n" -"La signatura es marcar嚙 com a irrevocable.\n" +"La signatura es marcar com a irrevocable.\n" #: g10/keyedit.c:722 msgid "" @@ -2881,19 +2831,19 @@ msgstr "Signar realment? " #: g10/sign.c:318 #, c-format msgid "signing failed: %s\n" -msgstr "Ha fallat el proc嚙編 de signatura: %s\n" +msgstr "Ha fallat el proc矇s de signatura: %s\n" #: g10/keyedit.c:837 msgid "This key is not protected.\n" -msgstr "Aquesta clau no est嚙 protegida.\n" +msgstr "Aquesta clau no est protegida.\n" #: g10/keyedit.c:841 msgid "Secret parts of primary key are not available.\n" -msgstr "Les parts secretes de la clau prim嚙緝ia no estan disponibles.\n" +msgstr "Les parts secretes de la clau primria no estan disponibles.\n" #: g10/keyedit.c:845 msgid "Key is protected.\n" -msgstr "La clau est嚙 protegida.\n" +msgstr "La clau est protegida.\n" #: g10/keyedit.c:865 #, c-format @@ -2905,7 +2855,7 @@ msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -"Introdu嚙線 la nova contrasenya per a la clau secreta.\n" +"Introdu簿u la nova contrasenya per a la clau secreta.\n" "\n" #: g10/keyedit.c:885 @@ -2913,21 +2863,21 @@ msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -"No voleu contrasenya: a嚙踝蕭 嚙編 probablement una *mala* idea!\n" +"No voleu contrasenya: a癟簷 矇s probablement una *mala* idea!\n" "\n" # No abusis dels pronoms! (Rowan Atkinson @ Llei i Desordre) ivb #: g10/keyedit.c:888 msgid "Do you really want to do this? " -msgstr "Esteu segur de voler fer a嚙踝蕭? " +msgstr "Esteu segur de voler fer a癟簷? " #: g10/keyedit.c:954 msgid "moving a key signature to the correct place\n" -msgstr "s'est嚙 posant la signatura al lloc correcte\n" +msgstr "s'est posant la signatura al lloc correcte\n" #: g10/keyedit.c:996 msgid "quit this menu" -msgstr "ix del men嚙" +msgstr "ix del men繳" #: g10/keyedit.c:997 msgid "q" @@ -2945,8 +2895,8 @@ msgstr "desa i ix" msgid "help" msgstr "ajuda" -# 嚙緘antalla嚙 o 嚙窮juda嚙? ivb -# 嚙窮juda嚙, evidentment. jm +# 竄pantalla罈 o 竄ajuda罈? ivb +# 竄ajuda罈, evidentment. jm #: g10/keyedit.c:999 msgid "show this help" msgstr "mostra aquesta ajuda" @@ -2976,7 +2926,7 @@ msgid "uid" msgstr "uid" # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb -# Yeah, els vaig corregir abans de que enviares la teua correcci嚙. jm +# Yeah, els vaig corregir abans de que enviares la teua correcci籀. jm #: g10/keyedit.c:1004 msgid "select user ID N" msgstr "tria l'ID d'usuari N" @@ -2987,7 +2937,7 @@ msgstr "clau" #: g10/keyedit.c:1005 msgid "select secondary key N" -msgstr "tria la clau secund嚙緝ia N" +msgstr "tria la clau secundria N" #: g10/keyedit.c:1006 msgid "check" @@ -3054,9 +3004,9 @@ msgid "addphoto" msgstr "addphoto" # Com estava escrit abans. ivb -# Si et refereixes a Photo vs. photo, ho deixe en min嚙編cules, que en tot -# el men嚙 est嚙 tot en min嚙編cules. Tb hi ha molts ID vs. id en els msgids -# i no hem unificat en catal嚙. Potser li ho dir嚙 a Werner. jm. +# Si et refereixes a Photo vs. photo, ho deixe en min繳scules, que en tot +# el men繳 est tot en min繳scules. Tb hi ha molts ID vs. id en els msgids +# i no hem unificat en catal. Potser li ho dir矇 a Werner. jm. #: g10/keyedit.c:1015 msgid "add a photo ID" msgstr "afegeix un photo ID" @@ -3069,7 +3019,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "esborra un ID d'usuari" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3080,7 +3029,7 @@ msgstr "addkey" #: g10/keyedit.c:1019 msgid "add a secondary key" -msgstr "afegeix una clau secund嚙緝ia" +msgstr "afegeix una clau secundria" #: g10/keyedit.c:1020 msgid "delkey" @@ -3088,7 +3037,7 @@ msgstr "delkey" #: g10/keyedit.c:1020 msgid "delete a secondary key" -msgstr "esborra una clau secund嚙緝ia" +msgstr "esborra una clau secundria" #: g10/keyedit.c:1021 msgid "addrevoker" @@ -3096,7 +3045,7 @@ msgstr "addrevoker" #: g10/keyedit.c:1021 msgid "add a revocation key" -msgstr "afegeix una clau de revocaci嚙" +msgstr "afegeix una clau de revocaci籀" #: g10/keyedit.c:1022 msgid "delsig" @@ -3128,7 +3077,7 @@ msgstr "toggle" #: g10/keyedit.c:1025 msgid "toggle between secret and public key listing" -msgstr "canvia entre el llistat de claus secretes i p嚙箭liques" +msgstr "canvia entre el llistat de claus secretes i p繳bliques" #: g10/keyedit.c:1027 msgid "t" @@ -3140,7 +3089,7 @@ msgstr "pref" #: g10/keyedit.c:1028 msgid "list preferences (expert)" -msgstr "llista les prefer嚙緯cies (expert)" +msgstr "llista les prefer癡ncies (expert)" #: g10/keyedit.c:1029 msgid "showpref" @@ -3148,7 +3097,7 @@ msgstr "showpref" #: g10/keyedit.c:1029 msgid "list preferences (verbose)" -msgstr "llista les prefer嚙緯cies (detallat)" +msgstr "llista les prefer癡ncies (detallat)" #: g10/keyedit.c:1030 msgid "setpref" @@ -3156,7 +3105,7 @@ msgstr "setpref" #: g10/keyedit.c:1030 msgid "set preference list" -msgstr "estableix la llista de prefer嚙緯cies" +msgstr "estableix la llista de prefer癡ncies" #: g10/keyedit.c:1031 msgid "updpref" @@ -3164,7 +3113,7 @@ msgstr "updpref" #: g10/keyedit.c:1031 msgid "updated preferences" -msgstr "prefer嚙緯cies actualitzades" +msgstr "prefer癡ncies actualitzades" #: g10/keyedit.c:1032 msgid "passwd" @@ -3180,7 +3129,7 @@ msgstr "trust" #: g10/keyedit.c:1033 msgid "change the ownertrust" -msgstr "canvia la confian嚙窮" +msgstr "canvia la confian癟a" #: g10/keyedit.c:1034 msgid "revsig" @@ -3204,7 +3153,7 @@ msgstr "revkey" #: g10/keyedit.c:1036 msgid "revoke a secondary key" -msgstr "revoca una clau secund嚙緝ia" +msgstr "revoca una clau secundria" #: g10/keyedit.c:1037 msgid "disable" @@ -3232,20 +3181,20 @@ msgstr "showphoto" msgid "show photo ID" msgstr "mostra el photo ID" -# Dest嚙編? ivb -# Desat嚙編, s嚙. jm +# Dest癡s? ivb +# Desat癡s, s穩. jm #: g10/keyedit.c:1059 g10/delkey.c:120 msgid "can't do that in batchmode\n" -msgstr "no es pot fet aix嚙 en mode desat嚙編\n" +msgstr "no es pot fet aix簷 en mode desat癡s\n" #: g10/keyedit.c:1097 #, c-format msgid "error reading secret keyblock `%s': %s\n" -msgstr "error en llegir el bloc de claus secretes 嚙%s嚙: %s\n" +msgstr "error en llegir el bloc de claus secretes 竄%s罈: %s\n" #: g10/keyedit.c:1115 msgid "Secret key is available.\n" -msgstr "La clau secreta est嚙 disponible.\n" +msgstr "La clau secreta est disponible.\n" #: g10/keyedit.c:1146 msgid "Command> " @@ -3253,15 +3202,15 @@ msgstr "Ordre> " #: g10/keyedit.c:1178 msgid "Need the secret key to do this.\n" -msgstr "Cal la clau secreta per a fer a嚙踝蕭.\n" +msgstr "Cal la clau secreta per a fer a癟簷.\n" #: g10/keyedit.c:1182 msgid "Please use the command \"toggle\" first.\n" -msgstr "Useu l'ordre 嚙緣oggle嚙 abans.\n" +msgstr "Useu l'ordre 竄toggle罈 abans.\n" #: g10/keyedit.c:1231 msgid "Key is revoked." -msgstr "La clau est嚙 revocada." +msgstr "La clau est revocada." #: g10/keyedit.c:1250 msgid "Really sign all user IDs? " @@ -3274,7 +3223,7 @@ msgstr "Pista: Trieu els ID d'usuari que #: g10/keyedit.c:1276 #, c-format msgid "This command is not allowed while in %s mode.\n" -msgstr "Aquesta ordre no est嚙 permesa mentre s'est嚙 en mode %s.\n" +msgstr "Aquesta ordre no est permesa mentre s'est en mode %s.\n" #: g10/keyedit.c:1298 g10/keyedit.c:1319 g10/keyedit.c:1379 msgid "You must select at least one user ID.\n" @@ -3282,7 +3231,7 @@ msgstr "Heu de seleccionar al menys un I #: g10/keyedit.c:1300 msgid "You can't delete the last user ID!\n" -msgstr "No podeu esborrar l'嚙締tim ID d'usuari!\n" +msgstr "No podeu esborrar l'繳ltim ID d'usuari!\n" #: g10/keyedit.c:1303 msgid "Really remove all selected user IDs? " @@ -3294,7 +3243,7 @@ msgstr "Realment voleu eliminar aquest I #: g10/keyedit.c:1342 g10/keyedit.c:1398 msgid "You must select at least one key.\n" -msgstr "Heu de seleccionar, si m嚙編 no, una clau.\n" +msgstr "Heu de seleccionar, si m矇s no, una clau.\n" #: g10/keyedit.c:1346 msgid "Do you really want to delete the selected keys? " @@ -3323,11 +3272,11 @@ msgstr "Realment voleu revocar aquesta c #: g10/keyedit.c:1472 msgid "Really update the preferences for the selected user IDs? " msgstr "" -"Voleu actualitzar les prefer嚙緯cies per a les ID d'usuaris seleccionades?" +"Voleu actualitzar les prefer癡ncies per a les ID d'usuaris seleccionades?" #: g10/keyedit.c:1474 msgid "Really update the preferences? " -msgstr "Realment voleu actualitzar les prefer嚙緯cies? " +msgstr "Realment voleu actualitzar les prefer癡ncies? " #: g10/keyedit.c:1512 msgid "Save changes? " @@ -3340,20 +3289,20 @@ msgstr "Voleu eixir sense desar? " #: g10/keyedit.c:1526 #, c-format msgid "update failed: %s\n" -msgstr "ha fallat l'actualitzaci嚙: %s\n" +msgstr "ha fallat l'actualitzaci籀: %s\n" #: g10/keyedit.c:1533 #, c-format msgid "update secret failed: %s\n" -msgstr "ha fallat l'actualitzaci嚙 de la clau secreta: %s\n" +msgstr "ha fallat l'actualitzaci籀 de la clau secreta: %s\n" #: g10/keyedit.c:1540 msgid "Key not changed so no update needed.\n" -msgstr "La clau no ha canviat, per tant no cal actualitzaci嚙.\n" +msgstr "La clau no ha canviat, per tant no cal actualitzaci籀.\n" #: g10/keyedit.c:1552 msgid "Invalid command (try \"help\")\n" -msgstr "L'ordre no 嚙編 v嚙締ida (proveu 嚙篁elp嚙)\n" +msgstr "L'ordre no 矇s vlida (proveu 竄help罈)\n" #: g10/keyedit.c:1611 msgid "Digest: " @@ -3363,8 +3312,8 @@ msgstr "Resum: " msgid "Features: " msgstr "Funcionalitats: " -# Potser %s haja d'anar darrere de 嚙箱lau嚙. ivb -# 嚙編 cert. Nova funcionalitat de 1.2.0, IIRC. jm +# Potser %s haja d'anar darrere de 竄clau罈. ivb +# s cert. Nova funcionalitat de 1.2.0, IIRC. jm #: g10/keyedit.c:1897 #, c-format msgid "This key may be revoked by %s key " @@ -3374,8 +3323,6 @@ msgstr "Aquesta clau pot ser revocada pe msgid " (sensitive)" msgstr " (sensible)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3384,7 +3331,7 @@ msgstr "%s%c %4u%c/%08lX creada: %s cad #: g10/keyedit.c:1916 #, c-format msgid " trust: %c/%c" -msgstr " confian嚙窮: %c/%c" +msgstr " confian癟a: %c/%c" #: g10/keyedit.c:1920 msgid "This key has been disabled" @@ -3397,12 +3344,12 @@ msgstr "rev! la subclau ha estat revocad #: g10/keyedit.c:1952 msgid "rev- faked revocation found\n" -msgstr "rev- s'ha trobat una revocaci嚙 falsa\n" +msgstr "rev- s'ha trobat una revocaci籀 falsa\n" #: g10/keyedit.c:1954 #, c-format msgid "rev? problem checking revocation: %s\n" -msgstr "rev? hi ha problemes en la comprovaci嚙 de la revocaci嚙: %s\n" +msgstr "rev? hi ha problemes en la comprovaci籀 de la revocaci籀: %s\n" #: g10/keyedit.c:1974 g10/keyedit.c:2057 g10/keylist.c:492 g10/keylist.c:532 #: g10/mainproc.c:946 @@ -3415,15 +3362,14 @@ msgstr "[caducada]" #: g10/keyedit.c:1984 msgid "There are no preferences on a PGP 2.x-style user ID.\n" -msgstr "No hi ha prefer嚙緯cies en un ID d'usuari d'estil PGP 2.x.\n" +msgstr "No hi ha prefer癡ncies en un ID d'usuari d'estil PGP 2.x.\n" #: g10/keyedit.c:1992 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -"Teniu en compte que la validesa de la clau mostrada no 嚙編 " -"necess嚙緝iament\n" +"Teniu en compte que la validesa de la clau mostrada no 矇s necessriament\n" "correcta a no ser que torneu a executar el programa.\n" #: g10/keyedit.c:2121 @@ -3431,8 +3377,8 @@ msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -"AV嚙磅: no s'ha marcat cap ID d'usuari com prim嚙緝ia. Aquesta ordre pot\n" -" causar que una ID d'usuari diferent esdevinga en la prim嚙緝ia " +"AVS: no s'ha marcat cap ID d'usuari com primria. Aquesta ordre pot\n" +" causar que una ID d'usuari diferent esdevinga en la primria " "assumida.\n" # Photo ID com abans. ivb @@ -3442,7 +3388,7 @@ msgid "" "versions\n" " of PGP to reject this key.\n" msgstr "" -"AV嚙磅: Aquesta 嚙編 una clau d'estil PGP2. Afegir un photo ID pot fer que " +"AVS: Aquesta 矇s una clau d'estil PGP2. Afegir un photo ID pot fer que " "algunes versions de PGP rebutgen aquesta clau.\n" #: g10/keyedit.c:2186 g10/keyedit.c:2459 @@ -3453,15 +3399,15 @@ msgstr "Esteu segur que encara voleu afe msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n" -# Aquesta i les seg嚙箴nts no haurien de portar (s/N/q) i no (y/N/q)? ivb -# Hmm. S嚙... (s/N/x) jm +# Aquesta i les seg羹ents no haurien de portar (s/N/q) i no (y/N/q)? ivb +# Hmm. S穩... (s/N/x) jm #: g10/keyedit.c:2327 msgid "Delete this good signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" #: g10/keyedit.c:2337 msgid "Delete this invalid signature? (y/N/q)" -msgstr "Voleu esborrar aquesta signatura inv嚙締ida? (s/N/x)" +msgstr "Voleu esborrar aquesta signatura invlida? (s/N/x)" #: g10/keyedit.c:2341 msgid "Delete this unknown signature? (y/N/q)" @@ -3493,8 +3439,7 @@ msgid "" "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -"AV嚙磅: Aquesta 嚙編 una clau d'estil PGP 2.x. Afegir un revocador designat " -"pot\n" +"AVS: Aquesta 矇s una clau d'estil PGP 2.x. Afegir un revocador designat pot\n" "fer que algunes versions de PGP rebutjen aquesta clau.\n" #: g10/keyedit.c:2465 @@ -3503,16 +3448,13 @@ msgstr "No podeu afegir un revocador des #: g10/keyedit.c:2488 msgid "Enter the user ID of the designated revoker: " -msgstr "Introdu嚙線 l'ID d'usuari del revocador designat: " +msgstr "Introdu簿u l'ID d'usuari del revocador designat: " #: g10/keyedit.c:2511 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no podeu nominar una clau com el seu propi revocador designat\n" @@ -3520,8 +3462,7 @@ msgstr "no podeu nominar una clau com el #: g10/keyedit.c:2540 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -"AV嚙磅: no es pot desfer la nominaci嚙 d'una clau com a revocador " -"designat!\n" +"AVS: no es pot desfer la nominaci籀 d'una clau com a revocador designat!\n" #: g10/keyedit.c:2546 msgid "" @@ -3535,15 +3476,15 @@ msgstr "Per favor, elimineu les seleccio #: g10/keyedit.c:2617 msgid "Please select at most one secondary key.\n" -msgstr "Per favor, seleccioneu com a molt una clau secund嚙緝ia.\n" +msgstr "Per favor, seleccioneu com a molt una clau secundria.\n" #: g10/keyedit.c:2621 msgid "Changing expiration time for a secondary key.\n" -msgstr "S'est嚙 canviant la data de caducitat per a una clau secund嚙緝ia.\n" +msgstr "S'est canviant la data de caducitat per a una clau secundria.\n" #: g10/keyedit.c:2624 msgid "Changing expiration time for the primary key.\n" -msgstr "S'est嚙 canviant la data de caducitat per a una clau prim嚙緝ia.\n" +msgstr "S'est canviant la data de caducitat per a una clau primria.\n" #: g10/keyedit.c:2670 msgid "You can't change the expiration date of a v3 key\n" @@ -3560,21 +3501,21 @@ msgstr "Heu de seleccionar exactament un #: g10/keyedit.c:2805 g10/keyedit.c:2915 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" -msgstr "es descarta l'autosignatura v3 en l'id d'usuari 嚙%s嚙穀n" +msgstr "es descarta l'autosignatura v3 en l'id d'usuari 竄%s罈\n" #: g10/keyedit.c:2975 #, c-format msgid "No user ID with index %d\n" -msgstr "No hi ha cap ID amb l'嚙緯dex %d\n" +msgstr "No hi ha cap ID amb l'穩ndex %d\n" #: g10/keyedit.c:3021 #, c-format msgid "No secondary key with index %d\n" -msgstr "No hi ha cap clau secund嚙緝ia amb l'嚙緯dex %d\n" +msgstr "No hi ha cap clau secundria amb l'穩ndex %d\n" #: g10/keyedit.c:3135 msgid "user ID: \"" -msgstr "ID d'usuari: 嚙" +msgstr "ID d'usuari: 竄" #: g10/keyedit.c:3140 #, c-format @@ -3582,7 +3523,7 @@ msgid "" "\"\n" "signed with your key %08lX at %s\n" msgstr "" -"嚙穀n" +"罈\n" "signat amb la vostra clau %08lX el %s\n" #: g10/keyedit.c:3143 @@ -3591,7 +3532,7 @@ msgid "" "\"\n" "locally signed with your key %08lX at %s\n" msgstr "" -"嚙穀n" +"罈\n" "signat localment amb la vostra clau %08lX el %s\n" #: g10/keyedit.c:3148 @@ -3607,13 +3548,11 @@ msgstr "Esteu segur de que encara voleu # S! jm #: g10/keyedit.c:3156 msgid "Create a revocation certificate for this signature? (y/N) " -msgstr "" -"Voleu crear un certificat de revocaci嚙 per a aquesta signatura? (s/N) " +msgstr "Voleu crear un certificat de revocaci籀 per a aquesta signatura? (s/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" -msgstr "Heu signat els seg嚙箴nts ID d'usuari:\n" +msgstr "Heu signat els seg羹ents ID d'usuari:\n" #: g10/keyedit.c:3200 #, c-format @@ -3641,7 +3580,7 @@ msgstr " (no-exportable)" # (s/N)? ivb #: g10/keyedit.c:3247 msgid "Really create the revocation certificates? (y/N) " -msgstr "Realment voleu crear els certificats de revocaci嚙? (s/N) " +msgstr "Realment voleu crear els certificats de revocaci籀? (s/N) " #: g10/keyedit.c:3277 msgid "no secret key\n" @@ -3650,47 +3589,42 @@ msgstr "ho hi ha clau secreta\n" #: g10/keyedit.c:3347 #, c-format msgid "user ID \"%s\" is already revoked\n" -msgstr "l'ID d'usuari 嚙%s嚙 ja est嚙 revocat\n" +msgstr "l'ID d'usuari 竄%s罈 ja est revocat\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" -msgstr "" -"AV嚙磅: una signatura d'ID d'usuari est嚙 datada %d segons en el futur\n" +msgstr "AVS: una signatura d'ID d'usuari est datada %d segons en el futur\n" #: g10/keyedit.c:3537 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" msgstr "" -"S'est嚙 mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n" +"S'est mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n" #: g10/keylist.c:112 #, c-format msgid "Critical signature policy: " -msgstr "Pol嚙緣ica de signatura cr嚙緣ica: " +msgstr "Pol穩tica de signatura cr穩tica: " #: g10/keylist.c:114 #, c-format msgid "Signature policy: " -msgstr "Pol嚙緣ica de signatura: " +msgstr "Pol穩tica de signatura: " #: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:811 g10/mainproc.c:820 msgid "WARNING: invalid notation data found\n" -msgstr "AV嚙磅: s'hi han trobat dades de notaci嚙 inv嚙締ides\n" +msgstr "AVS: s'hi han trobat dades de notaci籀 invlides\n" #: g10/keylist.c:148 #, c-format msgid "Critical signature notation: " -msgstr "Notaci嚙 de signatura cr嚙緣ica: " +msgstr "Notaci籀 de signatura cr穩tica: " #: g10/keylist.c:150 #, c-format msgid "Signature notation: " -msgstr "Notaci嚙 de signatura: " +msgstr "Notaci籀 de signatura: " #: g10/keylist.c:157 msgid "not human readable" @@ -3707,7 +3641,7 @@ msgstr " [caduca: %s]" #: g10/keylist.c:1046 msgid "Primary key fingerprint:" -msgstr "Empremtes digital de la clau prim嚙緝ia:" +msgstr "Empremtes digital de la clau primria:" #: g10/keylist.c:1048 msgid " Subkey fingerprint:" @@ -3715,13 +3649,12 @@ msgstr " Empremta digital de la subc #: g10/keylist.c:1055 msgid " Primary key fingerprint:" -msgstr " Empremta digital de la clau prim嚙緝ia:" +msgstr " Empremta digital de la clau primria:" #: g10/keylist.c:1057 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Empremta digital =" @@ -3729,21 +3662,18 @@ msgstr " Empremta digital =" #: g10/mainproc.c:248 #, c-format msgid "weird size for an encrypted session key (%d)\n" -msgstr "mida extranya per a una clau de sessi嚙 xifrada (%d)\n" +msgstr "mida extranya per a una clau de sessi籀 xifrada (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" msgstr "" -"la contrasenya 嚙編 incorrecta o l'algoritme de xifratge (%d) 嚙編 " -"desconegut\n" +"la contrasenya 矇s incorrecta o l'algoritme de xifratge (%d) 矇s desconegut\n" #: g10/mainproc.c:299 #, c-format msgid "%s encrypted session key\n" -msgstr "clau de sessi嚙 xifrada amb %s\n" +msgstr "clau de sessi籀 xifrada amb %s\n" #: g10/mainproc.c:301 g10/encr-data.c:66 #, c-format @@ -3756,18 +3686,19 @@ msgid "encrypted with unknown algorithm msgstr "xifrat amb l'algoritme %d (desconegut)\n" #: g10/mainproc.c:309 -#, fuzzy, c-format +#, c-format msgid "passphrase generated with unknown digest algorithm %d\n" -msgstr "xifrat amb l'algoritme %d (desconegut)\n" +msgstr "" +"la contrasenya ha estat generada amb l'algoritme de resum desconegut %d\n" #: g10/mainproc.c:358 #, c-format msgid "public key is %08lX\n" -msgstr "la clau p嚙箭lica 嚙編 %08lX\n" +msgstr "la clau p繳blica 矇s %08lX\n" #: g10/mainproc.c:404 msgid "public key encrypted data: good DEK\n" -msgstr "dades xifrades amb clau p嚙箭lica: bona clau de xifratge (DEK)\n" +msgstr "dades xifrades amb clau p繳blica: bona clau de xifratge (DEK)\n" #: g10/mainproc.c:456 #, c-format @@ -3782,7 +3713,7 @@ msgstr "xifrat amb una clau %s, ID %08lX #: g10/mainproc.c:480 #, c-format msgid "public key decryption failed: %s\n" -msgstr "ha fallat el desxifratge amb la clau p嚙箭lica: %s\n" +msgstr "ha fallat el desxifratge amb la clau p繳blica: %s\n" #: g10/mainproc.c:494 #, c-format @@ -3794,20 +3725,20 @@ msgstr "xifrat amb %lu contrasenyes\n" msgid "encrypted with 1 passphrase\n" msgstr "xifrat amb 1 contrasenya\n" -# I no ser嚙 嚙範ades xifrades amb %s嚙? ivb -# Sembla que s嚙, ho marque per a mirar-ho m嚙編 endavant. jm +# I no ser 竄dades xifrades amb %s罈? ivb +# Sembla que s穩, ho marque per a mirar-ho m矇s endavant. jm #: g10/mainproc.c:512 g10/mainproc.c:531 #, c-format msgid "assuming %s encrypted data\n" msgstr "s'assumeixen dades xifrades amb %s\n" -# L'optim嚙編tic 嚙編 aquell que t嚙 una Fe Cega en que Tot Anir嚙 B嚙! ivb +# L'optim穩stic 矇s aquell que t矇 una Fe Cega en que Tot Anir B矇! ivb #: g10/mainproc.c:519 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" msgstr "" -"El xifratge IDEA no est嚙 disponible, s'intentar嚙 utilitzar optimistament " -"%s en el seu lloc\n" +"El xifratge IDEA no est disponible, s'intentar utilitzar optimistament %s " +"en el seu lloc\n" #: g10/mainproc.c:549 msgid "decryption okay\n" @@ -3815,11 +3746,11 @@ msgstr "desxifratge correcte\n" #: g10/mainproc.c:553 msgid "WARNING: message was not integrity protected\n" -msgstr "AV嚙磅: el missatge no tenia protecci嚙 d'integritat\n" +msgstr "AVS: el missatge no tenia protecci籀 d'integritat\n" #: g10/mainproc.c:556 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "AV嚙磅: el missatge xifrat ha estat manipulat!\n" +msgstr "AVS: el missatge xifrat ha estat manipulat!\n" #: g10/mainproc.c:562 #, c-format @@ -3828,7 +3759,7 @@ msgstr "ha fallat el desxifratge: %s\n" #: g10/mainproc.c:581 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "NOTA: el remitent ha sol嚙締icitat \"alt secret\"\n" +msgstr "NOTA: el remitent ha sol繚licitat \"alt secret\"\n" #: g10/mainproc.c:583 #, c-format @@ -3837,38 +3768,33 @@ msgstr "nom del fitxer original='%.*s'\n #: g10/mainproc.c:755 msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "revocaci嚙 aut嚙緯oma: useu \"gpg --import\" per a aplicar-la\n" +msgstr "revocaci籀 aut簷noma: useu \"gpg --import\" per a aplicar-la\n" #: g10/mainproc.c:823 msgid "Notation: " -msgstr "Notaci嚙: " +msgstr "Notaci籀: " #: g10/mainproc.c:835 msgid "Policy: " -msgstr "Pol嚙緣ica: " +msgstr "Pol穩tica: " #: g10/mainproc.c:1291 msgid "signature verification suppressed\n" -msgstr "s'ha eliminat la verificaci嚙 de signatura\n" +msgstr "s'ha eliminat la verificaci籀 de signatura\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" -msgstr "no es poden tractar aquestes signatures m嚙締tiples\n" +msgstr "no es poden tractar aquestes signatures m繳ltiples\n" -# 嚙%.*s嚙 no ser嚙 una data? Caldr嚙 嚙箴l嚙 al davant. ivb +# 竄%.*s罈 no ser una data? Caldr 竄el罈 al davant. ivb #: g10/mainproc.c:1352 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " -msgstr "La clau 嚙編 disponible en: " +msgstr "La clau 矇s disponible en: " #: g10/mainproc.c:1430 g10/mainproc.c:1463 msgid "BAD signature from \"" @@ -3920,19 +3846,18 @@ msgstr "No s'ha pogut comprovar la signa #: g10/mainproc.c:1664 g10/mainproc.c:1680 g10/mainproc.c:1766 msgid "not a detached signature\n" -msgstr "no 嚙編 una signatura separada\n" +msgstr "no 矇s una signatura separada\n" #: g10/mainproc.c:1707 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -"AV嚙磅: s'han detectat m嚙締tiples signatures. Nom嚙編 es comprovar嚙 la " -"primera.\n" +"AVS: s'han detectat m繳ltiples signatures. Nom矇s es comprovar la primera.\n" #: g10/mainproc.c:1715 #, c-format msgid "standalone signature of class 0x%02x\n" -msgstr "signatura aut嚙緯oma de classe 0x%02x\n" +msgstr "signatura aut簷noma de classe 0x%02x\n" #: g10/mainproc.c:1772 msgid "old style (PGP 2.x) signature\n" @@ -3940,50 +3865,49 @@ msgstr "signatura de l'estil antic (PGP #: g10/mainproc.c:1782 msgid "invalid root packet detected in proc_tree()\n" -msgstr "s'ha detectat un paquet arrel inv嚙締id en proc_tree()\n" +msgstr "s'ha detectat un paquet arrel invlid en proc_tree()\n" -# bolcats de mem嚙緝ia? ivb +# bolcats de mem簷ria? ivb #: g10/misc.c:99 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "no s'han pogut desactivar els bolcats de mem嚙緝ia: %s\n" +msgstr "no s'han pogut desactivar els bolcats de mem簷ria: %s\n" #: g10/misc.c:163 msgid "Experimental algorithms should not be used!\n" -msgstr "No haur嚙箴u d'usar algoritmes experimentals!\n" +msgstr "No haur穩eu d'usar algoritmes experimentals!\n" #: g10/misc.c:193 msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" -"aquest algoritme de xifratge est嚙 desaconsellat; useu-ne un de m嚙編 " -"est嚙緯dard!\n" +"aquest algoritme de xifratge est desaconsellat; useu-ne un de m矇s " +"estndard!\n" #: g10/misc.c:301 msgid "the IDEA cipher plugin is not present\n" -msgstr "el m嚙範ul de xifratge IDEA no est嚙 present\n" +msgstr "el m簷dul de xifratge IDEA no est present\n" #: g10/misc.c:302 msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" -msgstr "" -"vegeu http://www.gnupg.org/why-not-idea.html per a m嚙編 informaci嚙穀n" +msgstr "vegeu http://www.gnupg.org/why-not-idea.html per a m矇s informaci籀\n" #: g10/misc.c:534 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" -msgstr "%s:%d: l'opci嚙 嚙%s嚙 est嚙 desaconsellada.\n" +msgstr "%s:%d: l'opci籀 竄%s罈 est desaconsellada.\n" #: g10/misc.c:538 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" -msgstr "AV嚙磅: %s 嚙編 una opci嚙 desaconsellada.\n" +msgstr "AVS: %s 矇s una opci籀 desaconsellada.\n" #: g10/misc.c:540 #, c-format msgid "please use \"%s%s\" instead\n" -msgstr "si us plau, utilitzeu 嚙%s%s嚙 en el seu lloc\n" +msgstr "si us plau, utilitzeu 竄%s%s罈 en el seu lloc\n" -# G嚙緯ere? Nombre? Passat, futur? ivb +# G癡nere? Nombre? Passat, futur? ivb # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm #: g10/misc.c:551 @@ -3998,22 +3922,21 @@ msgstr "aquest missatge pot no ser usabl #: g10/parse-packet.c:119 #, c-format msgid "can't handle public key algorithm %d\n" -msgstr "no es pot treballar amb l'algoritme de clau p嚙箭lica %d\n" +msgstr "no es pot treballar amb l'algoritme de clau p繳blica %d\n" #: g10/parse-packet.c:688 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -"AV嚙磅: la clau de sessi嚙 pot estar xifrada sim嚙緣ricament de forma " -"insegura\n" +"AVS: la clau de sessi籀 pot estar xifrada sim癡tricament de forma insegura\n" #: g10/parse-packet.c:1106 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "el subpaquet de tipus %d t嚙 el bit cr嚙緣ic activat\n" +msgstr "el subpaquet de tipus %d t矇 el bit cr穩tic activat\n" #: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" -msgstr "gpg-agent no est嚙 disponible en aquesta sessi嚙穀n" +msgstr "gpg-agent no est disponible en aquesta sessi籀\n" #: g10/passphrase.c:467 msgid "can't set client pid for the agent\n" @@ -4030,27 +3953,27 @@ msgstr "no es pot fer que el servidor es #: g10/passphrase.c:515 msgid "malformed GPG_AGENT_INFO environment variable\n" -msgstr "la variable d'entorn GPG_AGENT_INFO 嚙編 malformada\n" +msgstr "la variable d'entorn GPG_AGENT_INFO 矇s malformada\n" #: g10/passphrase.c:528 #, 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" +msgstr "la versi籀 %d del protocol de gpg-agent no est suportada\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" -msgstr "no s'ha pogut connectar amb 嚙%s嚙: %s\n" +msgstr "no s'ha pogut connectar amb 竄%s罈: %s\n" #: g10/passphrase.c:571 msgid "communication problem with gpg-agent\n" -msgstr "hi ha un problema de comunicaci嚙 amb el gpg-agent\n" +msgstr "hi ha un problema de comunicaci籀 amb el gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" -msgstr "hi ha un problema amb l'agent: es deshabilitar嚙 el seu 嚙編\n" +msgstr "hi ha un problema amb l'agent: es deshabilitar el seu 繳s\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID de la clau principal %08lX)" @@ -4058,14 +3981,14 @@ msgstr " (ID de la clau principal %08lX) # Com es canvia l'ordre dels arguments? jm # Ah, bingo! jm # Uh, ara torna a donar error. FIXME -# La idea 嚙編 ficar: +# La idea 矇s ficar: # "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n" -# "嚙%1$.*s嚙穀n" +# "竄%1$.*s罈\n" # "clau %3$s de %2$u bits, ID %4$08lX, creada en %5$s%6$s\n" # jm -# Se't passava l'argument 嚙*嚙. printf(3), hieroglyph(7). ivb +# Se't passava l'argument 竄*罈. printf(3), hieroglyph(7). ivb # Ah! Prova-ho, no casque alguna cosa :P ivb -# Ah, ja veig! Moltes gr嚙箱ies! Aquest msgstr ha quedat curi嚙編 :) jm +# Ah, ja veig! Moltes grcies! Aquest msgstr ha quedat curi籀s :) jm #: g10/passphrase.c:690 #, c-format msgid "" @@ -4074,7 +3997,7 @@ msgid "" "%u-bit %s key, ID %08lX, created %s%s\n" msgstr "" "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n" -"嚙%2$.*1$s嚙穀n" +"竄%2$.*1$s罈\n" "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n" #: g10/passphrase.c:712 @@ -4083,26 +4006,26 @@ msgstr "Repetiu la contrasenya\n" #: g10/passphrase.c:714 msgid "Enter passphrase\n" -msgstr "Introdu嚙線 la contrasenya\n" +msgstr "Introdu簿u la contrasenya\n" #: g10/passphrase.c:752 msgid "passphrase too long\n" -msgstr "la contrasenya 嚙編 massa llarga\n" +msgstr "la contrasenya 矇s massa llarga\n" #: g10/passphrase.c:765 msgid "invalid response from agent\n" -msgstr "la resposta de l'agent 嚙編 inv嚙締ida\n" +msgstr "la resposta de l'agent 矇s invlida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" -msgstr "s'ha cancel嚙締at per l'usuari\n" +msgstr "s'ha cancel繚lat per l'usuari\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4112,31 +4035,31 @@ msgstr "" "Necessiteu la contrasenya per desblocar la clau secreta de\n" "l'usuari: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" -msgstr "no es pot demanar la contrasenya en mode desat嚙編\n" +msgstr "no es pot demanar la contrasenya en mode desat癡s\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " -msgstr "Introdu嚙線 la contrasenya: " +msgstr "Introdu簿u la contrasenya: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " #: g10/plaintext.c:87 msgid "data not saved; use option \"--output\" to save it\n" -msgstr "les dades no s'han desat; useu l'opci嚙 \"--output\" per desar-les\n" +msgstr "les dades no s'han desat; useu l'opci籀 \"--output\" per desar-les\n" #: g10/plaintext.c:128 #, c-format msgid "error creating `%s': %s\n" -msgstr "error en crear 嚙%s嚙: %s\n" +msgstr "error en crear 竄%s罈: %s\n" # Indi? ivb # Em pense que no. jm @@ -4146,11 +4069,11 @@ msgstr "Signatura separada.\n" #: g10/plaintext.c:409 msgid "Please enter name of data file: " -msgstr "Introdu嚙線 el nom del fitxer de dades: " +msgstr "Introdu簿u el nom del fitxer de dades: " #: g10/plaintext.c:430 msgid "reading stdin ...\n" -msgstr "s'est嚙 llegint d'stdin...\n" +msgstr "s'est llegint d'stdin...\n" #: g10/plaintext.c:464 msgid "no signed data\n" @@ -4166,26 +4089,25 @@ msgstr "no s'han pogut obrir les dades s #: g10/pubkey-enc.c:101 #, c-format msgid "anonymous recipient; trying secret key %08lX ...\n" -msgstr "el destinatari 嚙編 an嚙緯im; es provar嚙 la clau secreta %08lX ...\n" +msgstr "el destinatari 矇s an簷nim; es provar la clau secreta %08lX ...\n" #: g10/pubkey-enc.c:107 msgid "okay, we are the anonymous recipient.\n" -msgstr "d'acord, som el destinatari an嚙緯im.\n" +msgstr "d'acord, som el destinatari an簷nim.\n" #: g10/pubkey-enc.c:159 msgid "old encoding of the DEK is not supported\n" -msgstr "la codificaci嚙 antiga del DEK no est嚙 suportada\n" +msgstr "la codificaci籀 antiga del DEK no est suportada\n" #: g10/pubkey-enc.c:178 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" -msgstr "l'algoritme de xifratge %d%s 嚙編 desconegut o est嚙 desactivat\n" +msgstr "l'algoritme de xifratge %d%s 矇s desconegut o est desactivat\n" #: g10/pubkey-enc.c:216 #, c-format msgid "NOTE: cipher algorithm %d not found in preferences\n" -msgstr "" -"NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer嚙緯cies\n" +msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer癡ncies\n" #: g10/pubkey-enc.c:237 #, c-format @@ -4196,41 +4118,41 @@ msgstr "NOTA: la clau secreta %08lX cadu msgid "NOTE: key has been revoked" msgstr "NOTA: aquesta clau ha estat revocada!" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" -msgstr "s'est嚙 sol嚙締icitant la clau %08lX de %s\n" +msgstr "s'est sol繚licitant la clau %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "no s'ha pogut obtenir del servidor la clau: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" -msgstr "error mentre s'enviava a 嚙%s嚙: %s\n" +msgstr "error mentre s'enviava a 竄%s罈: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" -msgstr "l'enviament a 嚙%s嚙 ha tingut 嚙綞it (status=%u)\n" +msgstr "l'enviament a 竄%s罈 ha tingut 癡xit (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" -msgstr "l'enviament a 嚙%s嚙 ha fallat: status=%u\n" +msgstr "l'enviament a 竄%s罈 ha fallat: status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "aquest servidor de claus no suporta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" -msgstr "s'est嚙 cercant 嚙%s嚙 al servidor HKP %s\n" +msgstr "s'est cercant 竄%s罈 al servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "no es pot cercar el servidor de claus: %s\n" @@ -4243,16 +4165,16 @@ msgstr "parts de la clau secreta no esta #: g10/seckey-cert.c:59 #, c-format msgid "protection algorithm %d%s is not supported\n" -msgstr "l'algoritme de protecci嚙 %d%s no est嚙 suportat\n" +msgstr "l'algoritme de protecci籀 %d%s no est suportat\n" #: g10/seckey-cert.c:70 -#, fuzzy, c-format +#, c-format msgid "protection digest %d is not supported\n" -msgstr "l'algoritme de protecci嚙 %d%s no est嚙 suportat\n" +msgstr "l'algoritme de protecci籀 %d no est suportat\n" #: g10/seckey-cert.c:239 msgid "Invalid passphrase; please try again" -msgstr "La contrasenya no 嚙編 v嚙締ida; torneu a intentar-ho" +msgstr "La contrasenya no 矇s vlida; torneu a intentar-ho" #: g10/seckey-cert.c:240 #, c-format @@ -4261,17 +4183,17 @@ msgstr "%s ...\n" #: g10/seckey-cert.c:297 msgid "WARNING: Weak key detected - please change passphrase again.\n" -msgstr "AV嚙磅: la clau 嚙編 feble; per favor, canvieu la contrasenya.\n" +msgstr "AVS: la clau 矇s feble; per favor, canvieu la contrasenya.\n" #: g10/seckey-cert.c:335 msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "" -"s'est嚙 generant la suma de comprovaci嚙 desaconsellada de 16-bits per a " -"la protecci嚙 de la clau secreta\n" +"s'est generant la suma de comprovaci籀 desaconsellada de 16-bits per a la " +"protecci籀 de la clau secreta\n" #: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" -msgstr "AV嚙磅: conflicte de signatures digest en el missatge\n" +msgstr "AVS: conflicte de signatures digest en el missatge\n" #: g10/sig-check.c:93 #, c-format @@ -4290,18 +4212,17 @@ msgid "" "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " "signatures!\n" msgstr "" -"clau %08lX: aquesta 嚙編 una clau ElGamal que NO 嚙編 segura per a " -"signatures!\n" +"clau %08lX: aquesta 矇s una clau ElGamal que NO 矇s segura per a signatures!\n" #: g10/sig-check.c:242 #, c-format msgid "public key %08lX is %lu second newer than the signature\n" -msgstr "la clau p嚙箭lica %08lX 嚙編 %lu segons anterior a la signatura\n" +msgstr "la clau p繳blica %08lX 矇s %lu segons anterior a la signatura\n" #: g10/sig-check.c:243 #, c-format msgid "public key %08lX is %lu seconds newer than the signature\n" -msgstr "la clau p嚙箭lica %08lX 嚙編 %lu segons anterior a la signatura\n" +msgstr "la clau p繳blica %08lX 矇s %lu segons anterior a la signatura\n" #: g10/sig-check.c:252 #, c-format @@ -4332,58 +4253,58 @@ msgstr "NOTA: la clau de signatura %08lX #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" msgstr "" -"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit " -"cr嚙緣ic desconegut\n" +"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit cr穩tic " +"desconegut\n" #: g10/sig-check.c:614 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" msgstr "" -"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocaci嚙穀n" +"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocaci籀\n" #: g10/sig-check.c:640 #, c-format msgid "key %08lX: no subkey for subkey binding signature\n" msgstr "" -"clau %08lX: no hi ha una subclau per a la signatura de l'enlla嚙 de la " +"clau %08lX: no hi ha una subclau per a la signatura de l'enlla癟 de la " "subclau\n" #: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" msgstr "" -"no es poden ficar dades de notaci嚙 dins de signatures v3 (estil PGP 2.x)\n" +"no es poden ficar dades de notaci籀 dins de signatures v3 (estil PGP 2.x)\n" #: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" msgstr "" -"no es poden ficar dades de notaci嚙 dins de signatures de clau v3 (estil " -"PGP 2.x)\n" +"no es poden ficar dades de notaci籀 dins de signatures de clau v3 (estil PGP " +"2.x)\n" #: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "" -"AV嚙磅: no s'ha pogut %%-expandir la notaci嚙 (massa gran). S'utilitza no " +"AVS: no s'ha pogut %%-expandir la notaci籀 (massa gran). S'utilitza no " "expandida.\n" #: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" msgstr "" -"no es pot ficar una URL de pol嚙緣ica dins de signatures v3 (estil PGP 2.x)\n" +"no es pot ficar una URL de pol穩tica dins de signatures v3 (estil PGP 2.x)\n" #: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" msgstr "" -"no es pot ficar una URL de pol嚙緣ica dins de signatures de clau v3 (estil " -"PGP 2.x)\n" +"no es pot ficar una URL de pol穩tica dins de signatures de clau v3 (estil PGP " +"2.x)\n" #: g10/sign.c:158 #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" msgstr "" -"AV嚙磅: no s'ha pogut %%-expandir l'url de pol嚙緣ica (massa gran). " -"S'utilitza no expandida.\n" +"AVS: no s'ha pogut %%-expandir l'url de pol穩tica (massa gran). S'utilitza " +"no expandida.\n" #: g10/sign.c:313 #, c-format @@ -4393,18 +4314,18 @@ msgstr "no s'ha pogut comprovar la signa #: g10/sign.c:322 #, c-format msgid "%s signature from: \"%s\"\n" -msgstr "%s signatura de: 嚙%s嚙穀n" +msgstr "%s signatura de: 竄%s罈\n" #: g10/sign.c:473 #, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "AV嚙磅: 嚙%s嚙 嚙編 un fitxer buit\n" +msgstr "AVS: 竄%s罈 矇s un fitxer buit\n" #: g10/sign.c:659 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -"nom嚙編 podeu fer signatures separades amb claus d'estil PGP 2.x mentre " -"esteu en mode --pgp2\n" +"nom矇s podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu " +"en mode --pgp2\n" #: g10/sign.c:683 g10/sign.c:919 #, c-format @@ -4415,8 +4336,7 @@ msgstr "no s'ha pogut creat %s: %s\n" #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" -"for嚙窮r l'algoritme de digest %s (%d) viola les prefer嚙緯cies del " -"destinatari\n" +"for癟ar l'algoritme de digest %s (%d) viola les prefer癡ncies del destinatari\n" #: g10/sign.c:804 msgid "signing:" @@ -4425,38 +4345,38 @@ msgstr "signatura:" #: g10/sign.c:903 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -"nom嚙編 podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n" +"nom矇s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n" #: g10/sign.c:1057 #, c-format msgid "%s encryption will be used\n" -msgstr "s'utilitzar嚙 xifratge %s\n" +msgstr "s'utilitzar xifratge %s\n" #: g10/textfilter.c:134 #, c-format msgid "can't handle text lines longer than %d characters\n" -msgstr "no es poden tractar l嚙緯ies m嚙編 llargues de %d car嚙箱ters\n" +msgstr "no es poden tractar l穩nies m矇s llargues de %d carcters\n" #: g10/textfilter.c:231 #, c-format msgid "input line longer than %d characters\n" -msgstr "la l嚙緯ia d'entrada 嚙編 superior a %d car嚙箱ters\n" +msgstr "la l穩nia d'entrada 矇s superior a %d carcters\n" #: g10/tdbio.c:128 g10/tdbio.c:1410 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "reg de la base de dades de confian嚙窮 %lu: ha fallat lseek: %s\n" +msgstr "reg de la base de dades de confian癟a %lu: ha fallat lseek: %s\n" #: g10/tdbio.c:134 g10/tdbio.c:1417 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" -"reg de la base de dades de confian嚙窮 %lu: ha fallat la escriptura (n=%d): %" +"reg de la base de dades de confian癟a %lu: ha fallat la escriptura (n=%d): %" "s\n" #: g10/tdbio.c:244 msgid "trustdb transaction too large\n" -msgstr "la transacci嚙 de la base de dades de confian嚙窮 嚙編 massa gran\n" +msgstr "la transacci籀 de la base de dades de confian癟a 矇s massa gran\n" #: g10/tdbio.c:471 #, c-format @@ -4488,72 +4408,72 @@ msgstr "%s: no s'ha pogut crear: %s\n" #: g10/tdbio.c:519 #, c-format msgid "%s: failed to create version record: %s" -msgstr "%s: no s'ha pogut crear un registre de versi嚙: %s" +msgstr "%s: no s'ha pogut crear un registre de versi籀: %s" #: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s: s'ha creat una base de dades de confian嚙窮 inv嚙締ida\n" +msgstr "%s: s'ha creat una base de dades de confian癟a invlida\n" #: g10/tdbio.c:526 #, c-format msgid "%s: trustdb created\n" -msgstr "%s: s'ha creat la base de dades de confian嚙窮\n" +msgstr "%s: s'ha creat la base de dades de confian癟a\n" #: g10/tdbio.c:566 msgid "NOTE: trustdb not writable\n" -msgstr "NOTA: no es pot escriure en la base de dades de confian嚙窮\n" +msgstr "NOTA: no es pot escriure en la base de dades de confian癟a\n" #: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" -msgstr "%s: la base de dades de confian嚙窮 嚙編 inv嚙締ida\n" +msgstr "%s: la base de dades de confian癟a 矇s invlida\n" #: g10/tdbio.c:614 #, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "%s: no s'ha pogut crear la taula de dispersi嚙: %s\n" +msgstr "%s: no s'ha pogut crear la taula de dispersi籀: %s\n" #: g10/tdbio.c:622 #, c-format msgid "%s: error updating version record: %s\n" -msgstr "%s: error en actualitzar el registre de la versi嚙: %s\n" +msgstr "%s: error en actualitzar el registre de la versi籀: %s\n" #: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 #: g10/tdbio.c:1343 g10/tdbio.c:1370 #, c-format msgid "%s: error reading version record: %s\n" -msgstr "%s: error en llegir el registre de la versi嚙: %s\n" +msgstr "%s: error en llegir el registre de la versi籀: %s\n" #: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" -msgstr "%s: error en escriure el registre de la versi?: %s\n" +msgstr "%s: error en escriure el registre de la versi籀: %s\n" #: g10/tdbio.c:1141 #, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "base de dades de confian嚙窮: ha fallat lseek: %s\n" +msgstr "base de dades de confian癟a: ha fallat lseek: %s\n" #: g10/tdbio.c:1149 #, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "base de dades de confian嚙窮: ha fallat la lectura (n=%d): %s\n" +msgstr "base de dades de confian癟a: ha fallat la lectura (n=%d): %s\n" #: g10/tdbio.c:1170 #, c-format msgid "%s: not a trustdb file\n" -msgstr "%s no 嚙編 un fitxer de base de dades de confian嚙窮\n" +msgstr "%s no 矇s un fitxer de base de dades de confian癟a\n" #: g10/tdbio.c:1188 #, c-format msgid "%s: version record with recnum %lu\n" -msgstr "%s: registre de versi嚙 amb n嚙練ero de registre %lu\n" +msgstr "%s: registre de versi籀 amb n繳mero de registre %lu\n" #: g10/tdbio.c:1193 #, c-format msgid "%s: invalid file version %d\n" -msgstr "%s: la versi嚙 de fitxer %d 嚙編 inv嚙締ida\n" +msgstr "%s: la versi籀 de fitxer %d 矇s invlida\n" #: g10/tdbio.c:1376 #, c-format @@ -4578,13 +4498,13 @@ msgstr "%s: no s'ha pogut afegir un regi #: g10/tdbio.c:1469 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"la base de dades de confian嚙窮 est嚙 corrompuda; per favor, executeu " -"嚙篇pg --fix-trustdb嚙.\n" +"la base de dades de confian癟a est corrompuda; per favor, executeu 竄gpg --" +"fix-trustdb罈.\n" #: g10/trustdb.c:201 #, c-format msgid "`%s' is not a valid long keyID\n" -msgstr "嚙%s嚙 no 嚙編 un ID de clau llarg v嚙締id\n" +msgstr "竄%s罈 no 矇s un ID de clau llarg vlid\n" #: g10/trustdb.c:236 #, c-format @@ -4595,13 +4515,13 @@ msgstr "clau %08lX: s'accepta com a clau #, c-format msgid "key %08lX occurs more than once in the trustdb\n" msgstr "" -"la clau %08lX apareix m嚙編 d'una vegada en la base de dades de confian嚙窮\n" +"la clau %08lX apareix m矇s d'una vegada en la base de dades de confian癟a\n" #: g10/trustdb.c:289 #, c-format msgid "key %08lX: no public key for trusted key - skipped\n" msgstr "" -"clau %08lX: no hi ha una clau p嚙箭lica per a la clau fiable - es descarta\n" +"clau %08lX: no hi ha una clau p繳blica per a la clau fiable - es descarta\n" #: g10/trustdb.c:298 #, c-format @@ -4611,34 +4531,33 @@ msgstr "s'ha marcat la clau %08lX com co #: g10/trustdb.c:324 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "registre de confian嚙窮 %lu, tipus %d: no s'ha pogut llegir: %s\n" +msgstr "registre de confian癟a %lu, tipus %d: no s'ha pogut llegir: %s\n" #: g10/trustdb.c:330 #, c-format msgid "trust record %lu is not of requested type %d\n" -msgstr "el registre de confian嚙窮 %lu no 嚙編 del tipus demanat %d\n" +msgstr "el registre de confian癟a %lu no 矇s del tipus demanat %d\n" #: g10/trustdb.c:345 g10/tdbdump.c:59 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "registre de confian嚙窮 %lu, tipus %d: no s'ha pogut escriure: %s\n" +msgstr "registre de confian癟a %lu, tipus %d: no s'ha pogut escriure: %s\n" #: g10/trustdb.c:360 g10/tdbdump.c:217 #, c-format msgid "trustdb: sync failed: %s\n" -msgstr "base de dades de confian嚙窮: no s'ha pogut sincronitzar: %s\n" +msgstr "base de dades de confian癟a: no s'ha pogut sincronitzar: %s\n" #: g10/trustdb.c:459 msgid "no need for a trustdb check\n" msgstr "" -"no 嚙編 necess嚙緝ia una comprovaci嚙 de la base de dades de confian嚙窮\n" +"no 矇s necessria una comprovaci籀 de la base de dades de confian癟a\n" "\n" #: g10/trustdb.c:465 g10/trustdb.c:1814 #, c-format msgid "next trustdb check due at %s\n" -msgstr "" -"la pr?xima comprovaci嚙 de la base de dades de confian嚙窮 ser嚙 el %s\n" +msgstr "la pr簷xima comprovaci籀 de la base de dades de confian癟a ser el %s\n" #: g10/trustdb.c:835 msgid "please do a --check-trustdb\n" @@ -4646,12 +4565,12 @@ msgstr "si us plau, feu un --check-trust #: g10/trustdb.c:839 msgid "checking the trustdb\n" -msgstr "s'est嚙 comprovant la base de dades de confian嚙窮\n" +msgstr "s'est comprovant la base de dades de confian癟a\n" #: g10/trustdb.c:1045 #, c-format msgid "public key %08lX not found: %s\n" -msgstr "no s'ha trobat la clau p嚙箭lica %08lX: %s\n" +msgstr "no s'ha trobat la clau p繳blica %08lX: %s\n" #: g10/trustdb.c:1203 #, c-format @@ -4670,23 +4589,20 @@ msgstr "s'han processat %d claus (s'han #: g10/trustdb.c:1666 msgid "no ultimately trusted keys found\n" -msgstr "no s'han trobat claus amb confian嚙窮 absoluta\n" +msgstr "no s'han trobat claus amb confian癟a absoluta\n" #: g10/trustdb.c:1680 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" -"no s'ha trobat la clau p嚙箭lica de la clau amb confian嚙窮 absoluta %08lX\n" +"no s'ha trobat la clau p繳blica de la clau amb confian癟a absoluta %08lX\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" msgstr "" -"s'est嚙 comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%" -"d/%d\n" +"s'est comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/" +"%d\n" #: g10/verify.c:110 msgid "" @@ -4696,34 +4612,33 @@ msgid "" msgstr "" "no s'ha pogut verificar la signatura.\n" "Recordeu que el fitxer de signatura (.sig o .asc)\n" -"ha de ser el primer que figure en la l嚙緯ia d'ordres.\n" +"ha de ser el primer que figure en la l穩nia d'ordres.\n" -# LF -> fi de l嚙緯ia? ivb +# LF -> fi de l穩nia? ivb #: g10/verify.c:177 #, c-format msgid "input line %u too long or missing LF\n" -msgstr "" -"la l嚙緯ia d'entrada %u 嚙編 massa llarga o hi falta un f嚙 de l嚙緯ia\n" +msgstr "la l穩nia d'entrada %u 矇s massa llarga o hi falta un f穩 de l穩nia\n" #: g10/skclist.c:129 g10/skclist.c:185 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" -"la clau no est嚙 marcada com a insegura - no es pot utilitzar amb el GNA " +"la clau no est marcada com a insegura - no es pot utilitzar amb el GNA " "fals!\n" #: g10/skclist.c:157 #, c-format msgid "skipped `%s': duplicated\n" -msgstr "es descarta 嚙%s嚙: duplicat\n" +msgstr "es descarta 竄%s罈: duplicat\n" #: g10/skclist.c:164 g10/skclist.c:172 #, c-format msgid "skipped `%s': %s\n" -msgstr "es descarta 嚙%s嚙: %s\n" +msgstr "es descarta 竄%s罈: %s\n" #: g10/skclist.c:168 msgid "skipped: secret key already present\n" -msgstr "es descarta: la clau secreta ja 嚙編 present\n" +msgstr "es descarta: la clau secreta ja 矇s present\n" #: g10/skclist.c:179 #, c-format @@ -4731,14 +4646,13 @@ msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"es descarta 嚙%s嚙: 嚙編 una clau ElGamal generada per PGP que no 嚙編 " -"segura per a signatures!\n" +"es descarta 竄%s罈: 矇s una clau ElGamal generada per PGP que no 矇s segura per " +"a signatures!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " -msgstr "El fitxer 嚙%s嚙 existeix. " +msgstr "El fitxer 竄%s罈 existeix. " #: g10/openfile.c:86 msgid "Overwrite (y/N)? " @@ -4747,33 +4661,32 @@ msgstr "Voleu sobreescriure? (s/N) " #: g10/openfile.c:119 #, c-format msgid "%s: unknown suffix\n" -msgstr "%s: el sufix 嚙編 desconegut\n" +msgstr "%s: el sufix 矇s desconegut\n" #: g10/openfile.c:141 msgid "Enter new filename" -msgstr "Introdu嚙線 el nou nom del fitxer" +msgstr "Introdu簿u el nou nom del fitxer" # Indi? ivb #: g10/openfile.c:184 msgid "writing to stdout\n" -msgstr "s'est嚙 escrivint en stdout\n" +msgstr "s'est escrivint en stdout\n" #: g10/openfile.c:284 #, c-format msgid "assuming signed data in `%s'\n" -msgstr "s'asumeix que hi ha dades signades en 嚙%s嚙穀n" +msgstr "s'asumeix que hi ha dades signades en 竄%s罈\n" #: g10/openfile.c:352 #, c-format msgid "new configuration file `%s' created\n" -msgstr "s'ha creat el nou fitxer d'opcions 嚙%s嚙穀n" +msgstr "s'ha creat el nou fitxer d'opcions 竄%s罈\n" #: g10/openfile.c:354 #, c-format msgid "WARNING: options in `%s' are not yet active during this run\n" msgstr "" -"AV嚙磅: les opcions en 嚙%s嚙 encara no estan actives durant aquesta " -"execuci嚙穀n" +"AVS: les opcions en 竄%s罈 encara no estan actives durant aquesta execuci籀\n" #: g10/openfile.c:383 #, c-format @@ -4785,14 +4698,14 @@ msgstr "%s: no s'ha pogut crear el direc msgid "%s: directory created\n" msgstr "%s: s'ha creat el directori\n" -# 嚙編 no-wrap? ivb +# s no-wrap? ivb # Com? jm #: g10/encr-data.c:91 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"ATENCI嚙: el missatge s'ha xifrat amb una clau feble durant el xifratge\n" -"sim嚙緣ric.\n" +"ATENCI: el missatge s'ha xifrat amb una clau feble durant el xifratge\n" +"sim癡tric.\n" #: g10/encr-data.c:98 msgid "problem handling encrypted packet\n" @@ -4802,27 +4715,27 @@ msgstr "problema en tractar amb un paque msgid "weak key created - retrying\n" msgstr "s'hi ha creat una clau feble - reintent\n" -# 嚙編 no-wrap? ivb +# s no-wrap? ivb #: g10/seskey.c:57 #, c-format msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -"no s'ha pogut evitar una clau feble per a xifratge sim嚙緣ric;\n" +"no s'ha pogut evitar una clau feble per a xifratge sim癡tric;\n" "hi ha hagut %d intents!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" -msgstr "DSA requereix l'嚙編 d'un algoritme de dispersi嚙 de 160 bits\n" +msgstr "DSA requereix l'繳s d'un algoritme de dispersi籀 de 160 bits\n" #: g10/delkey.c:121 g10/delkey.c:128 msgid "(unless you specify the key by fingerprint)\n" msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n" -# Ah嚙! Abans 嚙箭atch嚙 est嚙 tal qual. Cal unificar. ivb +# Ah! Abans 竄batch罈 est tal qual. Cal unificar. ivb # Fet. jm #: g10/delkey.c:127 msgid "can't do that in batchmode without \"--yes\"\n" -msgstr "no es pot fer aix嚙 en el mode desat嚙編 sense 嚙--yes嚙穀n" +msgstr "no es pot fer aix簷 en el mode desat癡s sense 竄--yes罈\n" #: g10/delkey.c:151 msgid "Delete this key from the keyring? " @@ -4830,7 +4743,7 @@ msgstr "Voleu esborrar aquesta clau de l #: g10/delkey.c:159 msgid "This is a secret key! - really delete? " -msgstr "嚙編 una clau secreta! Voleu esborrar-la? " +msgstr "s una clau secreta! Voleu esborrar-la? " #: g10/delkey.c:169 #, c-format @@ -4839,17 +4752,16 @@ msgstr "no s'ha pogut eliminar el bloc d #: g10/delkey.c:179 msgid "ownertrust information cleared\n" -msgstr "s'ha netejat la informaci嚙 de la confian嚙窮\n" +msgstr "s'ha netejat la informaci籀 de la confian癟a\n" #: g10/delkey.c:207 #, c-format msgid "there is a secret key for public key \"%s\"!\n" -msgstr "hi ha una clau secreta per a la clau p嚙箭lica 嚙%s嚙!\n" +msgstr "hi ha una clau secreta per a la clau p繳blica 竄%s罈!\n" #: g10/delkey.c:209 msgid "use option \"--delete-secret-keys\" to delete it first.\n" -msgstr "" -"utilitzeu l'opci嚙 嚙--delete-secret-keys嚙 per a eliminar-la primer.\n" +msgstr "utilitzeu l'opci籀 竄--delete-secret-keys罈 per a eliminar-la primer.\n" #: g10/helptext.c:47 msgid "" @@ -4857,11 +4769,9 @@ msgid "" "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" "to do with the (implicitly created) web-of-certificates." msgstr "" -"L'assignaci嚙 d'un valor ac嚙 嚙編 cosa vostra; aquest valor mai " -"s'exportar嚙穀n" -"a cap tercer. Ho necessitem per a implementar la xarxa de confian嚙窮; no " -"t嚙穀n" -"res a veure amb la xarxa de certificats (creada impl嚙箱itament)." +"L'assignaci籀 d'un valor ac穩 矇s cosa vostra; aquest valor mai s'exportar\n" +"a cap tercer. Ho necessitem per a implementar la xarxa de confian癟a; no t矇\n" +"res a veure amb la xarxa de certificats (creada impl穩citament)." #: g10/helptext.c:53 msgid "" @@ -4870,31 +4780,26 @@ msgid "" "access to the secret key. Answer \"yes\" to set this key to\n" "ultimately trusted\n" msgstr "" -"Per a construir la xarxa de confian嚙窮, GnuPG necessita saber quines claus\n" -"tenen confian嚙窮 absoluta - aquestes s嚙緯 normalment les claus per a les " -"que\n" -"teniu acc嚙編 a la clau secreta. Contesteu 嚙編嚙踝蕭 per a donar a aquesta " -"clau\n" -"confian嚙窮 absoluta\n" +"Per a construir la xarxa de confian癟a, GnuPG necessita saber quines claus\n" +"tenen confian癟a absoluta - aquestes s籀n normalment les claus per a les que\n" +"teniu acc矇s a la clau secreta. Contesteu 竄s穩罈 per a donar a aquesta clau\n" +"confian癟a absoluta\n" #: g10/helptext.c:60 msgid "If you want to use this revoked key anyway, answer \"yes\"." -msgstr "" -"Si voleu utilitzar aquesta clau revocada de totes maneres, dieu 嚙編嚙踝蕭." +msgstr "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu 竄s穩罈." # "clau no confiable"? jm -# No fiable, no de confian嚙窮, no de fiar... ivb +# No fiable, no de confian癟a, no de fiar... ivb #: g10/helptext.c:64 msgid "If you want to use this untrusted key anyway, answer \"yes\"." msgstr "" -"Si voleu utilitzar aquesta clau no de confian嚙窮 de totes maneres, dieu " -"嚙編嚙踝蕭." +"Si voleu utilitzar aquesta clau no de confian癟a de totes maneres, dieu 竄s穩罈." #: g10/helptext.c:68 msgid "" "Enter the user ID of the addressee to whom you want to send the message." -msgstr "" -"Introdu嚙線 l'ID d'usuari de la persona a qui voleu enviar el missatge." +msgstr "Introdu簿u l'ID d'usuari de la persona a qui voleu enviar el missatge." #: g10/helptext.c:72 msgid "" @@ -4918,27 +4823,24 @@ msgid "" msgstr "" "Seleccioneu l'algoritme a utilitzar.\n" "\n" -"DSA (tamb嚙 conegut com a DSS) 嚙編 el algorisme de signatura digital que " -"nom嚙編\n" -"pot ser utilitzat per a signatures. Aquest 嚙編 el algoritme suggerit " -"perqu嚙穀n" -"la comprovaci嚙 de signatures DSA 嚙編 molt m嚙編 r嚙緘ida que les " -"d'ElGamal.\n" +"DSA (tamb矇 conegut com a DSS) 矇s el algorisme de signatura digital que " +"nom矇s\n" +"pot ser utilitzat per a signatures. Aquest 矇s el algoritme suggerit perqu癡\n" +"la comprovaci籀 de signatures DSA 矇s molt m矇s rpida que les d'ElGamal.\n" "\n" -"ElGamal 嚙編 un algorisme que es pot utilitzar per a signatures i xifratge.\n" -"OpenPGP distingueix entre 2 variants d'aquest algorisme: una de nom嚙編 " +"ElGamal 矇s un algorisme que es pot utilitzar per a signatures i xifratge.\n" +"OpenPGP distingueix entre 2 variants d'aquest algorisme: una de nom矇s " "xifratge\n" -"i una de signatura+xifratge; en veritat 嚙編 el mateix, per嚙 alguns " -"par嚙練etres\n" -"han de seleccionar-se d'una manera especial per a crear claus m嚙編 segures\n" -"per a signatures: aquest programa fa a嚙踝蕭, per嚙 altres implementacions\n" +"i una de signatura+xifratge; en veritat 矇s el mateix, per簷 alguns " +"parmetres\n" +"han de seleccionar-se d'una manera especial per a crear claus m矇s segures\n" +"per a signatures: aquest programa fa a癟簷, per簷 altres implementacions\n" "d'OpenPGP no estan obligades a entendre la variant signatura+xifratge.\n" "\n" -"La primera clau (prim嚙緝ia) ha de ser sempre una clau que siga capa嚙 de " +"La primera clau (primria) ha de ser sempre una clau que siga capa癟 de " "signar;\n" -"aquesta 嚙編 la ra嚙 per la qual la clau de nom嚙編 xifratge ElGamal no " -"est嚙穀n" -"disponible en aquest men嚙." +"aquesta 矇s la ra籀 per la qual la clau de nom矇s xifratge ElGamal no est\n" +"disponible en aquest men繳." #: g10/helptext.c:92 msgid "" @@ -4947,8 +4849,8 @@ msgid "" "with them are quite large and very slow to verify." msgstr "" "Encara que aquestes claus estan definides en RFC2440, no es recomanen\n" -"perqu嚙 no tots els programes hi poden treballar i perqu嚙 les\n" -"signatures que generen s嚙緯 molt llargues i lentes de verificar." +"perqu癡 no tots els programes hi poden treballar i perqu癡 les\n" +"signatures que generen s籀n molt llargues i lentes de verificar." #: g10/helptext.c:98 msgid "" @@ -4956,18 +4858,18 @@ msgid "" "encryption. This algorithm should only be used in certain domains.\n" "Please consult your security expert first." msgstr "" -"En general no 嚙編 bona idea utilitzar la mateixa clau per a signar i\n" -"xifrar. Aquest algoritme nom嚙編 s'hauria d'usar en tasques concretes.\n" +"En general no 矇s bona idea utilitzar la mateixa clau per a signar i\n" +"xifrar. Aquest algoritme nom矇s s'hauria d'usar en tasques concretes.\n" "Si us plau, consulteu al vostre expert en seguretat primer." #: g10/helptext.c:105 msgid "Enter the size of the key" -msgstr "Introdu嚙線 la grand嚙緝ia de la clau" +msgstr "Introdu簿u la grandria de la clau" #: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158 #: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196 msgid "Answer \"yes\" or \"no\"" -msgstr "Contesteu 嚙編嚙踝蕭 o 嚙緯o嚙" +msgstr "Contesteu 竄s穩罈 o 竄no罈" #: g10/helptext.c:119 msgid "" @@ -4976,22 +4878,22 @@ msgid "" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -"Introdu嚙線 el valor requerit tal i com es mostra en l'indicatiu.\n" -"嚙編 possible introduir una data ISO (AAAA-MM-DD) per嚙 no rebreu\n" -"una bona resposta d'error - en canvi, el sistema tractar嚙 d'interpretar\n" +"Introdu簿u el valor requerit tal i com es mostra en l'indicatiu.\n" +"s possible introduir una data ISO (AAAA-MM-DD) per簷 no rebreu\n" +"una bona resposta d'error - en canvi, el sistema tractar d'interpretar\n" "el valor donat com un interval." #: g10/helptext.c:131 msgid "Enter the name of the key holder" -msgstr "Introdu嚙線 el nom del propietari de la clau" +msgstr "Introdu簿u el nom del propietari de la clau" #: g10/helptext.c:136 msgid "please enter an optional but highly suggested email address" -msgstr "introdu嚙線 una adre嚙窮 de correu (opcional per嚙 molt recomanable)" +msgstr "introdu簿u una adre癟a de correu (opcional per簷 molt recomanable)" #: g10/helptext.c:140 msgid "Please enter an optional comment" -msgstr "Introdu嚙線 un comentari opcional" +msgstr "Introdu簿u un comentari opcional" #: g10/helptext.c:145 msgid "" @@ -5003,14 +4905,13 @@ msgid "" msgstr "" "N canvia el nom.\n" "C canvia el comentari.\n" -"E canvia l'adre嚙窮 de correu electr嚙緯ic.\n" -"O continua la generaci嚙 de les claus.\n" +"E canvia l'adre癟a de correu electr簷nic.\n" +"O continua la generaci籀 de les claus.\n" "Q ix." #: g10/helptext.c:154 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." -msgstr "" -"Contesteu 嚙編嚙踝蕭 (o nom嚙編 嚙編嚙) si 嚙編 correcte generar la subclau." +msgstr "Contesteu 竄s穩罈 (o nom矇s 竄s罈) si 矇s correcte generar la subclau." #: g10/helptext.c:162 msgid "" @@ -5052,65 +4953,60 @@ msgid "" "\n" "If you don't know what the right answer is, answer \"0\"." msgstr "" -"Quan signeu un ID d'usuari d'una clau, primer haur?eu de verificar que la " +"Quan signeu un ID d'usuari d'una clau, primer haur穩eu de verificar que la " "clau\n" -"pertany a la persona esmentada en l'ID d'usuari. 嚙編 嚙緣il per a altres " +"pertany a la persona esmentada en l'ID d'usuari. s 繳til per a altres " "saber\n" -"amb quanta cura heu verificat a嚙踝蕭.\n" +"amb quanta cura heu verificat a癟簷.\n" "\n" -"嚙0嚙 significa que no feu cap declaraci嚙 de amb quanta cura heu " -"verificat\n" +"竄0罈 significa que no feu cap declaraci籀 de amb quanta cura heu verificat\n" " la clau.\n" "\n" -"嚙1嚙 significa que creieu que la clau 嚙編 de la persona que diu que 嚙編 " -"la\n" -" propiet嚙緝ia, per嚙 no heu pogut, o no heu verificat la clau de cap " +"竄1罈 significa que creieu que la clau 矇s de la persona que diu que 矇s la\n" +" propietria, per簷 no heu pogut, o no heu verificat la clau de cap " "manera.\n" -" A嚙踝蕭 嚙編 嚙緣il per a la verificaci嚙 d'un 嚙緝ol嚙, quan signeu " -"la clau d'un\n" -" usuari amb pseud嚙緯im.\n" +" A癟簷 矇s 繳til per a la verificaci籀 d'un 竄rol罈, quan signeu la clau d'un\n" +" usuari amb pseud簷nim.\n" "\n" -"嚙2嚙 significa que heu fet algunes comprovacions de la clau. Per exemple, " -"a嚙踝蕭\n" +"竄2罈 significa que heu fet algunes comprovacions de la clau. Per exemple, " +"a癟簷\n" " pot significar que heu verificat la emprenta digital de la clau i " "verificat\n" " l'ID d'usuari en la clau amb el photo ID.\n" "\n" -"嚙3嚙 significa que heu fet una verificaci嚙 exhaustiva de la clau. Per " +"竄3罈 significa que heu fet una verificaci籀 exhaustiva de la clau. Per " "exemple,\n" -" a嚙踝蕭 pot significar que heu verificat la emprenta digital amb el " +" a癟簷 pot significar que heu verificat la emprenta digital amb el " "propietari\n" -" de la clau en persona, i que heu comprovat, mitjan嚙窮nt un document " -"dif嚙箱il\n" +" de la clau en persona, i que heu comprovat, mitjan癟ant un document " +"dif穩cil\n" " de falsificar amb photo ID (com un passaport) que el nom del propietari\n" " coincideix amb el nom de l'ID d'usuari en la clau, i finalment que heu\n" -" verificat (per intercanvi de correu) que l'adre嚙窮 de correu en la " -"clau\n" +" verificat (per intercanvi de correu) que l'adre癟a de correu en la clau\n" " pertany al propietari de la clau.\n" "\n" "Teniu en compte que els exemples donats anteriorment per als nivels 2 i 3 " -"s嚙緯\n" -"*nom嚙編* exemples. Al final, 嚙編 cosa vostra decidir qu嚙 significa " -"嚙窮lguna嚙 i\n" -"嚙箴xhaustiva嚙 per a vosaltres quan voleu signar altres claus.\n" +"s籀n\n" +"*nom矇s* exemples. Al final, 矇s cosa vostra decidir qu癡 significa 竄alguna罈 i\n" +"竄exhaustiva罈 per a vosaltres quan voleu signar altres claus.\n" "\n" -"Si no sabeu quina 嚙編 la resposta correcta, contesteu 嚙0嚙." +"Si no sabeu quina 矇s la resposta correcta, contesteu 竄0罈." #: g10/helptext.c:200 msgid "Answer \"yes\" is you want to sign ALL the user IDs" -msgstr "Contesteu 嚙編嚙踝蕭 si voleu signar TOTS els ID d'usuari" +msgstr "Contesteu 竄s穩罈 si voleu signar TOTS els ID d'usuari" #: g10/helptext.c:204 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -"Contesteu 嚙編嚙踝蕭 si realment voleu eliminar aquest ID d'usuari.\n" -"Tots els certificats tamb嚙 es perdran!" +"Contesteu 竄s穩罈 si realment voleu eliminar aquest ID d'usuari.\n" +"Tots els certificats tamb矇 es perdran!" #: g10/helptext.c:209 msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr "Contesteu 嚙編嚙踝蕭 si 嚙編 correcte eliminar la subclau" +msgstr "Contesteu 竄s穩罈 si 矇s correcte eliminar la subclau" #: g10/helptext.c:214 msgid "" @@ -5118,9 +5014,9 @@ msgid "" "to delete this signature because it may be important to establish a\n" "trust connection to the key or another key certified by this key." msgstr "" -"Aquesta 嚙編 una signatura v嚙締ida en la clau; normalment no voldreu\n" -"eliminar aquesta signatura perqu嚙 pot ser important per a establir\n" -"una connexi嚙 de confian嚙窮 a la clau o a un altra clau certificada\n" +"Aquesta 矇s una signatura vlida en la clau; normalment no voldreu\n" +"eliminar aquesta signatura perqu癡 pot ser important per a establir\n" +"una connexi籀 de confian癟a a la clau o a un altra clau certificada\n" "per aquesta clau." #: g10/helptext.c:219 @@ -5130,11 +5026,10 @@ msgid "" "know which key was used because this signing key might establish\n" "a trust connection through another already certified key." msgstr "" -"Aquesta signatura no es pot comprovar perqu嚙 no teniu la clau\n" -"corresponent. Haur嚙箴u de posposar la seua eliminaci嚙 fins que\n" +"Aquesta signatura no es pot comprovar perqu癡 no teniu la clau\n" +"corresponent. Haur穩eu de posposar la seua eliminaci籀 fins que\n" "sapieu quina clau es va utilitzar ja que aquesta clau de signatura\n" -"podria establir una connexi嚙 de confian嚙窮 a trav嚙編 d'una altra clau " -"ja\n" +"podria establir una connexi籀 de confian癟a a trav矇s d'una altra clau ja\n" "certificada." #: g10/helptext.c:225 @@ -5142,7 +5037,7 @@ msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -"La signatura no 嚙編 v嚙締ida. T嚙 sentit que l'elimineu de l'anell\n" +"La signatura no 矇s vlida. T矇 sentit que l'elimineu de l'anell\n" "de claus." #: g10/helptext.c:229 @@ -5153,11 +5048,10 @@ msgid "" "only if this self-signature is for some reason not valid and\n" "a second one is available." msgstr "" -"Aquesta 嚙編 una signatura que enlla嚙窮 l'ID de l'usuari amb la clau.\n" -"Normalment no 嚙編 una bona idea eliminar una signatura com aquesta.\n" -"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, aix嚙穀n" -"que feu a嚙踝蕭 nom嚙編 si l'autosignatura no 嚙編 v嚙締ida per alguna ra嚙 " -"i\n" +"Aquesta 矇s una signatura que enlla癟a l'ID de l'usuari amb la clau.\n" +"Normalment no 矇s una bona idea eliminar una signatura com aquesta.\n" +"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, aix穩\n" +"que feu a癟簷 nom矇s si l'autosignatura no 矇s vlida per alguna ra籀 i\n" "hi ha una segona disponible." #: g10/helptext.c:237 @@ -5166,18 +5060,18 @@ msgid "" "to the current list of preferences. The timestamp of all affected\n" "self-signatures will be advanced by one second.\n" msgstr "" -"Canvia les prefer嚙緯cies de tots els ID d'usuari (o nom嚙編 els dels " +"Canvia les prefer癡ncies de tots els ID d'usuari (o nom矇s els dels " "seleccionats)\n" -"a la llista actual de prefer嚙緯cies. Les marques de temps de totes les\n" -"autosignatures afectades s'avan嚙窮ran un segon.\n" +"a la llista actual de prefer癡ncies. Les marques de temps de totes les\n" +"autosignatures afectades s'avan癟aran un segon.\n" #: g10/helptext.c:244 msgid "Please enter the passhrase; this is a secret sentence \n" -msgstr "Introdu嚙線 la contrasenya; aquesta ha de ser una frase secreta \n" +msgstr "Introdu簿u la contrasenya; aquesta ha de ser una frase secreta \n" #: g10/helptext.c:250 msgid "Please repeat the last passphrase, so you are sure what you typed in." -msgstr "Per favor, repetiu l'嚙締tima contrasenya per confirmar-la." +msgstr "Per favor, repetiu l'繳ltima contrasenya per confirmar-la." #: g10/helptext.c:254 msgid "Give the name of the file to which the signature applies" @@ -5185,15 +5079,15 @@ msgstr "Doneu el nom del fitxer al qual #: g10/helptext.c:259 msgid "Answer \"yes\" if it is okay to overwrite the file" -msgstr "Contesteu 嚙編嚙踝蕭 si 嚙編 correcte sobreescriure el fitxer" +msgstr "Contesteu 竄s穩罈 si 矇s correcte sobreescriure el fitxer" #: g10/helptext.c:264 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -"Introdu嚙線 un nom de fitxer. Si premeu RETORN s'hi usar嚙 el fitxer\n" -"predeterminat (apareix entre claud嚙緣ors)." +"Introdu簿u un nom de fitxer. Si premeu RETORN s'hi usar el fitxer\n" +"predeterminat (apareix entre claudtors)." #: g10/helptext.c:270 msgid "" @@ -5210,21 +5104,19 @@ msgid "" " Use this to state that the user ID should not longer be used;\n" " this is normally used to mark an email address invalid.\n" msgstr "" -"Haur嚙箴u d'especificar una ra嚙 per a la certificaci嚙. Depenent del\n" +"Haur穩eu d'especificar una ra籀 per a la certificaci籀. Depenent del\n" "context teniu l'habilitat de triar d'aquesta llista:\n" -" 嚙盤a clau ha estat compromesa嚙穀n" -" Utilitzeu a嚙踝蕭 si teniu alguna ra嚙 per creure que persones no\n" -" autoritzades han tingut acc嚙編 a la vostra clau secreta.\n" -" 嚙盤a clau ha estat reempla嚙窮da嚙穀n" -" Utilitzeu a嚙踝蕭 si heu reempla嚙窮t aquesta clau amb una m嚙編 " -"nova.\n" -" 嚙盤a clau ja no est嚙 en 嚙編嚙穀n" -" Utilitzeu a嚙踝蕭 si heu retirat aquesta clau.\n" -" 嚙盤'ID de l'usuari ja no 嚙編 v嚙締id嚙穀n" -" Utilitzeu a嚙踝蕭 per a constatar que l'ID de l'usuari no s'hauria\n" -" d'utilitzar m嚙編; a嚙踝蕭 s'utilitza normalment per a marcar una " -"adre嚙窮\n" -" de correu com a inv嚙締ida.\n" +" 竄La clau ha estat compromesa罈\n" +" Utilitzeu a癟簷 si teniu alguna ra籀 per creure que persones no\n" +" autoritzades han tingut acc矇s a la vostra clau secreta.\n" +" 竄La clau ha estat reempla癟ada罈\n" +" Utilitzeu a癟簷 si heu reempla癟at aquesta clau amb una m矇s nova.\n" +" 竄La clau ja no est en 繳s罈\n" +" Utilitzeu a癟簷 si heu retirat aquesta clau.\n" +" 竄L'ID de l'usuari ja no 矇s vlid罈\n" +" Utilitzeu a癟簷 per a constatar que l'ID de l'usuari no s'hauria\n" +" d'utilitzar m矇s; a癟簷 s'utilitza normalment per a marcar una adre癟a\n" +" de correu com a invlida.\n" #: g10/helptext.c:286 msgid "" @@ -5232,9 +5124,9 @@ msgid "" "revocation certificate. Please keep this text concise.\n" "An empty line ends the text.\n" msgstr "" -"Si voleu podeu introduir un text que descriga per qu嚙 expediu aquest\n" -"certificat de revocaci嚙. Per favor, sigueu concisos.\n" -"Una l嚙緯ia buida indica el final del text.\n" +"Si voleu podeu introduir un text que descriga per qu癡 expediu aquest\n" +"certificat de revocaci籀. Per favor, sigueu concisos.\n" +"Una l穩nia buida indica el final del text.\n" #: g10/helptext.c:301 msgid "No help available" @@ -5245,34 +5137,34 @@ msgstr "No hi ha ajuda disponible" msgid "No help available for `%s'" msgstr "No hi ha ajuda disponible per a `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" -msgstr "error en crear l'anell 嚙%s嚙: %s\n" +msgstr "error en crear l'anell 竄%s罈: %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" -msgstr "s'ha creat l'anell 嚙%s?\n" +msgstr "s'ha creat l'anell 竄%s罈\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" -msgstr "no s'ha pogut reconstruir la mem嚙緝ia cau de l'anell: %s\n" +msgstr "no s'ha pogut reconstruir la mem簷ria cau de l'anell: %s\n" #: g10/keyring.c:1226 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "AV嚙磅: hi ha 2 fitxers amb informaci嚙 confidencial.\n" +msgstr "AVS: hi ha 2 fitxers amb informaci籀 confidencial.\n" #: g10/keyring.c:1228 #, c-format msgid "%s is the unchanged one\n" -msgstr "%s 嚙編 el que no ha canviat\n" +msgstr "%s 矇s el que no ha canviat\n" #: g10/keyring.c:1229 #, c-format msgid "%s is the new one\n" -msgstr "%s 嚙編 el nou\n" +msgstr "%s 矇s el nou\n" #: g10/keyring.c:1230 msgid "Please fix this possible security flaw\n" @@ -5281,7 +5173,7 @@ msgstr "Per favor, solucioneu aquest pos #: g10/keyring.c:1350 #, c-format msgid "checking keyring `%s'\n" -msgstr "s'est嚙 comprovant l'anell 嚙%s嚙穀n" +msgstr "s'est comprovant l'anell 竄%s罈\n" #: g10/keyring.c:1388 #, c-format @@ -5312,19 +5204,18 @@ msgstr "" "\n" "Seleccioneu una imatge per a utilitzarla en el vostre photo ID. La imatge\n" "ha de ser un fitxer JPEG. Recordeu que la imatge es desa dins de la vostra\n" -"clau p嚙箭lica. Si utilitzeu una foto molt gran, la vostra clau tamb嚙 es " -"far嚙穀n" +"clau p繳blica. Si utilitzeu una foto molt gran, la vostra clau tamb矇 es far\n" "molt gran!\n" "Es recomana una imatge amb una mida aproximada de 240x288.\n" #: g10/photoid.c:79 msgid "Enter JPEG filename for photo ID: " -msgstr "Introdu嚙線 el nom del fitxer JPEG per al photo ID: " +msgstr "Introdu簿u el nom del fitxer JPEG per al photo ID: " #: g10/photoid.c:87 #, c-format msgid "Unable to open photo \"%s\": %s\n" -msgstr "No s'ha pogut obrir la foto 嚙%s嚙: %s\n" +msgstr "No s'ha pogut obrir la foto 竄%s罈: %s\n" #: g10/photoid.c:97 msgid "Are you sure you want to use it (y/N)? " @@ -5333,25 +5224,25 @@ msgstr "Esteu segur que encara voleu uti #: g10/photoid.c:112 #, c-format msgid "\"%s\" is not a JPEG file\n" -msgstr "嚙%s嚙 no 嚙編 un fitxer JPEG\n" +msgstr "竄%s罈 no 矇s un fitxer JPEG\n" #: g10/photoid.c:129 msgid "Is this photo correct (y/N/q)? " -msgstr "嚙編 aquesta foto correcta (s/N/x)? " +msgstr "s aquesta foto correcta (s/N/x)? " #: g10/photoid.c:331 msgid "unable to display photo ID!\n" msgstr "no s'ha pogut mostrar el photo ID!\n" -# Execuci嚙 de programes remots, o execuci嚙 remota de programes? jm +# Execuci籀 de programes remots, o execuci籀 remota de programes? jm #: g10/exec.c:48 msgid "no remote program execution supported\n" -msgstr "no hi ha suport per a l'execuci嚙 remota de programes\n" +msgstr "no hi ha suport per a l'execuci籀 remota de programes\n" #: g10/exec.c:184 #, c-format msgid "can't create directory `%s': %s\n" -msgstr "no es pot crear el directori 嚙%s嚙: %s\n" +msgstr "no es pot crear el directori 竄%s罈: %s\n" #: g10/exec.c:325 msgid "" @@ -5366,20 +5257,19 @@ msgstr "" "aquesta plataforma necessita fitxers temporals quan es crida a programes " "externs\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" -msgstr "no s'ha pogut executar %s 嚙%s嚙: %s\n" +msgstr "no s'ha pogut executar %s 竄%s罈: %s\n" #: g10/exec.c:513 #, c-format msgid "system error while calling external program: %s\n" -msgstr "s'ha produ嚙緣 un error del sistema en cridar el programa extern: %s\n" +msgstr "s'ha produ簿t un error del sistema en cridar el programa extern: %s\n" #: g10/exec.c:524 g10/exec.c:583 msgid "unnatural exit of external program\n" -msgstr "s'ha produ嚙緣 una eixida no natural del programa extern\n" +msgstr "s'ha produ簿t una eixida no natural del programa extern\n" #: g10/exec.c:539 msgid "unable to execute external program\n" @@ -5393,12 +5283,12 @@ msgstr "no s'ha pogut llegir la resposta #: g10/exec.c:594 g10/exec.c:601 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" -msgstr "AV嚙磅: no s'ha pogut eliminar el fitxer temporal (%s) 嚙%s嚙: %s\n" +msgstr "AVS: no s'ha pogut eliminar el fitxer temporal (%s) 竄%s罈: %s\n" #: g10/exec.c:606 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" -msgstr "AV嚙磅: no s'ha pogut eliminar el directori temporal 嚙%s嚙: %s\n" +msgstr "AVS: no s'ha pogut eliminar el directori temporal 竄%s罈: %s\n" #: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " @@ -5417,11 +5307,11 @@ msgstr "ha fallat build_packet: %s\n" #: g10/revoke.c:145 #, c-format msgid "key %08lX incomplete\n" -msgstr "la clau %08lX 嚙編 incompleta\n" +msgstr "la clau %08lX 矇s incompleta\n" #: g10/revoke.c:214 g10/revoke.c:433 msgid "sorry, can't do this in batch mode\n" -msgstr "no es pot fet aix嚙 en mode desat嚙編\n" +msgstr "no es pot fet aix簷 en mode desat癡s\n" #: g10/revoke.c:281 msgid "To be revoked by:\n" @@ -5429,54 +5319,52 @@ msgstr "A ser revocada per:\n" #: g10/revoke.c:293 msgid "(This is a sensitive revocation key)\n" -msgstr "(Aquesta 嚙編 una clau de revocaci嚙 sensible)\n" +msgstr "(Aquesta 矇s una clau de revocaci籀 sensible)\n" #: g10/revoke.c:297 g10/revoke.c:503 msgid "Create a revocation certificate for this key? " -msgstr "Voleu crear un certificat de revocaci嚙 per a aquesta clau? " +msgstr "Voleu crear un certificat de revocaci籀 per a aquesta clau? " #: g10/revoke.c:310 g10/revoke.c:534 msgid "ASCII armored output forced.\n" -msgstr "s'ha for嚙窮t l'eixida d'armadura ASCII.\n" +msgstr "s'ha for癟at l'eixida d'armadura ASCII.\n" #: g10/revoke.c:324 g10/revoke.c:548 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "ha fallat make_keysig_packet: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" -msgstr "S'ha creat el certificat de revocaci嚙.\n" +msgstr "S'ha creat el certificat de revocaci籀.\n" #: g10/revoke.c:393 #, c-format msgid "no revocation keys found for `%s'\n" -msgstr "no s'han ttrobat claus de revocaci嚙 per a 嚙%s嚙穀n" +msgstr "no s'han ttrobat claus de revocaci籀 per a 竄%s罈\n" #: g10/revoke.c:447 #, c-format msgid "secret key `%s' not found: %s\n" -msgstr "no s'ha trobat la clau secreta 嚙%s嚙: %s\n" +msgstr "no s'ha trobat la clau secreta 竄%s罈: %s\n" #: g10/revoke.c:485 #, c-format msgid "no corresponding public key: %s\n" -msgstr "no hi ha cap clau p嚙箭lica corresponent: %s\n" +msgstr "no hi ha cap clau p繳blica corresponent: %s\n" #: g10/revoke.c:496 msgid "public key does not match secret key!\n" -msgstr "la clau p嚙箭lica no coincideix amb la clau secreta!\n" +msgstr "la clau p繳blica no coincideix amb la clau secreta!\n" #: g10/revoke.c:519 msgid "unknown protection algorithm\n" -msgstr "l'algorisme de protecci嚙 嚙編 desconegut\n" +msgstr "l'algorisme de protecci籀 矇s desconegut\n" #: g10/revoke.c:523 msgid "NOTE: This key is not protected!\n" -msgstr "NOTA: Aquesta clau no est嚙 protegida!\n" +msgstr "NOTA: Aquesta clau no est protegida!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5487,46 +5375,45 @@ msgid "" "your media become unreadable. But have some caution: The print system of\n" "your machine might store the data and make it available to others!\n" msgstr "" -"S'ha creat un certificat de revocaci嚙.\n" +"S'ha creat un certificat de revocaci籀.\n" "\n" "Si us plau, mogueu-lo a un medi que pugueu amagar; si Mallory aconsegueix\n" -"acc嚙編 a aquest certificat pot utilitzar-lo per a fer la vostra clau\n" -"inservible. 嚙編 intel嚙締igent imprimir aquest certificat i amagar-lo, per\n" -"si el vostre medi es torna illegible. Per嚙 aneu amb compte: el sistema\n" -"d'impressi嚙 de la vostra m嚙緬uina podria emmagatzemar les dades i fer-" -"les\n" +"acc矇s a aquest certificat pot utilitzar-lo per a fer la vostra clau\n" +"inservible. s intel繚ligent imprimir aquest certificat i amagar-lo, per\n" +"si el vostre medi es torna illegible. Per簷 aneu amb compte: el sistema\n" +"d'impressi籀 de la vostra mquina podria emmagatzemar les dades i fer-les\n" "disponibles a altres!\n" #: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" -msgstr "Seleccioneu la ra嚙 de la revocaci嚙:\n" +msgstr "Seleccioneu la ra籀 de la revocaci籀:\n" #: g10/revoke.c:625 msgid "Cancel" -msgstr "Cancel嚙締a" +msgstr "Cancel繚la" #: g10/revoke.c:627 #, c-format msgid "(Probably you want to select %d here)\n" -msgstr "(Segurament voleu seleccionar %d ac嚙)\n" +msgstr "(Segurament voleu seleccionar %d ac穩)\n" #: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" msgstr "" -"Introdu嚙線 una descripci嚙 opcional; finalitzeu amb una l嚙緯ia en blanc:\n" +"Introdu簿u una descripci籀 opcional; finalitzeu amb una l穩nia en blanc:\n" #: g10/revoke.c:696 #, c-format msgid "Reason for revocation: %s\n" -msgstr "Ra嚙 de la revocaci嚙: %s\n" +msgstr "Ra籀 de la revocaci籀: %s\n" #: g10/revoke.c:698 msgid "(No description given)\n" -msgstr "(No es va donar una descripci嚙)\n" +msgstr "(No es va donar una descripci籀)\n" #: g10/revoke.c:703 msgid "Is this okay? " -msgstr "嚙編 a嚙踝蕭 correcte? " +msgstr "s a癟簷 correcte? " #: g10/tdbdump.c:104 #, c-format @@ -5534,8 +5421,8 @@ msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" -"# Llista de valors de confian嚙窮 assignats, creat el %s\n" -"# (Utilitzeu 嚙篇pg --import-ownertrust嚙 per a restaurar-les)\n" +"# Llista de valors de confian癟a assignats, creat el %s\n" +"# (Utilitzeu 竄gpg --import-ownertrust罈 per a restaurar-les)\n" #: g10/tdbdump.c:140 #, c-format @@ -5544,7 +5431,7 @@ msgstr "no es pot obrir el fitxer: %s\n" #: g10/tdbdump.c:151 msgid "line too long\n" -msgstr "la l嚙緯ia 嚙編 massa llarga\n" +msgstr "la l穩nia 矇s massa llarga\n" #: g10/tdbdump.c:159 msgid "error: missing colon\n" @@ -5552,17 +5439,16 @@ msgstr "error: falten dos punts\n" #: g10/tdbdump.c:164 msgid "error: invalid fingerprint\n" -msgstr "error: l'empremta digital 嚙編 inv嚙締ida\n" +msgstr "error: l'empremta digital 矇s invlida\n" #: g10/tdbdump.c:168 msgid "error: no ownertrust value\n" -msgstr "error: no hi ha cap valor de confian嚙窮\n" +msgstr "error: no hi ha cap valor de confian癟a\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" -msgstr "error en trobar el registre de confian嚙窮: %s\n" +msgstr "error en trobar el registre de confian癟a: %s\n" #: g10/tdbdump.c:208 #, c-format @@ -5578,46 +5464,44 @@ msgstr "error de lectura: %s\n" #~ "also\n" #~ "very slow, and may not be as secure as the other choices.\n" #~ msgstr "" -#~ "L'嚙編 d'aquest algorisme nom嚙編 est嚙 suportat per GnuPG. No podreu " +#~ "L'繳s d'aquest algorisme nom矇s est suportat per GnuPG. No podreu " #~ "utilitzar aquesta clau per a comunicar-vos amb usuaris de PGP. Aquest " -#~ "algorisme tamb嚙 嚙編 molt lent, i potser no 嚙編 tan segur com les " -#~ "altres alternatives.\n" +#~ "algorisme tamb矇 矇s molt lent, i potser no 矇s tan segur com les altres " +#~ "alternatives.\n" #~ msgid "Create anyway? " #~ msgstr "Voleu crear la clau de tota manera? " #~ msgid "invalid symkey algorithm detected (%d)\n" -#~ msgstr "algoritme de clau sim嚙緣ric inv嚙締id detectat (%d)\n" +#~ msgstr "algoritme de clau sim癡tric invlid detectat (%d)\n" #~ msgid "this keyserver is not fully HKP compatible\n" -#~ msgstr "aquest servidor de clau no 嚙編 completament compatible amb HKP\n" +#~ msgstr "aquest servidor de clau no 矇s completament compatible amb HKP\n" #~ msgid "The use of this algorithm is deprecated - create anyway? " #~ msgstr "" -#~ "L'嚙編 d'aquest algoritme est嚙 desaconsellat - el voleu crear " -#~ "igualment? " +#~ "L'繳s d'aquest algoritme est desaconsellat - el voleu crear igualment? " #~ msgid "|NAME=VALUE|use this notation data" -#~ msgstr "|NOM=VALOR|usa aquesta notaci嚙 de dades" +#~ msgstr "|NOM=VALOR|usa aquesta notaci籀 de dades" #~ msgid "" #~ "the first character of a notation name must be a letter or an underscore\n" #~ msgstr "" -#~ "el primer car嚙箱ter de la notaci嚙 ha de ser una lletra o un " -#~ "subratllat\n" +#~ "el primer carcter de la notaci籀 ha de ser una lletra o un subratllat\n" #~ msgid "dots in a notation name must be surrounded by other characters\n" -#~ msgstr "els punts han d'estar envoltats per altres car嚙箱ters\n" +#~ msgstr "els punts han d'estar envoltats per altres carcters\n" #~ msgid "" #~ "WARNING: This key already has a photo ID.\n" #~ " Adding another photo ID may confuse some versions of PGP.\n" #~ msgstr "" -#~ "AV嚙磅: Aquesta clau ja te un photo ID.\n" +#~ "AVS: Aquesta clau ja te un photo ID.\n" #~ " Afegir un altre photo ID pot confondre algunes versions de PGP.\n" #~ msgid "You may only have one photo ID on a key.\n" -#~ msgstr "Nom嚙編 podeu tenir un photo ID en una clau.\n" +#~ msgstr "Nom矇s podeu tenir un photo ID en una clau.\n" #~ msgid "Fingerprint:" #~ msgstr "Empremta digital:" @@ -5630,13 +5514,13 @@ msgstr "error de lectura: %s\n" #~ "heu d'executar GnuPG de nou per que puga llegir el nou fitxer d'opcions\n" #~ msgid "changing permission of `%s' failed: %s\n" -#~ msgstr "no s'han pogut canviar els permissos de 嚙%s嚙: %s\n" +#~ msgstr "no s'han pogut canviar els permissos de 竄%s罈: %s\n" #~ msgid "too many random bits requested; the limit is %d\n" -#~ msgstr "massa bits aleatoris sol嚙締icitats; el l嚙練it 嚙編 %d\n" +#~ msgstr "massa bits aleatoris sol繚licitats; el l穩mit 矇s %d\n" #~ msgid "|[NAMES]|check the trust database" -#~ msgstr "|[NOMS]|comprova la base de dades de confian嚙窮" +#~ msgstr "|[NOMS]|comprova la base de dades de confian癟a" #~ msgid "--delete-secret-key user-id" #~ msgstr "--delete-secret-key user-id" @@ -5648,7 +5532,7 @@ msgstr "error de lectura: %s\n" #~ msgstr "--delete-secret-and-public-key user-id" #~ msgid "For info see http://www.gnupg.org" -#~ msgstr "Si voleu m嚙編 informaci嚙 vegeu http://www.gnupg.org" +#~ msgstr "Si voleu m矇s informaci籀 vegeu http://www.gnupg.org" #~ msgid "sSmMqQ" #~ msgstr "sSmMqQ" @@ -5658,46 +5542,43 @@ msgstr "error de lectura: %s\n" #~ "can assign some missing owner trust values.\n" #~ "\n" #~ msgstr "" -#~ "No s'ha trobat un cam嚙 de confian嚙窮 v嚙締id a la clau. Vegem si " -#~ "podem\n" -#~ "assignar valors de confian嚙窮 no assignats.\n" +#~ "No s'ha trobat un cam穩 de confian癟a vlid a la clau. Vegem si podem\n" +#~ "assignar valors de confian癟a no assignats.\n" #~ "\n" #~ msgid "" #~ "No path leading to one of our keys found.\n" #~ "\n" #~ msgstr "" -#~ "No s'ha trobat un cam嚙 que condueixe a una de les nostres claus.\n" +#~ "No s'ha trobat un cam穩 que condueixe a una de les nostres claus.\n" #~ "\n" #~ msgid "" #~ "No certificates with undefined trust found.\n" #~ "\n" #~ msgstr "" -#~ "No s'han trobat certificats amb confian嚙窮 no definida.\n" +#~ "No s'han trobat certificats amb confian癟a no definida.\n" #~ "\n" #~ msgid "" #~ "No trust values changed.\n" #~ "\n" #~ msgstr "" -#~ "No s'ha canviat cap valor de confian嚙窮.\n" +#~ "No s'ha canviat cap valor de confian癟a.\n" #~ "\n" #~ msgid "%08lX: no info to calculate a trust probability\n" #~ msgstr "" -#~ "%08lX: no hi ha informaci嚙 per a calcular una probabilitat de " -#~ "confian嚙窮\n" +#~ "%08lX: no hi ha informaci籀 per a calcular una probabilitat de confian癟a\n" #~ msgid "Enter the user ID: " -#~ msgstr "Introdu嚙線 el nom d'usuari: " +#~ msgstr "Introdu簿u el nom d'usuari: " #~ msgid "skipped: public key already set with --encrypt-to\n" -#~ msgstr "" -#~ "es descarta: la clau p嚙箭lica ja s'ha especificat amb --encrypt-to\n" +#~ msgstr "es descarta: la clau p繳blica ja s'ha especificat amb --encrypt-to\n" #~ msgid "%s: error checking key: %s\n" -#~ msgstr "%s: error en la comprovaci嚙 de la clau: %s\n" +#~ msgstr "%s: error en la comprovaci籀 de la clau: %s\n" #~ msgid "Do you really want to create a sign and encrypt key? " #~ msgstr "Segur que voleu crear una clau de signatura i xifratge? " @@ -5713,30 +5594,28 @@ msgstr "error de lectura: %s\n" #~ msgid "too many entries in unk cache - disabled\n" #~ msgstr "" -#~ "massa entrades en la mem嚙緝ia cau de claus desconegudes - desactivada\n" +#~ "massa entrades en la mem簷ria cau de claus desconegudes - desactivada\n" #~ msgid "secret key %08lX not imported (use %s to allow for it)\n" #~ msgstr "clau secreta %08lX no importada (utilitzeu %s per a permitir-ho)\n" #~ msgid "key %08lX: our copy has no self-signature\n" -#~ msgstr "clau %08lX: la nostra c嚙緘ia no t嚙 autosignatura\n" +#~ msgstr "clau %08lX: la nostra c簷pia no t矇 autosignatura\n" #~ msgid "%s: user not found\n" #~ msgstr "%s: no s'ha trobat l'usuari\n" #~ msgid "update of trustdb failed: %s\n" -#~ msgstr "" -#~ "ha fallat l'actualitzaci嚙 de la base de dades de confian嚙窮: %s\n" +#~ msgstr "ha fallat l'actualitzaci籀 de la base de dades de confian癟a: %s\n" #~ msgid "no keyserver known (use option --keyserver)\n" -#~ msgstr "" -#~ "no es coneix cap servidor de claus (useu l'opci嚙 \"--keyserver\")\n" +#~ msgstr "no es coneix cap servidor de claus (useu l'opci籀 \"--keyserver\")\n" #~ msgid "%s: not a valid key ID\n" -#~ msgstr "%s: no 嚙編 un ID v嚙締id\n" +#~ msgstr "%s: no 矇s un ID vlid\n" #~ msgid "assuming bad MDC due to an unknown critical bit\n" -#~ msgstr "es suposa MDC erroni a causa d'un bit cr嚙緣ic desconegut\n" +#~ msgstr "es suposa MDC erroni a causa d'un bit cr穩tic desconegut\n" #~ msgid "error reading dir record for LID %lu: %s\n" #~ msgstr "error al llegir el registre de directori per al LID %lu: %s\n" @@ -5745,63 +5624,63 @@ msgstr "error de lectura: %s\n" #~ msgstr "lid %lu: s'esperava registre de directori, s'ha obtingut %d\n" #~ msgid "no primary key for LID %lu\n" -#~ msgstr "no hi ha una clau prim嚙緝ia per al LID %lu\n" +#~ msgstr "no hi ha una clau primria per al LID %lu\n" #~ msgid "error reading primary key for LID %lu: %s\n" -#~ msgstr "error al llegir clau prim嚙緝ia per al LID %lu: %s\n" +#~ msgstr "error al llegir clau primria per al LID %lu: %s\n" #~ msgid "key %08lX: query record failed\n" #~ msgstr "clau %08lX: la consulta del registre ha fallat\n" #~ msgid "key %08lX: already in trusted key table\n" -#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian嚙窮\n" +#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian癟a\n" #~ msgid "NOTE: secret key %08lX is NOT protected.\n" -#~ msgstr "NOTE: la clau secreta %08lX no est嚙 protegida.\n" +#~ msgstr "NOTE: la clau secreta %08lX no est protegida.\n" #~ msgid "key %08lX: secret and public key don't match\n" -#~ msgstr "clau %08lX: les claus p嚙箭lica i secreta no coincideixen\n" +#~ msgstr "clau %08lX: les claus p繳blica i secreta no coincideixen\n" #~ msgid "key %08lX.%lu: Good subkey binding\n" -#~ msgstr "clau %08lX.%lu: Enlla嚙 de subclau correcta\n" +#~ msgstr "clau %08lX.%lu: Enlla癟 de subclau correcta\n" #~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n" -#~ msgstr "clau %08lX.%lu: Enlla嚙 de subclau inv嚙締id: %s\n" +#~ msgstr "clau %08lX.%lu: Enlla癟 de subclau invlid: %s\n" #~ msgid "key %08lX.%lu: Valid key revocation\n" -#~ msgstr "clau %08lX.%lu: Revocaci嚙 de clau v嚙締ida\n" +#~ msgstr "clau %08lX.%lu: Revocaci籀 de clau vlida\n" #~ msgid "key %08lX.%lu: Invalid key revocation: %s\n" -#~ msgstr "clau %08lX.%lu: Revocaci嚙 de clau inv嚙締ida: %s\n" +#~ msgstr "clau %08lX.%lu: Revocaci籀 de clau invlida: %s\n" #~ msgid "Good self-signature" #~ msgstr "Auto-signatura correcta" #~ msgid "Invalid self-signature" -#~ msgstr "Auto-signatura inv嚙締ida" +#~ msgstr "Auto-signatura invlida" #~ msgid "Valid user ID revocation skipped due to a newer self signature" #~ msgstr "" -#~ "Es descarta una revocaci嚙 d'ID d'usuari v嚙締ida degut a una " -#~ "autosignatura m嚙編 recent" +#~ "Es descarta una revocaci籀 d'ID d'usuari vlida degut a una autosignatura " +#~ "m矇s recent" #~ msgid "Valid user ID revocation" -#~ msgstr "Revocaci嚙 d'ID d'usuari v嚙締ida" +#~ msgstr "Revocaci籀 d'ID d'usuari vlida" #~ msgid "Invalid user ID revocation" -#~ msgstr "Revocaci嚙 d'ID d'usuari inv嚙締ida" +#~ msgstr "Revocaci籀 d'ID d'usuari invlida" #~ msgid "Valid certificate revocation" -#~ msgstr "Certificat de revocaci嚙 v嚙締id" +#~ msgstr "Certificat de revocaci籀 vlid" #~ msgid "Good certificate" #~ msgstr "Certificat correcte" #~ msgid "Invalid certificate revocation" -#~ msgstr "Certificat de revocaci嚙 inv嚙締id" +#~ msgstr "Certificat de revocaci籀 invlid" #~ msgid "Invalid certificate" -#~ msgstr "Certificat inv嚙締id" +#~ msgstr "Certificat invlid" #~ msgid "sig record %lu[%d] points to wrong record.\n" #~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n" @@ -5813,10 +5692,10 @@ msgstr "error de lectura: %s\n" #~ msgstr "tdbio_search_dir ha fallat: %s\n" #~ msgid "lid ?: insert failed: %s\n" -#~ msgstr "lid ?: la inserci嚙 ha fallat: %s\n" +#~ msgstr "lid ?: la inserci籀 ha fallat: %s\n" #~ msgid "lid %lu: insert failed: %s\n" -#~ msgstr "lid %lu: la inserci嚙 ha fallat: %s\n" +#~ msgstr "lid %lu: la inserci籀 ha fallat: %s\n" #~ msgid "lid %lu: inserted\n" #~ msgstr "lid %lu: inserit\n" @@ -5831,7 +5710,7 @@ msgstr "error de lectura: %s\n" #~ msgstr "lid %lu: registre de directori sense clau - es descarta\n" #~ msgid "\t%lu due to new pubkeys\n" -#~ msgstr "\\t%lu degut a noves claus p嚙箭liques\n" +#~ msgstr "\\t%lu degut a noves claus p繳bliques\n" #~ msgid "\t%lu keys skipped\n" #~ msgstr "\t%lu claus es descarta\n" @@ -5850,11 +5729,10 @@ msgstr "error de lectura: %s\n" #~ msgid "key %08lX: insert trust record failed: %s\n" #~ msgstr "" -#~ "clau %08lX: ha fallat la inserci嚙 en la base de dades de confian嚙窮: %" -#~ "s\n" +#~ "clau %08lX: ha fallat la inserci籀 en la base de dades de confian癟a: %s\n" #~ msgid "key %08lX.%lu: inserted into trustdb\n" -#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian嚙窮\n" +#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian癟a\n" #~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" #~ msgstr "" @@ -5865,30 +5743,26 @@ msgstr "error de lectura: %s\n" #~ msgstr "clau %08lX.%lu: caducada el %s\n" #~ msgid "key %08lX.%lu: trust check failed: %s\n" -#~ msgstr "clau %08lX.%lu: ha fallat la verificaci嚙 de confian嚙窮: %s\n" +#~ msgstr "clau %08lX.%lu: ha fallat la verificaci籀 de confian癟a: %s\n" #~ msgid "problem finding '%s' in trustdb: %s\n" -#~ msgstr "" -#~ "problema al cercar 嚙%s嚙 en la base de dades de confian嚙窮: %s\n" +#~ msgstr "problema al cercar 竄%s罈 en la base de dades de confian癟a: %s\n" #~ msgid "user '%s' not in trustdb - inserting\n" #~ msgstr "" -#~ "l'usuari 嚙%s嚙 no est嚙 en la base de dades de confian嚙窮 - inserint-" -#~ "lo\n" +#~ "l'usuari 竄%s罈 no est en la base de dades de confian癟a - inserint-lo\n" #~ msgid "failed to put '%s' into trustdb: %s\n" -#~ msgstr "" -#~ "no s'ha pogut posar 嚙%s嚙 en la base de dades de confian嚙窮 - %s\n" +#~ msgstr "no s'ha pogut posar 竄%s罈 en la base de dades de confian癟a - %s\n" #~ msgid "WARNING: can't yet handle long pref records\n" -#~ msgstr "" -#~ "AV嚙磅: encara no es poden manejar registres de pref嚙緯cies llargs\n" +#~ msgstr "AVS: encara no es poden manejar registres de pref癡ncies llargs\n" #~ msgid "%s: can't create keyring: %s\n" #~ msgstr "%s: no s'ha creat l'anell: %s\n" #~ msgid "RSA key cannot be used in this version\n" -#~ msgstr "No es poden usar claus RSA en aquesta versi嚙穀n" +#~ msgstr "No es poden usar claus RSA en aquesta versi籀\n" #~ msgid "No key for user ID\n" #~ msgstr "No hi ha clau per a l'usuari\n" @@ -5897,7 +5771,7 @@ msgstr "error de lectura: %s\n" #~ msgstr "No hi ha usuari per a la clau\n" #~ msgid "invalid" -#~ msgstr "inv嚙締ida" +#~ msgstr "invlida" #~ msgid "no secret key for decryption available\n" #~ msgstr "no hi ha clau secreta disponible per al desxifratge\n" diff -urpP gnupg-1.2.5/po/cs.po gnupg-1.2.6/po/cs.po --- gnupg-1.2.5/po/cs.po 2004-07-26 12:26:37.000000000 +0000 +++ gnupg-1.2.6/po/cs.po 2004-08-25 14:59:12.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-07 16:20+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -29,7 +29,6 @@ msgstr "prov廥t operaci nen mo駐 bez i msgid "(you may have used the wrong program for this task)\n" msgstr "(pravd髹odobn jste pro tento kol pou養li nespr嫛n program)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ano" @@ -38,7 +37,6 @@ msgstr "ano" msgid "yY" msgstr "aAyY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "ne" @@ -47,7 +45,6 @@ msgstr "ne" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "ukon鋱t" @@ -252,7 +249,6 @@ msgstr "neza隘frov嫕o" msgid "not processed" msgstr "nezpracov嫕o" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "nepou養teln ve鷫jn kl膻" @@ -751,19 +747,19 @@ msgstr "|N|pou橙t komprima鋝 algoritmus msgid "throw keyid field of encrypted packets" msgstr "zahodit identifik嫢or kl膻e z 隘frovanch paket" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Zobrazit fotografick ID" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Nezobrazovat fotografick ID" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Nastavit p齶kazov 鸅dek k prohl篿en fotografick嶭o ID" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -771,7 +767,7 @@ msgstr "" "@\n" "(Pou養jte manu嫮ov str嫕ky pro kompletn seznam v鈹ch p齶kaz a mo駐ost)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -789,17 +785,17 @@ msgstr "" " --list-keys [jm幯a] vypsat kl膻e\n" " --fingerprint [jm幯a] vypsat fingerprinty \n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Chyby oznamte, pros璥, na adresu .\n" "P鷡pom璯ky k p鷫kladu .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pou養t: gpg [mo駐osti] [soubory] (-h pro pomoc)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -809,7 +805,7 @@ msgstr "" "podepsat, ov檟it, 隘frovat nebo de隘frovat\n" "implicitn operace z嫛is na vstupn獳h datech\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -817,379 +813,379 @@ msgstr "" "\n" "Podporovan algoritmy:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Ve鷫jn kl膻: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "姆fra: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Komprese: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "u養t: gpg [mo駐osti]" -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "konfliktn p齶kazy\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = podpis nalezen v definici skupiny \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VAROV篾: vlastnictv pro %s nastaveno nebezpe鋝 \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "VAROV篾: p齶stupov pr嫛a pro %s nejsou nastavena bezpe鋝 \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "VAROV篾: vlastnictv adres暟e %s nastaveno nebezpe鋝 \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "VAROV篾: p齶stupov pr嫛a adres暟e %s nejsou nastavena bezpe鋝 \"%s\"\n" # c-format -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "nezn嫥 konfigura鋝 polo餒a \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZN簍KA: star implicitn soubor s mo駐ostmi `%s ignorov嫕'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZN簍KA: neexistuje implicitn soubor s mo駐ostmi `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "soubor s mo駐ostmi `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "鋈u mo駐osti z `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "隘fra \"%s\" nebyla nahr嫕a, proto頡 p齶stupov pr嫛a nejsou nastavena " "bezpe鋝餤n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nen platn znakov sada\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "nelze pou橙t URI serveru kl膻 - chyba analzy URI\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatn parametr pro import\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "neplatn parametr pro import\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatn parametr pro export\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "neplatn parametr pro export\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nelze nastavit exec-path na %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "VAROV篾: program m躨e vytvo鷡t soubor core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROV篾: %s p鷫p竁e %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZN簍KA: %s nen pro norm嫮n pou養t!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nen dovoleno pou橙vat %s s %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ned嫛 s %s smysl!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v m鏚u --pgp2 m躨ete vytv暟et pouze odd骴en podpisy nebo podpisy 鋱teln " "jako text\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v m鏚u --pgp2 nelze sou醀sn 隘frovat a podepisovat\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v m鏚u --pgp2 mus癃e pou橙t soubor (ne rouru).\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "隘frov嫕 zpr嫛 v m鏚u --pgp2 vy靠duje algoritmus IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "vybran 隘frovac algoritmus je neplatn\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "vybran hashovac algoritmus je neplatn\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "vybran hashovac algoritmus je neplatn\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "komprima鋝 algoritmus `%s' je v tomto release read-only\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "komprima鋝 algoritmus mus bt v rozmez %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "polo餒a completes-needed mus bt v鮅寤 ne 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "polo餒a marginals-needed mus bt v鮅寤 ne 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "polo餒a max-cert-depth mus bt v rozmez od 1 do 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "neplatn implicitn rove certifikace (default-cert-level); mus bt 0, 1, " "2 nebo 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "neplatn minim嫮n rove certifikace (min-cert-level); mus bt 0, 1, 2 " "nebo 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZN簍KA: jednoduch m鏚 S2K (0) je d鑴azn nedoporu鋌v嫕\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatn m鏚 S2K; mus bt 0, 1 nebo 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "neplatn defaultn p鷫dvolby\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "neplatn u養vatelsk p鷫dvolby pro 隘frov嫕燡n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "neplatn u養vatelsk p鷫dvolby pro hashov嫕燡n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "neplatn u養vatelsk p鷫dvolby pro komprimaci\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s dosud nen funk鋝 s %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "pou養t 隘frovac璫o algoritmu \"%s\" v m鏚u %s dovoleno\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "pou養t hashovac璫o algoritmu \"%s\" v m鏚u %s dovoleno\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "pou養t komprima鋝璫o algoritmu \"%s\" v m鏚u %s dovoleno\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemohu inicializovat datab嫙i d驠鬳y: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROV篾: specifikov嫕 adres嫢 (-r) bez pou養t 隘frov嫕 s ve鷫jnm kl膻em\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [jm幯o souboru]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [jm幯o souboru]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [jm幯o souboru]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [jm幯o souboru]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [jm幯o souboru]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [jm幯o souboru]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [jm幯o souboru]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [jm幯o souboru]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id u養vatele" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id u養vatele" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u養vatele" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u養vatele" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u養vatele [p齶kazy]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "nelze otev齶t %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u養vatele] [soubor s kl膻i (keyring)]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "odesl嫕 na keyserver se nezda鷡lo: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "z疄k嫕 dat z keyserveru se nezda鷡lo: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "export kl膻e se nepoda鷡l: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "hled嫕 na keyserveru se nezda鷡lo: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh dat na keyserveru se nezda鷡l: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "dek鏚ov嫕 z ASCII form嫢u selhalo: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "k鏚ov嫕 do ASCII form嫢u selhalo: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatn hashovac algoritmus `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[jm幯o souboru]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Za鋝鮅e ps嫢 svou zpr嫛u ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "nelze otev齶t `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1197,19 +1193,19 @@ msgstr "" "symbolick jm幯o sm obsahovat pouze p疄mena, 鴈slice, te鋘y nebo podtr橙tka " "a mus kon鋱t znakem '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "jm幯o u養vatele mus obsahovat znakt '@' \n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "hodnota nem躨e obsahovat 擔dn kontroln znaky\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "zadan URL pro certifika鋝 politiku je neplatn嬞n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "zadan URL pro podepisovac politiku je neplatn嬞n" @@ -1336,7 +1332,6 @@ msgstr "d驠od pro revokaci: " msgid "revocation comment: " msgstr "revoka鋝 pozn嫥ka: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMuUsS" @@ -1391,7 +1386,6 @@ msgstr " %d = D驠檟uji pln餤n" msgid " %d = I trust ultimately\n" msgstr " %d = D驠檟uji absolutn餤n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = pros璥 o v獳e informac燡n" @@ -1707,14 +1701,6 @@ msgid "keysize too small; 768 is smalles msgstr "" "velikost kl膻e je p齶li mal; minim嫮n dovolen velikost je 768 bit.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1799,7 +1785,6 @@ msgstr "neplatn hodnota\n" msgid "%s does not expire at all\n" msgstr "platnost %s neskon鴈\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2123,7 +2108,6 @@ msgstr "kl膻 %08lX: nen chr嫕髶 - p鷫s msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "kl膻 %08lX: PGP 2.x kl膻 - p鷫sko鋀no\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2137,9 +2121,7 @@ msgstr "VAROV篾: nebylo nic vyexportov msgid "too many entries in pk cache - disabled\n" msgstr "p齶li mnoho polo頡k v bufferu ve鷫jnch kl膻 - vypnuto\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User ID not found]" @@ -2371,7 +2353,6 @@ msgstr "nen nastaven implicitn soubor msgid "key %08lX: secret key imported\n" msgstr "kl膻 %08lX: tajn kl膻 importov嫕\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2611,8 +2592,6 @@ msgstr "" "Chcete vytvo鷡t nov podpis a nahradit j璥 ten, jeho platnost vypr鈹la? (a/" "N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2967,7 +2946,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "smazat identifik嫢or u養vatele" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3265,8 +3243,6 @@ msgstr "Tento kl膻 m躨e bt revokov嫕 kl msgid " (sensitive)" msgstr "(citliv informace)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3392,9 +3368,6 @@ msgstr "Vlo駙e identifik嫢or u養vatele p msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "kl膻 form嫢u PGP 2.x nelze pov檟it revokac燡n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "kl膻 nelze pov檟it revokac j璥 samm\n" @@ -3487,7 +3460,6 @@ msgstr "Jste si jist, 頡 jej chcete st msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvo鷡t pro tento podpis revoka鋝 certifik嫢? (a/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Podepsal(a) jste n嫳leduj獳 identifik嫢ory u養vatele:\n" @@ -3528,10 +3500,6 @@ msgstr "neexistuje tajn kl膻\n" msgid "user ID \"%s\" is already revoked\n" msgstr "U養vatelsk ID \"%s\" je ji revokov嫕o.\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3596,7 +3564,6 @@ msgstr " Prim嫫n fingerprint kl膻e:" msgid " Subkey fingerprint:" msgstr " Fingerprint podkl膻e:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Fingerprint kl膻e =" @@ -3606,8 +3573,6 @@ msgstr " Fingerprint kl膻e =" msgid "weird size for an encrypted session key (%d)\n" msgstr "podivn velikost 隘frovac璫o kl膻e pro sezen (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3724,7 +3689,6 @@ msgstr "Politika: " msgid "signature verification suppressed\n" msgstr "verifikace podpisu potla鋀na\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "neum璥 pracovat s t骻ito n嫳obnmi podpisy\n" @@ -3735,10 +3699,6 @@ msgstr "neum璥 pracovat s t骻ito n嫳obn msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Podpis vytvo鷫n %.*s pomoc kl膻e %s s ID u養vatele %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Kl膻 k dispozici na: " @@ -3901,7 +3861,7 @@ msgstr "雷atn form嫢 prom髶n prost鷫d msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verze %d nen podporov嫕\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemohu se p鷡pojit k `%s': %s\n" @@ -3910,11 +3870,11 @@ msgstr "nemohu se p鷡pojit k `%s': %s\n" msgid "communication problem with gpg-agent\n" msgstr "probl幦 v komunikaci s gpg-agentem\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probl幦 s agentem - pou橙v嫕 agenta vypnuto\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hlavn ID kl膻e %08lX)" @@ -3946,16 +3906,16 @@ msgstr "heslo je p齶li dlouh嬞n" msgid "invalid response from agent\n" msgstr "neplatn reakce od agenta\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "zru鈹no u養vatelem\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probl幦 s agentem: agent vrac 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3965,20 +3925,20 @@ msgstr "" "Mus癃e zn嫢 heslo, abyste odemknul(a) tajn kl膻 pro\n" "u養vatele: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "d幨ka %u bit, typ %s, kl膻 %08lX, vytvo鷫n %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "v d嫛kov幦 re養mu se nemohu pt嫢 na heslo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Vlo駙e heslo: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -4046,41 +4006,41 @@ msgstr "POZN簍KA: platnost tajn嶭o kl膻e msgid "NOTE: key has been revoked" msgstr "POZN簍KA: kl膻 byl revokov嫕" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "po靠duji kl膻 %08lX z %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nemohu dostat kl膻 ze serveru kl膻: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "chyba p鷡 pos璱嫕 na `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "sp儦n odesl嫕 na `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "chyba odesl嫕 na `%s': (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "tento keyserver nepodporuje --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "vyhled嫛嫥 \"%s\" na HKP serveru %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nemohu prohled嫛at server kl膻: %s\n" @@ -4504,9 +4464,6 @@ msgstr "擔dn absolutn d驠鬳yhodn kl膻 msgid "public key of ultimately trusted key %08lX not found\n" msgstr "ve鷫jn kl膻 k absolutn d驠鬳yhodn幦u kl膻i %08lX nebyl nalezen\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4556,7 +4513,6 @@ msgstr "" "p鷫sko鋀n `%s': toto je vygenerovan PGP kl膻 podle algoritmu ElGamal,\n" "podpisy vytvo鷫n t璥to kl膻em nejsou bezpe鋝!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4624,7 +4580,7 @@ msgstr "" "nemohu se vyvarovat slab嶭o kl膻e pro symetrickou 隘fru; operaci jsem zkusil " "%d kr嫢!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA po靠duje pou養t 160-ti bitov嶭o hashovac璫o algoritmu\n" @@ -5024,17 +4980,17 @@ msgstr "Pomoc nen k dispozici" msgid "No help available for `%s'" msgstr "Pomoc nen dostupn pro '%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "chyba p鷡 vytv暟en souboru kl膻 (keyring)`%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "soubor kl膻 (keyring) `%s' vytvo鷫n\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "selhalo obnoven vyrovn嫛ac pam鮅i kl膻: %s\n" @@ -5140,7 +5096,6 @@ msgstr "" "na t彋o platform jsou p鷡 vol嫕 extern獳h program vy靠dov嫕y\n" "do醀sn soubory (temp files)\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5218,7 +5173,6 @@ msgstr "na齶zen vstup do form嫢u ASCII. msgid "make_keysig_packet failed: %s\n" msgstr "vytvo鷫n podepisovac璫o paketu (make_keysig_packet) selhalo: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Revoka鋝 certifik嫢 vytvo鷫n.\n" @@ -5250,7 +5204,6 @@ msgstr "nezn嫥 kompresn algoritmus\n" msgid "NOTE: This key is not protected!\n" msgstr "POZN簍KA: Tento kl膻 nen chr嫕髶!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5330,7 +5283,6 @@ msgstr "chyba: neplatn fingerprint\n" msgid "error: no ownertrust value\n" msgstr "chyba: sch嫙 hodnota d驠鬳yhodnosti\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/da.po gnupg-1.2.6/po/da.po --- gnupg-1.2.5/po/da.po 2004-07-26 12:26:38.000000000 +0000 +++ gnupg-1.2.6/po/da.po 2004-08-25 14:59:13.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -33,7 +33,6 @@ msgstr "operation er ikke mulig uden bes msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan have brugt et forkert program til denne opgave)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ja" @@ -42,7 +41,6 @@ msgstr "ja" msgid "yY" msgstr "jJ" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "n" @@ -51,7 +49,6 @@ msgstr "n" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "afslut" @@ -256,7 +253,6 @@ msgstr "ikke krypteret" msgid "not processed" msgstr "ikke bearbejdet" -#. the key cannot be used for a specific usage #: util/errors.c:105 #, fuzzy msgid "unusable public key" @@ -747,25 +743,25 @@ msgstr "|N|brug kompresalgoritme N" msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -785,16 +781,16 @@ msgstr "" " --list-keys [navne] vis n鷤ler\n" " --fingerprint [navne] vis fingeraftryk\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Rapport廨 venligst fejl til .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Brug: gpg [flag] [filer] (-h for hj熞p)" # Skal alt dette overs犚tes eller er det flagene? -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -804,7 +800,7 @@ msgstr "" "sign, check, encrypt eller decrypt\n" "standard operation afh熡ger af inddata\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -812,402 +808,402 @@ msgstr "" "\n" "Underst黂tede algoritmer:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 #, fuzzy msgid "Compression: " msgstr "Kommentar: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "brug: gpg [flag] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "konfliktende kommandoer\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "alternativfil`%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "l犘er indstillinger fra `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s er ikke et gyldigt tegns犚\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 #, fuzzy msgid "invalid import options\n" msgstr "ugyldig rustning" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 #, fuzzy msgid "invalid export options\n" msgstr "ugyldig n鷤lering" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTITS: %s er ikke til normal brug!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ikke tilladt med %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er meningsl鷭 sammen med %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "valgte resum嶧lgoritme er ugyldig\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "valgte resum嶧lgoritme er ugyldig\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal v熳e 0, 1 el. 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal v熳e 0, 1 el. 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simpel S2K modus (0) frar嶟es p det skarpeste\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K modus; skal v熳e 0, 1 el. 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 #, fuzzy msgid "invalid default preferences\n" msgstr "vis pr熠erencer" -#: g10/g10.c:2226 +#: g10/g10.c:2234 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "vis pr熠erencer" -#: g10/g10.c:2230 +#: g10/g10.c:2238 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "vis pr熠erencer" -#: g10/g10.c:2234 +#: g10/g10.c:2242 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "vis pr熠erencer" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s er meningsl鷭 sammen med %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" # er det klogt at overs犚te TrustDB? -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [filnavn (som gemmes)]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn (som krypteres)]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [filnavn (som signeres)]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn (som dekrypteres)]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key bruger-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key bruger-id [kommandoer]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "kan ikke 嶙ne %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [bruger-id] [n鷤lering]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "p嶡l熛ning af beskyttelse fejlede: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "p嶡l熛ning af beskyttelse fejlede: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "p嶡l熛ning af beskyttelse fejlede: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "signering fejlede: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "p嶡l熛ning af beskyttelse fejlede: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hash-algoritme `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[filnavn]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "G til sagen og skriv meddelelsen ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan ikke 嶙ne `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3219 +#: g10/g10.c:3227 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "en notationsv熳di m ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "en notationsv熳di m ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" @@ -1336,7 +1332,6 @@ msgstr "rev- forkert n鷤letilbagekald\n" msgid "revocation comment: " msgstr "" -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "" @@ -1387,7 +1382,6 @@ msgstr "" msgid " %d = I trust ultimately\n" msgstr "" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr "" @@ -1695,14 +1689,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1772,7 +1758,6 @@ msgstr "ugyldig v熳di\n" msgid "%s does not expire at all\n" msgstr "N鷤len udl鷷er aldrig\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, fuzzy, c-format msgid "%s expires at %s\n" @@ -2072,7 +2057,6 @@ msgstr "n鷤le %08lX: ikke en rfc2440 n鷤 msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "n鷤le %08lX: ikke en rfc2440 n鷤le - udeladt\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2086,9 +2070,7 @@ msgstr "ADVARSEL: intet blev eksporteret msgid "too many entries in pk cache - disabled\n" msgstr "" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 #, fuzzy msgid "[User id not found]" msgstr "[bruger ikke fundet]" @@ -2317,7 +2299,6 @@ msgstr "ingen standard offentlig n鷤leri msgid "key %08lX: secret key imported\n" msgstr "" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2545,8 +2526,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2882,7 +2861,6 @@ msgstr "sletbid" msgid "delete user ID" msgstr "slet bruger id" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "" @@ -3193,8 +3171,6 @@ msgstr "ADVARSEL: Denne n鷤le er blevet msgid " (sensitive)" msgstr "" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3317,9 +3293,6 @@ msgstr "Indtast n鷤lens st鷨relse" msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3411,7 +3384,6 @@ msgstr "Er du sikker p at de vil benytt msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gener廨 en annull廨bar certifikat" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "" @@ -3453,10 +3425,6 @@ msgstr "" msgid "user ID \"%s\" is already revoked\n" msgstr "N鷤len er beskyttet.\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3524,7 +3492,6 @@ msgstr " Fingeraftryk:" msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 #, fuzzy msgid " Key fingerprint =" @@ -3535,8 +3502,6 @@ msgstr " Fingeraftryk:" msgid "weird size for an encrypted session key (%d)\n" msgstr "" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3649,7 +3614,6 @@ msgstr "Politik: " msgid "signature verification suppressed\n" msgstr "" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 #, fuzzy msgid "can't handle these multiple signatures\n" @@ -3660,10 +3624,6 @@ msgstr "opret en separat signatur" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3828,7 +3788,7 @@ msgstr "" msgid "gpg-agent protocol version %d is not supported\n" msgstr "valgte cifferalgoritme %d er ugyldig\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "kan ikke 嶙ne '%s': %s\n" @@ -3837,11 +3797,11 @@ msgstr "kan ikke 嶙ne '%s': %s\n" msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hovedn鷤le-ID %08lX)" @@ -3872,36 +3832,36 @@ msgstr "" msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Indtast kodes犚ning: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Gentag kodes犚ning: " @@ -3968,41 +3928,41 @@ msgstr "" msgid "NOTE: key has been revoked" msgstr "n鷤le %08lX: n鷤le er blevet annulleret!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "import廨 n鷤ler fra en n鷤leserver: %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, fuzzy, c-format msgid "can't get key from keyserver: %s\n" msgstr "import廨 n鷤ler fra en n鷤leserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, fuzzy, c-format msgid "error sending to `%s': %s\n" msgstr "fejl ved l犘ning af '%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, fuzzy, c-format msgid "can't search keyserver: %s\n" msgstr "import廨 n鷤ler fra en n鷤leserver: %s\n" @@ -4409,9 +4369,6 @@ msgstr "" msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4455,7 +4412,6 @@ msgid "" "signatures!\n" msgstr "" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4521,7 +4477,7 @@ msgstr "" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -4812,17 +4768,17 @@ msgstr "Ingen hj熞p tilg熡gelig" msgid "No help available for `%s'" msgstr "Ingen hj熞p tilg熡gelig for `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, fuzzy, c-format msgid "error creating keyring `%s': %s\n" msgstr "fejl ved skrivning af n鷤lering `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, fuzzy, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "ingen standard offentlig n鷤lering\n" @@ -4923,7 +4879,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5002,7 +4957,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "signering fejlede: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 #, fuzzy msgid "Revocation certificate created.\n" @@ -5037,7 +4991,6 @@ msgstr "ukendt kompressionsalgoritme" msgid "NOTE: This key is not protected!\n" msgstr "Denne n鷤le er ikke beskyttet.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5111,7 +5064,6 @@ msgstr "fejl i trailerlinie\n" msgid "error: no ownertrust value\n" msgstr "eksport廨 ejertillidsv熳dierne" -#. error #: g10/tdbdump.c:204 #, fuzzy, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/de.po gnupg-1.2.6/po/de.po --- gnupg-1.2.5/po/de.po 2004-07-26 12:26:38.000000000 +0000 +++ gnupg-1.2.6/po/de.po 2004-08-25 14:59:13.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-07-20 16:01+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -32,7 +32,6 @@ msgid "(you may have used the wrong prog msgstr "" "(m鐷licherweise haben Sie das falsche Programm fr diese Aufgabe benutzt)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ja" @@ -41,7 +40,6 @@ msgstr "ja" msgid "yY" msgstr "jJyY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nein" @@ -50,7 +48,6 @@ msgstr "nein" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit" @@ -255,7 +252,6 @@ msgstr "nicht verschlsselt" msgid "not processed" msgstr "nicht bearbeitet" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "unbrauchbarer 鐪fentlicher Schssel" @@ -744,19 +740,19 @@ msgstr "|N|Komprimierverfahren N benutze msgid "throw keyid field of encrypted packets" msgstr "Empf鄚ger-ID verschlsselter Pakete entfernen" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Foto-IDs anzeigen" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Foto-IDs nicht anzeigen" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Kommandozeilentext fr den Foto-Betrachter setzen" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -765,7 +761,7 @@ msgstr "" "(Auf der \"man\"-Seite ist eine vollst鄚dige Liste aller Kommandos und " "Optionen)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -785,17 +781,17 @@ msgstr "" " --list-keys [Namen] Schlssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrcke\" anzeigen\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Berichte ber Programmfehler bitte in englisch an .\n" "Sinn- oder Schreibfehler in den deutschen Texten bitte an .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fr Hilfe)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -805,7 +801,7 @@ msgstr "" "Signieren, prfen, verschlsseln, entschlsseln.\n" "Die voreingestellte Operation ist abh鄚gig von den Eingabedaten\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -813,382 +809,382 @@ msgstr "" "\n" "Untersttzte Verfahren:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "猈f.Schlssel: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Verschl.: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Komprimierung: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "Widersprchliche Befehle\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "WARNUNG: Unsicheres Besitzverh鄟tnis (%s) \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "WARNUNG: Unsicheres Besitzverh鄟tnis des Verzeichnisses (%s) \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "Unbekanntes Konfigurationselement `%s'\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "Verschlsselungserweiterung \"%s\" wurde wegen falscher Rechte nicht " "geladen\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gltiger Zeichensatz.\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "Schlsselserver-URI konnte nicht zerlegt werden\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ungltige Import Option.\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "Ungltige Import Option\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ungltige Export Option.\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "Ungltige export Option\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Der Ausfhrungspfad konnte nicht auf %s gesetzt werden.\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm k霵nte eine core-dump-Datei schreiben!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNUNG: %s ersetzt %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht fr den blichen Gebrauch gedacht!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus k霵nen Sie nur abgetrennte oder Klartextunterschriften " "machen\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus k霵nen Sie nicht gleichzeitig unterschreiben und " "verschlsseln\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "Im --pgp2-Modus mssen Sie Dateien benutzen und k霵nen keine Pipes " "verwenden.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "Verschlssen einer Botschaft ben飆igt im --pgp2-Modus die IDEA-" "Verschlsselung\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgew鄣lte Verschlsselungsverfahren ist ungltig\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgew鄣lte Hashverfahren ist ungltig\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "Das ausgew鄣lte Hashverfahren ist ungltig\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "Kompressionsverfahren `%s' ist in diesem Release read-only\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "Das Komprimierverfahren mu im Bereich %d bis %d liegen\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed mssen gr廲er als 0 sein\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed mssen gr廲er als 1 sein\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth mu im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ungltiger \"default-cert-level\"; Wert mu 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ungltiger \"min-cert-level\"; Wert mu 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungltiger \"simple S2K\"-Modus; Wert mu 0, 1 oder 3 sein\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "ungltige Standard Voreinstellungen\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "ungltige private Verschlsselungsvoreinstellungen\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "ungltige private Hashvoreinstellungen\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "ungltige private Komprimierungsvoreinstellungen\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s arbeitet noch nicht mit %s zusammen\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" "Die Benutzung des Verschlsselungsverfahren %s ist im %s-Modus nicht " "erlaubt.\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "WARNUNG: Empf鄚ger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [Dateiname]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key User-ID" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key User-ID" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht ge鐪fnet werden: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlsselbund]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "Senden an Schlsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Empfangen vom Schlsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "Schlsselexport fehlgeschlagen: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "Suche auf dem Schlsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh vom Schlsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hlle ist fehlgeschlagen: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungltiges Hashverfahren '%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht ge鐪fnet werden\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1196,19 +1192,19 @@ msgstr "" "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und mu mit einem '=' enden\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungltig\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungltig\n" @@ -1333,7 +1329,6 @@ msgstr "Grund fr Widerruf: " msgid "revocation comment: " msgstr "Widerruf-Bemerkung: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1389,7 +1384,6 @@ msgstr " %d = Ich vertraue ihm vollst鄚d msgid " %d = I trust ultimately\n" msgstr " %d = Ich vertraue ihm absolut\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = Bitte weitere Information anzeigen\n" @@ -1713,14 +1707,6 @@ msgstr "zu kurz; 1024 ist die kleinste f msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "zu kurz; 768 ist die kleinste m鐷liche Schlssell鄚ge.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1805,7 +1791,6 @@ msgstr "Ungltiger Wert.\n" msgid "%s does not expire at all\n" msgstr "%s verf鄟lt nie.\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2136,7 +2121,6 @@ msgid "key %08lX: PGP 2.x style key - sk msgstr "Schlssel %08lX: PGP 2.x-artiger Schlssel - bersprungen\n" # translated by wk -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2150,9 +2134,7 @@ msgstr "WARNUNG: Nichts exportiert\n" msgid "too many entries in pk cache - disabled\n" msgstr "zu viele Eintr輍e im pk-Cache - abgeschaltet\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User-ID nicht gefunden]" @@ -2392,7 +2374,6 @@ msgstr "Kein voreingestellter geheimer S msgid "key %08lX: secret key imported\n" msgstr "Schlssel %08lX: Geheimer Schlssel importiert\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2639,8 +2620,6 @@ msgstr "" "Soll eine neue Beglaubigung als Ersatz fr die abgelaufene erstellt werden? " "(J/n) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2998,7 +2977,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "User-ID entfernen" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3297,8 +3275,6 @@ msgstr "Dieser Schlssel k霵nte widerruf msgid " (sensitive)" msgstr "(empfindlich)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3431,9 +3407,6 @@ msgstr "" "Ein PGP 2.x-artiger Schlssel kann nicht als vorgesehener Widerrufer " "eingetragen werden\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Ein Schlssel kann nicht sein eigener vorgesehener Widerrufer werden\n" @@ -3529,7 +3502,6 @@ msgstr "Wollen Sie ihn immmer noch wider msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Ein Widerrufszertifikat fr diese Unterschrift erzeugen (j/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" @@ -3570,10 +3542,6 @@ msgstr "Kein geheimer Schlssel\n" msgid "user ID \"%s\" is already revoked\n" msgstr "User-ID \"%s\" ist bereits widerrufen\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3639,7 +3607,6 @@ msgstr " Haupt-Fingerabdruck =" msgid " Subkey fingerprint:" msgstr " Unter-Fingerabdruck =" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Schl.-Fingerabdruck =" @@ -3649,8 +3616,6 @@ msgstr " Schl.-Fingerabdruck =" msgid "weird size for an encrypted session key (%d)\n" msgstr "Seltsame L鄚ge fr einen verschlsselten Sitzungsschlssel (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3766,7 +3731,6 @@ msgstr "Richtlinie: " msgid "signature verification suppressed\n" msgstr "Unterschriften-鈁erprfung unterdrckt\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "diese Mehrfachunterschriften k霵nen nicht behandelt werden\n" @@ -3777,10 +3741,6 @@ msgstr "diese Mehrfachunterschriften k霵 msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Unterschrift vom %.*s, %s Schlssel ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Schlssel erh鄟tlich bei: " @@ -3943,7 +3903,7 @@ msgstr "fehlerhaft aufgebaute GPG_AGENT_ msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent-Protokoll-Version %d wird nicht untersttzt\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" @@ -3952,12 +3912,12 @@ msgstr "Verbindung zu '%s' kann nicht au msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit GPG-Agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (Hauptschlssel-ID %08lX)" @@ -3989,16 +3949,16 @@ msgstr "Passphrase ist zu lang\n" msgid "invalid response from agent\n" msgstr "Falsche Antwort des Agenten\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4008,20 +3968,20 @@ msgstr "" "Sie ben飆igen eine Passphrase, um den geheimen Schlssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-Bit %s Schlssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Geben Sie die Passphrase ein: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Geben Sie die Passphrase nochmal ein: " @@ -4088,41 +4048,41 @@ msgstr "Hinweis: geheimer Schlssel %08l msgid "NOTE: key has been revoked" msgstr "Hinweis: Schlssel wurde widerrufen" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "Schlssel %08lX wird von %s angefordert\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "Schlssel ist beim Schlsselserver nicht erh鄟tlich: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "Fehler beim Senden an `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "Senden an `%s' erfolgreich (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "Senden an `%s' erfolglos (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "Dieser Schlsselserver untersttzt --search-keys nicht\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "kann Schlsselserver nicht durchsuchen: %s\n" @@ -4571,9 +4531,6 @@ msgid "public key of ultimately trusted msgstr "" "鐪f.Schlssel des uneingeschr鄚kt vertrautem Schlssel %08lX nicht gefunden\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4623,7 +4580,6 @@ msgstr "" "'%s bersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schlssel. Das " "ist fr Signaturen NICHT sicher genug!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4693,7 +4649,7 @@ msgstr "" "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlssels fr " "sym.Verschlsselung nicht vermieden werden!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA ben飆igt einen 160-bit Hash Algorithmus\n" @@ -5123,17 +5079,17 @@ msgstr "Keine Hilfe vorhanden." msgid "No help available for `%s'" msgstr "Keine Hilfe fr '%s' vorhanden." -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "Fehler beim Erzeugen des Schlsselbundes `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "Schlsselbund `%s' erstellt\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Schlsselbund-Cache konnte nicht neu erzeugt werden: %s\n" @@ -5241,7 +5197,6 @@ msgstr "" "Diese Plattform ben飆igt tempor酺e Dateien zur Ausfhrung von externen\n" "Programmen\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5320,7 +5275,6 @@ msgstr "Ausgabe mit ASCII Hlle erzwunge msgid "make_keysig_packet failed: %s\n" msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Widerrufzertifikat erzeugt.\n" @@ -5353,7 +5307,6 @@ msgid "NOTE: This key is not protected!\ msgstr "Dieser Schlssel ist nicht geschtzt.\n" # translated by wk -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5435,7 +5388,6 @@ msgstr "Fehler: ungltiger Fingerabdruck msgid "error: no ownertrust value\n" msgstr "Fehler: Kein \"Owner trust\"-Wert\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/el.po gnupg-1.2.6/po/el.po --- gnupg-1.2.5/po/el.po 2004-07-26 12:26:39.000000000 +0000 +++ gnupg-1.2.6/po/el.po 2004-08-25 14:59:14.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -30,7 +30,6 @@ msgstr " 錼濊瀦鼖葐 麧 橀罅 勯罅轘 蠮 msgid "(you may have used the wrong program for this task)\n" msgstr "(裍 虀踠濇瀔毉祼敳 醏鴄 貘蜤摐憼 蜒 斠轘 鐋 殥蝁鵸)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "罅懁罅" @@ -39,7 +38,6 @@ msgstr "罅懁罅" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "玃|濷" @@ -48,7 +46,6 @@ msgstr "玃|濷" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "醲儵敳澞檇" @@ -253,7 +250,6 @@ msgstr "懞 膲臝鐐蜤暡賚楜" msgid "not processed" msgstr "懞 歑槴殥蝁鶂楜" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "懞 虀踠濇瀔毉祼濇 儃檇鶅 膹樥魠" @@ -738,19 +734,19 @@ msgstr "|N|虀祼 摠蜧麌鳻瀦 黼斶蜌鵰 N" msgid "throw keyid field of encrypted packets" msgstr "僸摦鼁巑 鐐 謥魠瀦 keyid 鐒 膲臝鐐蜤暡賚楜 謯縥鐒" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "闋樥蕓臄鵰 鐒 Photo ID" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "杹 摫樥蕓臄鵰 鐒 Photo ID" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "砉澞檇 鐋 蜤摐徻 樇鐐錌 蜒 摫樥蕓臄鵰 鐒 Photo ID" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -758,7 +754,7 @@ msgstr "" "@\n" "(麧裎 鐋 鵴錈魟 man 蜒 擩 謻碖 錈黀 樇鐐錌 罼 歑澣檶)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -778,15 +774,15 @@ msgstr "" " --list-keys [瀍憼酃] 摫樥蕓臄鵰 膹樥僸燡n" " --fingerprint [瀍憼酃] 摫樥蕓臄鵰 摫濻臝幪鐒 (fingerprints)\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "鍚暡楒殦 酃 貘檺錞憼酃 黀 \n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "郩祼: gpg [歑澣檶椯] [摙灚葐] (-h 蜒 碨碄樥)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -796,7 +792,7 @@ msgstr "" "臝檶鼁巑, 楋樍艬, 膲臝鐐蜤媺踠 摫氋嚬贄檶鵘氍鵰\n" " 貘氋摜瀎澞徾耬 錼濊瀦鼖葐 槴摙轗酃 摫 酃 麧儌徾罅 樥齘儌騱n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -804,382 +800,382 @@ msgstr "" "\n" "涾瀀鐋齌聧懤臩 摠裼齌鳻毉:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "櫺斀鯞錼毈:" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "抁臝酃鍺齌鳻濿: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "郚斶蜌鵰: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "虀祼: gpg [歑澣檶椯] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "黼蜺厴蘩懤翴 樇鐐錧瀙n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "麧 碫楴賙 鐐 匷懧瀇 = 黀瀍 瀎澞檇 鐋 瀌塤摥 \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "倳狣厊玿珈к: 懞 摷攠錞 毈濈臲踠葐 黀 %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "倳狣厊玿珈к: 懞 摷攠錼裋 塤樥殣 黀 %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "倳狣厊玿珈к: 懞 摷攠錞 毈濈臲踠葐殢膹樥黀瀦 攠縥錝 黀 %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "倳狣厊玿珈к: 懞 摷攠錼裋 塤樥殣 殢膹樥黀瀦 攠縥錝 黀 %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "塨薋黀 摿鏻耪蜉樇 嚬鳻裍潁 \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "蚡旼屾蚡: 摦臩碄賙 鐐 謯錁 摙灚蜍 貘氋摜瀎澞徾薋 歑澣檶 `%s'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "蚡旼屾蚡: 懞 貘氋摜瀎澞徾臩 摙灚蜍 歑澣檶 `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "摙灚蜍 歑澣檶 `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "摿塨薋鵰 歑澣檶 摫 `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" " 歑椻酃鵰 鐐 膲臝酃鍺齌鳻瀦 \"%s\" 麧 獿嚪鳿耪 歑樥鬿 臝塱艬罍\n" "摿摷攠錼裋 塤樥殣\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "鐐 %s 麧 橀罅 楯艕厴 鵴 欒鼁臲碖燡n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "撦罍摐葐 歑槴殥蝁鵸摥 鐐 URI 鐐 僸摓瀌澞 膹樥僸燡n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 懞 楯艕鼫 歑澣檶椯 樥蝁裺蜛瀙n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "懞 楯艕鼫 歑澣檶椯 樥蝁裺蜛瀙n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 懞 楯艕鼫 歑澣檶椯 槴摦蜛瀙n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "懞 楯艕鼫 歑澣檶椯 槴摦蜛瀙n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "撦罍摐葐 瀎澞斀 鐐 exec-path 鵴 %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "倳狣厊玿珈к: 鐐 貘蜤摐憼 裍 儃擩瀦鼖祼樥 摙灚蜍 core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "倳狣厊玿珈к: 鐐 %s 謯鼁縔斶醲 鐐 %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "蚡旼屾蚡: 鐐 %s 麧 橀罅 蜒 罼臩臄縤 虀祼!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "鐐 %s 麧 歑濊鵚謥酃 懤 鐐 %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "鐐 %s 麧 歃樥 罼擤葐 楜臩殧 憼糅 懤 鐐 %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "斶瀎橀醲 罅 縔翴醲 摫氋瀌徾翴 罼魨鵚 臝檶鼁巕 檇臩 鵴 --pgp2 罼轗黀摷蔌n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "麧 斶瀎橀醲 罅 臝檶鵘欈醲 罼 罅 膲臝鐐蜤暡橀醲 酃蘟虀瀍 鵴 --pgp2 " "罼轗黀摷蔌n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "檇臩 摙灚葐 歑濊鵚豵薀摋 (罼 玃 pipes) 罼酃 鐋 罼酃黀摷 --pgp2.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" " 膲臝鐐蜤媺踠 樇 懞薚憼鐐 鵴 --pgp2 罼轗黀摷 摫摋醲 鐐 摠蜧. IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr " 歑澣樍徾臩 摠裼齌鳻濿 膲臝鐐蜤媺踠趛 麧 橀罅 楯艕厴瀙n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr " 歑澣樍徾臩 摠裼齌鳻濿 謥麌錣鸄 麧 橀罅 楯艕厴瀙n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "" " 歑澣樍徾臩 摠裼齌鳻濿 謥麌錣鸄 蜒 謮黀瀔檽踠蔌n" "麧 橀罅 楯艕厴瀙n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" " 摠裼齌鳻濿 黼斶蜌鵰 `%s' 橀罅 鵴 斠轘 鐋 椻儌鵰 蜒 摿塨薋鵰 檇臩\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr " 摠裼齌鳻濿 黼斶蜌鵰 貘椲樥 罅 橀罅 懤酃鞡 %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed 貘椲樥 罅 橀罅 懤蝁錔醲鼁 摫 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed 貘椲樥 罅 橀罅 懤蝁錔醲鼁 摫 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth 貘椲樥 罅 橀罅 懤酃鞡 1 罼 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "懞 楯艕厴 default-cert-level 貘椲樥 罅 橀罅 0, 1, 2, 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "懞 楯艕厴 min-cert-level 貘椲樥 罅 橀罅 0, 1, 2, 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "蚡旼屾蚡: 摫錞 S2K 罼轗黀摷 (0) 貘椲樥 罅 摫濼濆蜲酃嬞n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "懞 楯艕鼩 罼轗黀摷 S2K; 貘椲樥 罅 橀罅 0, 1 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "懞 楯艕鼫 貘櫇謮錝蜙瀙n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "懞 楯艕鼫 貘櫇謮錝蜙 貘瀀謮膬 膲臝酃鍺齌鳻瀦\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "懞 楯艕鼫 貘櫇謮錝蜙 貘瀀謮膬 摠裼齌鳻瀦 謥麌錣鸄瀙n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "懞 楯艕鼫 貘櫇謮錝蜙 貘瀀謮膬 摠裼齌鳻瀦 黼斶蜌鵰瀙n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "鐐 %s 摓憼 麧 錼濊瀦鼖橀 憼糅 懤 鐐 %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "摫摦瀎濆殦 虀祼 鐐 膲臝酃鍺齌鳻瀦 \"%s\" 黀賝 罼轗黀摷 %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" "摫摦瀎濆殦 虀祼 鐐 摠裼齌鳻瀦 謥麌錣鸄 \"%s\" 黀賝 罼轗黀摷 %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" "摫摦瀎濆殦 虀祼 鐐 摠裼齌鳻瀦 黼斶蜌鵰 \"%s\" 黀賝 罼轗黀摷 %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "摫濻蘙葐 摙玃膬豵蛖鵰 鐋 TrustDB: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "倳狣厊玿珈к: 噘鳿罼 謯鼁錞贄殣 (-r) 觾齌 虀祼 膲臝鐐蜤媺踠趛\n" "儃斀鵸瀦 膹樥僸燽\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [臩憼 摙灚蜍騬" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [臩憼 摙灚蜍騬" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [臩憼 摙灚蜍騬" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [臩憼 摙灚蜍騬" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [臩憼 摙灚蜍騬" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [臩憼 摙灚蜍騬" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [臩憼 摙灚蜍騬" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [臩憼 摙灚蜍騬" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [樇鐐錧瀧" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "撦罍摐葐 貘鶌摷趛 鐐 %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [膹樥儌魶聬]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver 摫瀀鐐錞 摫椼蘙: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver 錞鸄 摫椼蘙: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "槴摦蜛 膹樥僸燽 摫椼蘙: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver 摿撂禂踠 摫椼蘙: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver 摿摿歈鵰 摫椼蘙: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "摫歞鵘膦鵰 摫椼蘙: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "凞鵘膦鵰 摫椼蘙: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "懞 楯艕厴 摠裼齌鳻濿 hash `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[臩憼 摙灚蜍騬" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "泫瀎橀醲 鏿鼁 罅 樥鶋蜡蜲醲 鐐 徻薏憼 鶋 ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "撦罍摐葐 貘鶌摷趛 鐐 `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1187,19 +1183,19 @@ msgstr "" "楜 臩憼 鵰懤裐鵰 斶瀎橀 罅 謥齌歃樥 檇臩 樏鏷蹧鶅斀蘪 欒鼁臲碖殣 罼 耪縰 " "罼 罅 錞蜲 懤 楜 '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "鐐 臩憼 鵰懤裐鵰 虀祼鐋 貘椲樥 罅 謥齌歃樥 鐐 '@' 欒鼁臲碖塿n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr " 鏻徻 鵰懤裐鵰 貘椲樥 罅 懞 虀踠濇瀔毉橀 欒鼁臲碖殣 control\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "鐐 URL 豵錁鏻縤 謮黀瀔毉踣濋燽 豵 噉鳿耪 麧 橀罅 楯艕厴\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "鐐 URL 豵錁鏻縤 臝檶鼁巑 豵 噉鳿耪 麧 橀罅 楯艕厴\n" @@ -1326,7 +1322,6 @@ msgstr "摋轚 蜒 摿塎錣鵰:" msgid "revocation comment: " msgstr "齀錁 摿塎錣鵰:" -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1381,7 +1376,6 @@ msgstr " %d = 跪 謻碖 樦謮黀瀀耬\n" msgid " %d = I trust ultimately\n" msgstr " %d = 鱗謮黀濆瀌摋 摫錴酃\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = 摫樥蕓臄鵰 謥齌麑醲夒 謻趡濼瀎澸燡n" @@ -1704,14 +1698,6 @@ msgstr "" "鐐 徾蜲鴄 膹樥僸燽 橀罅 豵錔 擩膲, 768 橀罅 槶媸澞鐋 歑濊鼫蹞懤耬 " "鏻徻.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1798,7 +1784,6 @@ msgstr "懞 楯艕鼩 鏻徻\n" msgid "%s does not expire at all\n" msgstr "鐐 %s 麧 錞蜲 豵轕\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2129,7 +2114,6 @@ msgstr "膹樥魠 %08lX: 麧 橀罅 貘瀀酃醲 msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "膹樥魠 %08lX: 膹樥魠 鐊豵 PGP 2.x - 謯鼁錼裛鳿耪\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2143,9 +2127,7 @@ msgstr "倳狣厊玿珈к: 麧 楯澼 罼擤葐 msgid "too many entries in pk cache - disabled\n" msgstr "謣鼁 豵錭椯 罼酃蠮麎鵴澽 黀 pk cache - 摫樇殥蜧豵歕鳿耪\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User id 麧 碫楴賙嬁" @@ -2376,7 +2358,6 @@ msgstr "麧 臝塱灚 貘氋摜瀎澞徾耬 膹樥 msgid "key %08lX: secret key imported\n" msgstr "膹樥魠 %08lX: 檁黀濋 膹樥魠 樥鶀玁賙嫹n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2618,8 +2599,6 @@ msgid "Do you want to issue a new signat msgstr "" "楋殦 罅 瀎裍殦 擩 縻 臝檶鼁巑 貘濿 摿鏻罼轗黀摷 鐋 錣蜵楜趛; (y/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2974,7 +2953,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "僸摦鼁巑 樇 user ID" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3273,8 +3251,6 @@ msgstr "隸鏸 鐐 膹樥魠 斶瀎橀 罅 摿摓錣 msgid " (sensitive)" msgstr " (氁摲鵩踣)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3403,9 +3379,6 @@ msgid "cannot appoint a PGP 2.x style ke msgstr "" "撦罍摐葐 瀎澞斀 樇 膹樥僸燽 鐊豵 PGP 2.x, 鶋 僸瀎澞徾臩 摿摓錣轘\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3502,7 +3475,6 @@ msgstr "豗蜧蘘 魦錼醲 罅 摿摓錣鳺 斠鏸 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "櫺擩瀦鼖葐 樇 謮黀瀔毉踣濋燽 摿塎錣鵰 蜒 斠轘 鐋 臝檶鼁巑; (y/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "跪殦 臝檶鵘鷿 斠轗 酃 user ID:\n" @@ -3543,10 +3515,6 @@ msgstr "罼縻罅 檁黀濋 膹樥魠\n" msgid "user ID \"%s\" is already revoked\n" msgstr "鐐 user ID \"%s\" 歃樥 碇 摿摓錣鳺綅n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3611,7 +3579,6 @@ msgstr " 闋濻蹠憼 貘醲 膹樥僸燽:" msgid " Subkey fingerprint:" msgstr " 闋濻蹠憼 臝氋錼毈濈:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " 闋濻蹠憼 膹樥僸燽 =" @@ -3621,8 +3588,6 @@ msgstr " 闋濻蹠憼 膹樥僸燽 =" msgid "weird size for an encrypted session key (%d)\n" msgstr "謯鵘鍷臩 徾蜲鴄 蜒 楜 膹樥魠 膲臝鐐蜤暡賚楜趛 黼翴儊葐 (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3735,7 +3700,6 @@ msgstr "厞錁鏻縤: " msgid "signature verification suppressed\n" msgstr "罼酃黀瀇 摿塎錣鵰 臝檶鼁巑瀙n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "撦罍摐葐 灚濄澞斀 斠鏿 鐒 豵錭摫錌 臝檶鼁籚燡n" @@ -3745,10 +3709,6 @@ msgstr "撦罍摐葐 灚濄澞斀 斠鏿 鐒 豵 msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "涾檶鼁巑 楯澼 黀 %.*s 懤 虀祼 鐐 膹樥僸燽%s ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "抔樥魠 僸摜楻濇 黀: " @@ -3913,7 +3873,7 @@ msgstr "罼膬僸敳臝瀌楜 懤酃碲踣 謥齌瘌 msgid "gpg-agent protocol version %d is not supported\n" msgstr "麧 臝瀀鐋麌緪酃 椻儌鵰 貘鐐蕓錭瀦 %d 鐐 gpg-agent\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "撦罍摐葐 匷罽殢趛 黀 `%s': %s\n" @@ -3922,11 +3882,11 @@ msgstr "撦罍摐葐 匷罽殢趛 黀 `%s': %s\n msgid "communication problem with gpg-agent\n" msgstr "貘碲賚 歑濋毉薋繄摥 懤 鐐 gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "貘碲賚 懤 鐐 agent - 摫樇殥蜧豵歕鵰 鐋 虀祼趛 鐐 agent\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (蕡齌 膹樥魠, ID %08lX)" @@ -3959,16 +3919,16 @@ msgstr " 瓕嫇 膹樥魠 橀罅 豵錔 懤蜡錣 msgid "invalid response from agent\n" msgstr "懞 楯艕鼩 摫塥鐋鵰 摫 鐐 agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "摓蘘鳿耪 摫 鐐 虀祼鐋\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "貘碲賚 懤 鐐 agent: agent 歑澞鐙歅樥 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3978,20 +3938,20 @@ msgstr "" "郩樥塍殢醲 擩 瓕嫇 膹樥魠 蜒 罅 鍷膹樥噘鵴醲 鐐 檁黀濋 膹樥魠\n" "蜒 鐐 虀祼鐋: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s 膹樥魠, ID %08lX, 儃擩瀦鼖葐 %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "撦罍摐葐 殥鐋鵰 鐋 錧鍡 膹樥魠 鵴 罼轗黀摷 鬾鶂趛\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "剕賙鐙瀇檶祼醲 鐋 瓕嫇 膹樥魠: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "黴摿摠塓殦 鐋 瓕嫇 膹樥魠: " @@ -4057,41 +4017,41 @@ msgstr "蚡旼屾蚡: 鐐 檁黀濋 膹樥魠 %08l msgid "NOTE: key has been revoked" msgstr "蚡旼屾蚡: 鐐 膹樥魠 歃樥 摿摓錣鳺" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "摲鐋鵰 膹樥僸燽 %08lX 摫 鐐 %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "撦罍摐葐 錞鸄 鐐 膹樥僸燽 摫 鐐 僸摓瀌澞轘: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "鼭塝憼 黀 摫瀀鐐錞 貘濿 鐐 `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "歑濊蘙葐 鐋 摫瀀鐐錞 黀 `%s' (罼轗黀摷=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "摫濻蘙葐 黀賝 摫瀀鐐錞 貘濿 鐐 `%s': 罼轗黀摷=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "斠鏸 keyserver 麧 臝瀀鐋麌緪 --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "摿撂禂踠 鐐 \"%s\" 摫 鐐 HKP 僸摓瀌澞轘 %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "撦罍摐葐 摿撂禂踠趛 僸摓瀌澞轘: %s\n" @@ -4525,9 +4485,6 @@ msgid "public key of ultimately trusted msgstr "" "麧 碫楴賙 鐐 儃檇鶅 膹樥魠 鐐 摫錴酃 樦謮黀濆鶅斀 膹樥僸燽 %08lX\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4577,7 +4534,6 @@ msgstr "" "謯鼁錼裛鳿耪 `%s': 斠鏸 橀罅 儃擩瀦鼖賚楜 摫 PGP 膹樥魠 ElGamal 罼 麧 " "橀罅 摷攠錧 蜒 臝檶鼁巕!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4648,7 +4604,7 @@ msgstr "" "撦罍摐葐 摫濼礯硻 撦罅斀 膹樥僸燽 蜒 黼擤殦齌蕓 膲臝酃鍺齌鳻, 儌膦徻 " "蜒 %d 獿鵚!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr " DSA 摫摋醲 鐋 虀祼 樇 160 bit 摠裼齌鳻瀦 hash\n" @@ -5056,17 +5012,17 @@ msgstr "櫻 臝塱灚 僸摜楻濇 碨碄樥" msgid "No help available for `%s'" msgstr "櫻 臝塱灚 僸摜楻濇 碨碄樥 蜒 `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "撦罍摐葐 儃擩瀦鼖葐 鐋 膹樥儌魶聬 `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "膹樥儌魶聬 `%s' 儃擩瀦鼖碄賙嫹n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "摫濻蘙葐 歑摿撦懞鵰 鐋 cache 膹樥儌魶聬: %s\n" @@ -5171,7 +5127,6 @@ msgid "this platform requires temp files msgstr "" "斠轘 謻敳籙儵 摫摋醲 貘瀀. 摙灚葐 黀賝 膹祼 槴醲齌蕘 貘檶鼁擤嫄燡n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5249,7 +5204,6 @@ msgstr "鷥摿摦罼鶂 槴儌 鵴 凞鼁膦鶂 msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 摫椼蘙: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "剞黀瀔毉踣濋 摿塎錣鵰 儃擩瀦鼖碄賙.\n" @@ -5281,7 +5235,6 @@ msgstr "塨薋黀濿 摠裼齌鳻濿 貘瀀酃鵸摥\n msgid "NOTE: This key is not protected!\n" msgstr "蚡旼屾蚡: 隸鏸 鐐 膹樥魠 麧 貘瀀酃醲殦摋!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5361,7 +5314,6 @@ msgstr "鼭塝憼: 懞 楯艕厴 摫濻蹠憼\n" msgid "error: no ownertrust value\n" msgstr "鼭塝憼: 罼擤橎 鏻徻 樦謮黀瀀耬 毈濈臲禂蔌n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/en@boldquot.header gnupg-1.2.6/po/en@boldquot.header --- gnupg-1.2.5/po/en@boldquot.header 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/en@boldquot.header 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,25 @@ +# All this catalog "translates" are quotation characters. +# The msgids must be ASCII and therefore cannot contain real quotation +# characters, only substitutes like grave accent (0x60), apostrophe (0x27) +# and double quote (0x22). These substitutes look strange; see +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html +# +# This catalog translates grave accent (0x60) and apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019). +# It also translates pairs of apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019) +# and pairs of quotation mark (0x22) to +# left double quotation mark (U+201C) and right double quotation mark (U+201D). +# +# When output to an UTF-8 terminal, the quotation characters appear perfectly. +# When output to an ISO-8859-1 terminal, the single quotation marks are +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to +# grave/acute accent (by libiconv), and the double quotation marks are +# transliterated to 0x22. +# When output to an ASCII terminal, the single quotation marks are +# transliterated to apostrophes, and the double quotation marks are +# transliterated to 0x22. +# +# This catalog furthermore displays the text between the quotation marks in +# bold face, assuming the VT100/XTerm escape sequences. +# diff -urpP gnupg-1.2.5/po/en@quot.header gnupg-1.2.6/po/en@quot.header --- gnupg-1.2.5/po/en@quot.header 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/en@quot.header 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,22 @@ +# All this catalog "translates" are quotation characters. +# The msgids must be ASCII and therefore cannot contain real quotation +# characters, only substitutes like grave accent (0x60), apostrophe (0x27) +# and double quote (0x22). These substitutes look strange; see +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html +# +# This catalog translates grave accent (0x60) and apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019). +# It also translates pairs of apostrophe (0x27) to +# left single quotation mark (U+2018) and right single quotation mark (U+2019) +# and pairs of quotation mark (0x22) to +# left double quotation mark (U+201C) and right double quotation mark (U+201D). +# +# When output to an UTF-8 terminal, the quotation characters appear perfectly. +# When output to an ISO-8859-1 terminal, the single quotation marks are +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to +# grave/acute accent (by libiconv), and the double quotation marks are +# transliterated to 0x22. +# When output to an ASCII terminal, the single quotation marks are +# transliterated to apostrophes, and the double quotation marks are +# transliterated to 0x22. +# diff -urpP gnupg-1.2.5/po/eo.po gnupg-1.2.6/po/eo.po --- gnupg-1.2.5/po/eo.po 2004-07-26 12:26:38.000000000 +0000 +++ gnupg-1.2.6/po/eo.po 2004-08-25 14:59:13.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -31,7 +31,6 @@ msgstr "operacio ne eblas sen sekura mem msgid "(you may have used the wrong program for this task)\n" msgstr "(eble vi uzis la mal黐stan programon por 熵 tiu tasko)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 #, fuzzy msgid "yes" @@ -41,7 +40,6 @@ msgstr "jes" msgid "yY" msgstr "jJ" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "ne" @@ -50,7 +48,6 @@ msgstr "ne" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "fini" @@ -255,7 +252,6 @@ msgstr "ne 熵frita" msgid "not processed" msgstr "ne traktita" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "neuzebla publika losilo" @@ -731,19 +727,19 @@ msgstr "|N|uzi densig-metodon N" msgid "throw keyid field of encrypted packets" msgstr "forigi la losilidentigilon de 熵fritaj paketoj" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Montri Foto-Identigilojn" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Ne montri Foto-Identigilojn" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Agordi komandlinion por montri Foto-Identigilojn" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -751,7 +747,7 @@ msgstr "" "@\n" "(Vidu la manpa鷬n por kompleta listo de 熵uj komandoj kaj opcioj)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -771,15 +767,15 @@ msgstr "" " --list-keys [nomoj] montri losilojn\n" " --fingerprint [nomoj] montri fingropurojn\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Bonvolu raporti cimojn al .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -789,7 +785,7 @@ msgstr "" "subskribi, kontroli, 熵fri a mal熵fri\n" "implicita operacio dependas de la enigataj datenoj\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -797,378 +793,378 @@ msgstr "" "\n" "Realigitaj metodoj:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 #, fuzzy msgid "Compression: " msgstr "Komento: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "uzado: gpg [opcioj] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "malkongruaj komandoj\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, fuzzy, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, fuzzy, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "%s: nova opcio-dosiero kreita\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "opcio-dosiero '%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ne estas valida signaro\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "ne povis analizi URI de losilservilo\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 #, fuzzy msgid "invalid import options\n" msgstr "nevalida kiraso" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 #, fuzzy msgid "invalid export options\n" msgstr "nevalida losilaro" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "AVERTO: programo povas krei core-dosieron!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTO: %s nuligas %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTO: %s ne estas por normala uzado!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ne eblas kun %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "ne eblas samtempe subskribi kaj 熵fri kun --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "熵fri mesa鷬n kun --pgp2 postulas la 熵fron IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "elektita 熵frad-metodo ne validas\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, fuzzy, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "la densig-metodo devas esti inter %d kaj %d\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "la densig-metodo devas esti inter %d kaj %d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed devas esti pli granda ol 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed devas esti pli granda ol 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth devas esti inter 1 kaj 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 a 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 a 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTO: simpla S2K-re鷡mo (0) estas forte malrekomendata\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "nevalida S2K-re鷡mo; devas esti 0, 1 a 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 #, fuzzy msgid "invalid default preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "Tiu komando ne eblas en la re鷡mo %s.\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, fuzzy, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "Tiu komando ne eblas en la re鷡mo %s.\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "Tiu komando ne eblas en la re鷡mo %s.\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [dosiero]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [dosiero]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [dosiero]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [dosiero]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [dosiero]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [dosiero]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [dosiero]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key uzantidentigilo" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key uzantidentigilo" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key uzantidentigilo" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key uzantidentigilo" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key uzantidentigilo [komandoj]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "ne povas malfermi %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [uzantidentigilo] [losilaro]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Kreado de losiloj malsukcesis: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "listigo de sekretaj losiloj malsukcesis: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Kreado de losiloj malsukcesis: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record malsukcesis: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "listigo de sekretaj losiloj malsukcesis: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "elkirasigo malsukcesis: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "nevalida kompendi-metodo '%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[dosiero]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Ektajpu vian mesa鷬n ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "ne povas malfermi '%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1177,20 +1173,20 @@ msgstr "" "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a substrekojn " "kaj fini per '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "la donita gvidlinia URL por atestado ne validas\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" @@ -1320,7 +1316,6 @@ msgstr "Kialo por revoko: " msgid "revocation comment: " msgstr "Komento pri revoko: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMfFsS" @@ -1375,7 +1370,6 @@ msgstr " %d = Mi plene fidas\n" msgid " %d = I trust ultimately\n" msgstr " %d = Mi fidas absolute\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = bonvolu montri pli da informoj\n" @@ -1693,14 +1687,6 @@ msgstr "losilgrando tro malgranda; 1024 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1785,7 +1771,6 @@ msgstr "nevalida valoro\n" msgid "%s does not expire at all\n" msgstr "%s neniam eksvalidi鷬s\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2103,7 +2088,6 @@ msgstr "losilo %08lX: ne protektita - i msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "losilo %08lX: PGP-2.x-stila losilo - ignorita\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2117,9 +2101,7 @@ msgstr "AVERTO: nenio estis eksportita\n msgid "too many entries in pk cache - disabled\n" msgstr "tro da registroj en pk-staplo - malaltas\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Uzantidentigilo ne trovita]" @@ -2347,7 +2329,6 @@ msgstr "mankas implicita sekreta losila msgid "key %08lX: secret key imported\n" msgstr "losilo %08lX: sekreta losilo importita\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2590,8 +2571,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "黷 vi volas, ke via subskribo eksvalidi黐 je la sama tempo? (j/n) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, fuzzy, c-format msgid "" @@ -2956,7 +2935,6 @@ msgstr "foruid" msgid "delete user ID" msgstr "forvii uzantidentigilon" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "forfoto" @@ -3261,8 +3239,6 @@ msgstr "韉 tiu losilo estas revokebla p msgid " (sensitive)" msgstr " (sentema)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3390,9 +3366,6 @@ msgstr "Donu la losilgrandon" msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3487,7 +3460,6 @@ msgstr "黷 vi estas certa, ke vi ankora msgid "Create a revocation certificate for this signature? (y/N) " msgstr "黷 krei revokatestilon por 熵 tiu subskribo? (j/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" @@ -3529,10 +3501,6 @@ msgstr "mankas sekreta losilo\n" msgid "user ID \"%s\" is already revoked\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3600,7 +3568,6 @@ msgstr " 煔osilo-fingrospuro =" msgid " Subkey fingerprint:" msgstr " 煔osilo-fingrospuro =" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " 煔osilo-fingrospuro =" @@ -3610,8 +3577,6 @@ msgstr " 煔osilo-fingrospuro =" msgid "weird size for an encrypted session key (%d)\n" msgstr "" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3724,7 +3689,6 @@ msgstr "Gvidlinio: " msgid "signature verification suppressed\n" msgstr "kontrolo de subskribo estas malaltita\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "ne povas trakti 熵 tiujn pluroblajn subskribojn\n" @@ -3734,10 +3698,6 @@ msgstr "ne povas trakti 熵 tiujn plurobl msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Subskribo farita je %.*s per %s, losilo %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3902,7 +3862,7 @@ msgstr "malbona valoro de la media varia msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokolversio %d de gpg-agent ne estas uzebla\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ne povas konekti鷡 al '%s': %s\n" @@ -3911,11 +3871,11 @@ msgstr "ne povas konekti鷡 al '%s': %s\n msgid "communication problem with gpg-agent\n" msgstr "komunikproblemo kun gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problemo kun agento - malaltas uzadon de agento\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (熰flosilo %08lX)" @@ -3947,16 +3907,16 @@ msgstr "pasfrazo estas tro longa\n" msgid "invalid response from agent\n" msgstr "nevalida respondo de agento\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "nuligita de uzanto\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemo kun agento: agento redonas 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3966,20 +3926,20 @@ msgstr "" "Vi bezonas pasfrazon por mallosi la sekretan losilon\n" "por la uzanto: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bita %s-losilo, %08lX, kreita je %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "ne povas kontroli pasvorton en neinteraga re鷡mo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -4046,41 +4006,41 @@ msgstr "NOTO: sekreta losilo %08lX eksv msgid "NOTE: key has been revoked" msgstr "losilo %08lX: losilo estas revokita!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "petas la losilon %08lX de HKP-losilservilo %s ...\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "ne povas akiri losilon de losilservilo: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "eraro dum sendo al '%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "sukceso dum sendo al '%s' (statuso=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "malsukceso dum sendo al '%s': statuso=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "ser潻s pri \"%s\" 熰 HKP-servilo %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "ne povas ser熵 熰 losilservilo: %s\n" @@ -4498,9 +4458,6 @@ msgstr "publika losilo de absolute fida msgid "public key of ultimately trusted key %08lX not found\n" msgstr "publika losilo de absolute fidata losilo %08lX ne trovita\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4551,7 +4508,6 @@ msgstr "" "ignoris '%s': 熵 tio estas PGP-kreita ElGamal-losilo, kiu ne estas sekura " "por subskribado!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4619,7 +4575,7 @@ msgid "cannot avoid weak key for symmetr msgstr "" "ne povas eviti malfortajn losilojn por simetria 熵fro; provis %d fojojn!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -5012,17 +4968,17 @@ msgstr "Nenia helpo disponata" msgid "No help available for `%s'" msgstr "Nenia helpo disponata por '%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "eraro dum kreado de losilaro '%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "losilaro '%s' kreita\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "malsukcesis rekonstrui losilaran staplon: %s\n" @@ -5122,7 +5078,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5202,7 +5157,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "listigo de losilblokoj malsukcesis: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 #, fuzzy msgid "Revocation certificate created.\n" @@ -5237,7 +5191,6 @@ msgstr "nekonata densig-metodo" msgid "NOTE: This key is not protected!\n" msgstr "韉 tiu losilo ne estas protektita.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5315,7 +5268,6 @@ msgstr "%s: nevalida dosiero-versio %d\n msgid "error: no ownertrust value\n" msgstr "eksporti la posedantofido-valorojn" -#. error #: g10/tdbdump.c:204 #, fuzzy, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/es.po gnupg-1.2.6/po/es.po --- gnupg-1.2.5/po/es.po 2004-07-26 12:26:39.000000000 +0000 +++ gnupg-1.2.6/po/es.po 2004-08-25 14:59:14.000000000 +0000 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-18 22:40+0100\n" "Last-Translator: Jaime Su嫫ez \n" "Language-Team: Spanish \n" @@ -34,7 +34,6 @@ msgstr "operaci鏮 imposible sin memoria msgid "(you may have used the wrong program for this task)\n" msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "s瞲si" @@ -43,7 +42,6 @@ msgstr "s瞲si" msgid "yY" msgstr "sS" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no" @@ -52,7 +50,6 @@ msgstr "no" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "salir|fin|acabar" @@ -280,7 +277,6 @@ msgstr "no cifrado" msgid "not processed" msgstr "no procesado" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "clave pblica inutilizable" @@ -783,15 +779,15 @@ msgstr "|N|usa el algoritmo de compresi msgid "throw keyid field of encrypted packets" msgstr "elimina campo keyid de los paquetes cifrados" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Muestra IDs fotogr塻icos" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "No muestra IDs fotogr塻icos" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Ajusta linea de comandos para ver IDs fotogr塻icos" @@ -799,7 +795,7 @@ msgstr "Ajusta linea de comandos para ve # p墔ina man -> p墔ina de manual # Vale. 盥el manual mejor? # Hmm, no s, en man-db se usa "de". La verdad es que no lo he pensado. -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -807,7 +803,7 @@ msgstr "" "@\n" "(V嶧se en la p墔ina del manual la lista completo de 鏎denes y opciones)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -827,15 +823,15 @@ msgstr "" " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -845,7 +841,7 @@ msgstr "" "firma, comprueba, cifra o descifra\n" "la operaci鏮 por defecto depende de los datos de entrada\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -853,354 +849,354 @@ msgstr "" "\n" "Algoritmos disponibles:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Clave pblica: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Cifrado: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Resumen: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compresi鏮: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "鏎denes incompatibles\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no se encontr el signo = en la definici鏮 de grupo \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVISO: propiedad insegura de %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVISO: permisos inseguros de %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "art獳ulo de configuraci鏮 desconocido \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "no se carga el cifrado de ampliaci鏮 \"%s\" por permisos inseguros\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s no es un juego de caracteres v嫮ido\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opciones de importaci鏮 inv嫮idas\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "opciones de importaci鏮 inv嫮idas\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opciones de exportaci鏮 inv嫮idas\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "opciones de exportaci鏮 inv嫮idas\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "imposible establecer camino de ejecutables %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "ATENCI粍: 〔l programa podr燰 volcar un fichero core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sustituye a %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s no es para uso normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s no permitido con %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s no tiene sentido con %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "s鏊o puede hacer firmas separadas o en claro en modo --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "debe usar ficheros (no tuber燰s) si trabaja con --pgp2 activo.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 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/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inv嫮ido\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no inv嫮ido\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "el algoritmo de certificaci鏮 por resumen elegido es inv嫮ido\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "el algoritmo de compresi鏮 `%s' es de s鏊o lectura en esta versi鏮\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "el algoritmo de compresi鏮 debe estar en el rango %d-%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level inv嫮ido; debe ser 0, 1, 2, 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level inv嫮ido; debe ser 0, 1, 2, 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "preferencias por defecto inv嫮idas\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "preferencias personales de cifrado inv嫮idas\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "preferencias personales de algoritmo de resumen inv嫮idas\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "preferencias personales de compresi鏮 inv嫮idas\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s an no funciona con %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "no puede usar el cifrado \"%s\" en modo %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "no puede usar el resumen \"%s\" en modo %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "no puede usar la compresi鏮 \"%s\" en modo %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicializaci鏮 de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "AVISO: se indicaron receptores (-r) sin clave pblica de cifrado\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nombre_fichero]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id-usuario" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuario" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-usuario" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-usuario" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuario [鏎denes]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "no se puede abrir `%s': %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuario] [anillo]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "env甐 al servidor de claves fallido: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepci鏮 del servidor de claves fallida: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "exportaci鏮 de clave fallida: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "bsqueda del servidor de claves fallida: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "renovaci鏮 al servidor de claves fallida: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminaci鏮 de armadura fallida: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "creaci鏮 de armadura fallida: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribuci鏮 inv嫮ido `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nombre_fichero]" @@ -1208,17 +1204,17 @@ msgstr "[nombre_fichero]" # En espa隳l no se deja espacio antes de los puntos suspensivos # (Real Academia dixit) :) # Tomo nota :-). Este comentario d嶴alo siempre. -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "no se puede abrir `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1226,19 +1222,19 @@ msgstr "" "un nombre de notaci鏮 debe tener s鏊o caracteres imprimibles o espacios, y " "acabar con un '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "un nombre de notaci鏮 de usuario debe contener el caracter '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "un valor de notaci鏮 no debe usar ningn caracter de control\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "URL de pol癃ica de certificado inv嫮ida\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "URL de pol癃ica inv嫮ida\n" @@ -1369,7 +1365,6 @@ msgstr "raz鏮 para la revocaci鏮: " msgid "revocation comment: " msgstr "comentario a la revocaci鏮: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1424,7 +1419,6 @@ msgstr " %d = Conf甐 totalmente\n" msgid " %d = I trust ultimately\n" msgstr " %d = conf甐 por completo\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = por favor mu廥treme m嫳 informaci鏮\n" @@ -1740,14 +1734,6 @@ msgstr "tama隳 de clave insuficiente; 10 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tama隳 insuficiente; 768 es el valor m璯imo permitido\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1832,7 +1818,6 @@ msgstr "valor inv嫮ido\n" msgid "%s does not expire at all\n" msgstr "%s nunca caduca\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2159,7 +2144,6 @@ msgstr "clave %08lX: no protegida - omit msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2174,9 +2158,7 @@ msgstr "ATENCI粍: no se ha exportado nad msgid "too many entries in pk cache - disabled\n" msgstr "demasiados registros en la cache pk - anulada\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Identificador de usuario no encontrado]" @@ -2406,7 +2388,6 @@ msgstr "no hay anillo secreto de claves msgid "key %08lX: secret key imported\n" msgstr "clave %08lX: clave secreta importada\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2644,8 +2625,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "熹uiere producir una nueva firma que reemplace a la expirada? (s/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -3000,7 +2979,6 @@ msgstr "borridu" msgid "delete user ID" msgstr "borra un identificador de usuario" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "borfoto" @@ -3299,8 +3277,6 @@ msgstr "Esta clave puede ser revocada po msgid " (sensitive)" msgstr " (confidencial)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3426,9 +3402,6 @@ msgstr "Introduzca el ID de usuario del msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no puede elegir una clave como su propio revocador designado\n" @@ -3522,7 +3495,6 @@ msgstr "澳e verdad quiere revocarla? (s/ msgid "Create a revocation certificate for this signature? (y/N) " msgstr "澧rear un certificado de revocaci鏮 para esta clave? (s/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Ha firmado los siguientes IDs de usuario:\n" @@ -3563,10 +3535,6 @@ msgstr "no hay clave secreta\n" msgid "user ID \"%s\" is already revoked\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3631,7 +3599,6 @@ msgstr " Huella de clave primaria:" msgid " Subkey fingerprint:" msgstr " Huella de subclave:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Huella de clave =" @@ -3641,8 +3608,6 @@ msgstr " Huella de clave =" msgid "weird size for an encrypted session key (%d)\n" msgstr "tama隳 anormal para una clave de sesi鏮 cifrada (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3754,7 +3719,6 @@ msgstr "Pol癃ica: " msgid "signature verification suppressed\n" msgstr "suprimida la verificaci鏮 de la firma\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "no se puede trabajar con firmas mltiples\n" @@ -3764,10 +3728,6 @@ msgstr "no se puede trabajar con firmas msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firmado el %.*s usando clave %s ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Clave disponible en: " @@ -3931,7 +3891,7 @@ msgstr "variable de entorno GPG_AGENT_IN msgid "gpg-agent protocol version %d is not supported\n" msgstr "el programa no permite usar el protocolo agente gpg versi鏮 %d\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no se puede conectar con `%s': %s\n" @@ -3940,11 +3900,11 @@ msgstr "no se puede conectar con `%s': % msgid "communication problem with gpg-agent\n" msgstr "problema de comunicaci鏮 con el agente gpg\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema con el agente - inhabilitando el uso del agente\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "(ID clave primaria %08lX)" @@ -3976,16 +3936,16 @@ msgstr "frase contrase鎙 demasiado larga msgid "invalid response from agent\n" msgstr "respuesta del agente inv嫮ida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "cancelado por el usuario\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con el agente: el agente devuelve 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3995,20 +3955,20 @@ msgstr "" "Necesita una frase contrase鎙 para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "imposible pedir contrase鎙 en modo de proceso por lotes\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introduzca frase contrase鎙: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita frase contrase鎙: " @@ -4074,41 +4034,41 @@ msgstr "NOTA: clave secreta %08lX caduca msgid "NOTE: key has been revoked" msgstr "NOTA: la clave ha sido revocada" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "solicitando clave %08lX a %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "no puede obtenerse la clave en el servidor: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "error enviando a `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "envi correcto a `%s` (estado=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "fall el envio a `%s': status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "este servidor de clave no proporciona --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "buscando \"%s\" en el servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "no puede buscarse en el servidor: %s\n" @@ -4533,9 +4493,6 @@ msgstr "no se encuentran claves totalmen msgid "public key of ultimately trusted key %08lX not found\n" msgstr "clave pblica de la clave totalmente fiable %08lX no encontrada\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4584,7 +4541,6 @@ msgstr "" "`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura " "para las firmas\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4653,7 +4609,7 @@ msgstr "" "【mposible evitar clave d嶵il para cifrado sim彋rico despu廥 de %d " "intentos!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necesita un algoritmo de hash de 160 bits.\n" @@ -5051,17 +5007,17 @@ msgstr "Ayuda no disponible" msgid "No help available for `%s'" msgstr "No hay ayuda disponible para `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "error escribiendo anillo `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "anillo `%s' creado\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "fallo reconstruyendo cach del anillo de claves: %s\n" @@ -5167,7 +5123,6 @@ msgstr "" "esta plataforma necesita ficheros temporales para llamar a programas " "externos.\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5245,7 +5200,6 @@ msgstr "se fuerza salida con armadura AS msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet fall: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Certificado de revocaci鏮 creado.\n" @@ -5277,7 +5231,6 @@ msgstr "algoritmo de protecci鏮 desconoc msgid "NOTE: This key is not protected!\n" msgstr "NOTA: •sta clave no est protegida!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5357,7 +5310,6 @@ msgstr "error: huella dactilar no v嫮ida msgid "error: no ownertrust value\n" msgstr "error: no hay valor de confianza del propietario\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/et.po gnupg-1.2.6/po/et.po --- gnupg-1.2.5/po/et.po 2004-07-26 12:26:39.000000000 +0000 +++ gnupg-1.2.6/po/et.po 2004-08-25 14:59:14.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -30,7 +30,6 @@ msgstr "initsialiseerimata turvalise m鄟 msgid "(you may have used the wrong program for this task)\n" msgstr "(te kasutasite vahest selle t礵 jaoks valet programmi)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "jah" @@ -39,7 +38,6 @@ msgstr "jah" msgid "yY" msgstr "jJ" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "ei" @@ -48,7 +46,6 @@ msgstr "ei" msgid "nN" msgstr "eE" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "v鄟ju" @@ -253,7 +250,6 @@ msgstr "krptimata" msgid "not processed" msgstr "ei t礵deldud" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "mittekasutatav avalik v鰗i" @@ -731,19 +727,19 @@ msgstr "|N|kasuta pakkimisalgoritmi N" msgid "throw keyid field of encrypted packets" msgstr "酺a lisa krptimisel v鰗me id" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Esita foto IDd" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Ei esita foto IDd" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Sea k酲urida foto ID vaatamiseks" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -751,7 +747,7 @@ msgstr "" "@\n" "(K鬑kide k酲kude ja v鰗mete t鄜eliku kirjelduse leiate manualist)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -771,15 +767,15 @@ msgstr "" " --list-keys [nimed] n鄜ta v鰗meid\n" " --fingerprint [nimed] n鄜ta s鰎mej鄟gi\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Palun saatke veateated aadressil .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Kasuta: gpg [v鰗med] [failid] (-h n鄜tab abiinfot)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -789,7 +785,7 @@ msgstr "" "allkirjasta, kontrolli, krpti ja dekrpti\n" "vaikimisi operatsioon s鯷tub sisendandmetest\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -797,370 +793,370 @@ msgstr "" "\n" "Toetatud algoritmid:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Avalik v鰗i: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "夷ffer: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "R酲i: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Pakkimine: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "kasuta: gpg [v鰗med] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "vastuolulised k酲ud\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "grupi definitsioonis \"%s\" puudub smbol =\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "HOIATUS: ebaturvalised 鬑gused %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Hoiatus: ebaturvalised kataloogi 鬑gused %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "tundmatu seade \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "M麗KUS: ignoreerin vana vaikimisi v鰗mete faili `%s'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "M麗KUS: vaikimisi v鰗mete fail `%s' puudub\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "v鰗mete fail `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "loen v鰗meid failist `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "ebaturvaliste 鬑guste t鰗tu ei laetud 甬fri laiendust \"%s\"\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "ei saa parsida v鰗meserveri URI\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: vigased impordi v鰗med\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "vigased impordi v鰗med\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vigased ekspordi v鰗med\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "vigased ekspordi v鰗med\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path v鳵rtuseks ei 鰒nestu seada %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "HOIATUS: programm v鬑b salvestada oma m鄟upildi!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "HOIATUS: %s m鳵rab le %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "M麗KUS: %s ei ole tavap酺aseks kasutamiseks!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s ei ole koos lubatud!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s ei oma koos m鰗et!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "--pgp2 moodis saate luua ainult eraldiseisvaid v鬑 avateksti allkirju\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krpteerida\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "teate krpteerimine --pgp2 moodis n鰔ab IDEA 甬ffrit\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "valitud 甬fri algoritm ei ole lubatud\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "valitud lhendi algoritm ei ole lubatud\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "valitud sertifikaadi lhendi algoritm ei ole lubatud\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "pakkimise algoritm `%s' on selles versioonis ainult lugemiseks\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed peab olema suurem, kui 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed peab olema suurem, kui 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v鬑 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "vigane min-sert-tase; peab olema 1, 2 v鬑 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "M麗KUS: lihtne S2K mood (0) ei soovitata kasutada\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "vigane S2K mood; peab olema 0, 1 v鬑 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "vigased vaikimisi eelistused\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "vigased isikliku 甬fri eelistused\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "vigased isikliku lhendi eelistused\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "vigased isikliku pakkimise eelistused\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ei t礵ta veel koos %s-ga\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "甬fri algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "s鰒umilhendi algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB initsialiseerimine eba鰒nestus: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "HOIATUS: m鳵rati saajad (-r) aga ei kasutata avaliku v鰗me krptograafiat\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [failinimi]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [failinimi]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [failinimi]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [failinimi]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [failinimi]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [failinimi]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [failinimi]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key kasutaja-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key kasutaja-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key kasutaja-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key kasutaja-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key kasutaja-id [k酲ud]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "%s ei 鰒nestu avada: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kasutaja-id] [v鰗mehoidla]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "v鰗meserverile saatmine eba鰒nestus: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "v鰗meserverilt lugemine eba鰒nestus: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "v鰗me eksport eba鰒nestus: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "v鰗meserveri otsing eba鰒nestus: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "v鰗meserveri uuendamine eba鰒nestus: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "lahtipakendamine eba鰒nestus: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "pakendamine eba鰒nestus: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "vigane r酲ialgoritm `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[failinimi]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Kirjutage nd oma teade ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "`%s' ei 鰒nestu avada\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1168,19 +1164,19 @@ msgstr "" "noteerimise nimes v鬑vad olla ainult trkitavad smbolid v鬑 thikud\n" "ning l鱀us peab olema '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "kasutaja noteerimise nimi peab sisaldama '@' m酺ki\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "noteerimise v鳵rtus ei v鬑 sisaldada kontroll smboleid\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "antud sertifikaadi poliisi URL on vigane\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" @@ -1306,7 +1302,6 @@ msgstr "thistamise p鬒jus: " msgid "revocation comment: " msgstr "thistamise kommentaar: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iItTvVjJ" @@ -1361,7 +1356,6 @@ msgstr " %d = Usaldan t鄜esti\n" msgid " %d = I trust ultimately\n" msgstr " %d = Usaldan absoluutselt\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = esita palun t鄜endavat infot\n" @@ -1673,14 +1667,6 @@ msgstr "v鰗mepikkus on liiga v鄜ke; RSA msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "v鰗mepikkus on liiga v鄜ke; v鄜kseim lubatud v鳵rtus on 768.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1765,7 +1751,6 @@ msgstr "vigane v鳵rtus\n" msgid "%s does not expire at all\n" msgstr "%s ei aegu kunagi\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2083,7 +2068,6 @@ msgstr "v鰗i %08lX: ei ole kaitstud - j msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "v鰗i %08lX: PGP 2.x stiilis v鰗i - j酹sin vahele\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2097,9 +2081,7 @@ msgstr "HOIATUS: midagi ei eksporditud\n msgid "too many entries in pk cache - disabled\n" msgstr "avalike v鰗mete puhvris on liiga palju v鰗meid - blokeerin\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Kasutaja id puudub]" @@ -2331,7 +2313,6 @@ msgstr "puudub salajaste v鰗mete vaikimi msgid "key %08lX: secret key imported\n" msgstr "v鰗i %08lX: salajane v鰗i on imporditud\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2565,8 +2546,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2920,7 +2899,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "kustuta kasutaja ID" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3218,8 +3196,6 @@ msgstr "Selle v鰗me v鬑b olla thistanud msgid " (sensitive)" msgstr " (tundlik)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3345,9 +3321,6 @@ msgstr "Sisestage m鳵ratud thistaja kas msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x stiilis v鰗it ei saa nimetada m鳵ratud thistajaks\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "te ei saa nimetada v鰗it iseenda m鳵ratud thistajaks\n" @@ -3440,7 +3413,6 @@ msgstr "Olete kindel, et soovite seda ik msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Loon sellele allkirjale thistamise sertifikaadi? (j/E) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Te olete allkirjastanud j酺gnevad kasutaja IDd:\n" @@ -3481,10 +3453,6 @@ msgstr "salajast v鰗it pole\n" msgid "user ID \"%s\" is already revoked\n" msgstr "kasutaja ID \"%s\" on juba thistatud\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3548,7 +3516,6 @@ msgstr " Primaarse v鰗me s鰎mej鄟g:" msgid " Subkey fingerprint:" msgstr " Alamv鰗me s鰎mej鄟g:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " V鰗me s鰎mej鄟g =" @@ -3558,8 +3525,6 @@ msgstr " V鰗me s鰎mej鄟g =" msgid "weird size for an encrypted session key (%d)\n" msgstr "veider suurus krptitud sessiooni v鰗me jaoks (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3670,7 +3635,6 @@ msgstr "Poliis: " msgid "signature verification suppressed\n" msgstr "allkirja kontroll j輑ti 酺a\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "neid allkirju ei 鰒nestu t礵delda\n" @@ -3680,10 +3644,6 @@ msgstr "neid allkirju ei 鰒nestu t礵deld msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Allkirja l鬑 %.*s kasutades %s v鰗it ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "V鰗me leiate: " @@ -3846,7 +3806,7 @@ msgstr "vigane GPG_AGENT_INFO keskkonnam msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ei 鰒nestu luua hendust serveriga `%s': %s\n" @@ -3855,11 +3815,11 @@ msgstr "ei 鰒nestu luua hendust serveri msgid "communication problem with gpg-agent\n" msgstr "probleem gpg-agent programmiga suhtlemisel\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probleem agendiga - blokeerin agendi kasutamise\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (peamise v鰗me ID %08lX)" @@ -3891,16 +3851,16 @@ msgstr "liiga pikk parool\n" msgid "invalid response from agent\n" msgstr "vigane vastus agendilt\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "katkestatud kasutaja poolt\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem agendiga: agent tagastas 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3910,20 +3870,20 @@ msgstr "" "Te vajate kasutaja salajase v鰗me lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bitine %s v鰗i, ID %08lX, loodud %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "pakettmoodis ei saa parooli ksida\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -3989,41 +3949,41 @@ msgstr "M麗KUS: salajane v鰗i %08lX aegu msgid "NOTE: key has been revoked" msgstr "M麗KUS: v鰗i on thistatud" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "ksin v鰗it %08lX v鰗meserverist %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "v鰗meserverist ei saa v鰗it: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "viga teate saatmisel serverile `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "teate saatmine serverile `%s' 鰒nestus (olek=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "teate saatmine serverile `%s' eba鰒nestus: olek=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "see v鰗meserver ei toeta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "v鰗meserverist ei saa otsida: %s\n" @@ -4437,9 +4397,6 @@ msgstr "absoluutselt usaldatavaid v鰗mei msgid "public key of ultimately trusted key %08lX not found\n" msgstr "puudub absoluutselt usaldatava v鰗me %08lX avalik v鰗i\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4489,7 +4446,6 @@ msgstr "" "j酹sin `%s' vahele: see on PGP genereeritud ElGamal v鰗i,\n" "mis ei ole allkirjades kasutamiseks turvaline!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4557,7 +4513,7 @@ msgstr "" "smmeetrilises 甬fris ei 鰒nestu v鄟tida n鰎ga v鰗me kasutamist; proovisin %" "d korda!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA n鰔ab 160 bitist r酲ialgoritmi kasutamist\n" @@ -4949,17 +4905,17 @@ msgstr "Abiinfo puudub" msgid "No help available for `%s'" msgstr "`%s' kohta abiinfo puudub" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "viga v鰗mehoidla `%s' loomisel: %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "v鰗mehoidla `%s' on loodud\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "v鰗mehoidla vahem鄟u uuesti loomine eba鰒nestus: %s\n" @@ -5065,7 +5021,6 @@ msgstr "" "see platvorm n鰔ab v鄟iste programmide k鄜vitamiseks ajutiste failide " "kasutamist\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5143,7 +5098,6 @@ msgstr "V鄟jundis sunnitakse kasutama AS msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet eba鰒nestus: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Thistamise sertifikaat on loodud.\n" @@ -5177,7 +5131,6 @@ msgstr "tundmatu kaitsealgoritm\n" msgid "NOTE: This key is not protected!\n" msgstr "M麗KUS: See v鰗i ei ole kaitstud!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5259,7 +5212,6 @@ msgstr "viga: vigane s鰎mej鄟g\n" msgid "error: no ownertrust value\n" msgstr "viga: usalduse v鳵rtus puudub\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/fi.po gnupg-1.2.6/po/fi.po --- gnupg-1.2.5/po/fi.po 2004-07-26 12:26:40.000000000 +0000 +++ gnupg-1.2.6/po/fi.po 2004-08-25 14:59:15.000000000 +0000 @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -46,7 +46,6 @@ msgstr "toiminto on mahdollinen vain, jo msgid "(you may have used the wrong program for this task)\n" msgstr "(olet ehk瓣 k瓣ytt瓣nyt teht瓣v瓣瓣n v瓣瓣r瓣瓣 ohjelmaa)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "kyll瓣|kylla|joo" @@ -55,7 +54,6 @@ msgstr "kyll瓣|kylla|joo" msgid "yY" msgstr "kK" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "ei" @@ -64,7 +62,6 @@ msgstr "ei" msgid "nN" msgstr "eE" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "lopeta|sulje" @@ -269,7 +266,6 @@ msgstr "salaamaton" msgid "not processed" msgstr "ei k瓣sitelty" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "julkista avainta ei voi k瓣ytt瓣瓣" @@ -749,19 +745,19 @@ msgstr "|N|k瓣yt瓣 pakkausalgoritmia N" msgid "throw keyid field of encrypted packets" msgstr "j瓣t瓣 avaintunnistekentt瓣 pois salatuista paketeista" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "N瓣yt瓣 valokuvatunnisteet" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "l瓣 n瓣yt瓣 valokuvatunnisteita" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Aseta valokuvatunnisteiden katsomiskomento" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -770,7 +766,7 @@ msgstr "" "(Katso t瓣ydellinen luettelo kaikista komennoista ja valitsimista man-" "sivuilta)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -789,16 +785,16 @@ msgstr "" " --list-keys [nimet] n瓣yt瓣 avaimet\n" " --fingerprint [nimet] n瓣yt瓣 sormenj瓣ljet\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "K瓣ytt繹: gpg [valitsimet] [tiedostot] (-h n瓣ytt瓣瓣 ohjeen)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -808,7 +804,7 @@ msgstr "" "allekirjoita, tarkista, salaa tai avaa\n" "oletustoiminto riippuu sy繹tteest瓣\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -816,371 +812,371 @@ msgstr "" "\n" "Tuetut algoritmit:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "JulkAvain: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Salaus: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Tiiviste: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Pakkaus: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "k瓣ytt繹: gpg [valitsimet] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "ristiriitainen komento\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "=-merkki瓣 ei l繹ytynyt ryhm瓣m瓣瓣rityksess瓣 \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eiv瓣t ole turvallisia\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eiv瓣t ole turvallisia\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eiv瓣t ole turvallisia\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "tuntematon asetus \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "HUOM: Vanhat oletusarvoiset asetukset l繹ytyv瓣t tiedostosta \"%s\"\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "asetustiedosto \"%s\": %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "luetaan asetukset tiedostosta \"%s\"\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "Oikeudet eiv瓣t ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ei kelpaa merkist繹ksi\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "avainpalvelimen URI:i瓣 ei voi j瓣sent瓣瓣\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-polkua kohteeseen %s ei voi asettaa\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROITUS: %s korvaa %s:n\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "HUOM: %s ei ole normaaliin k瓣ytt繹繹n!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s eiv瓣t ole sallittuja yhdess瓣!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s yhdess瓣 on j瓣rjet繹nt瓣!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "sinun tulee k瓣ytt瓣瓣 tiedostoja (eik瓣 putkitusta) kun --pgp2 on k瓣yt繹ss瓣.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "valittu tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea t瓣ss瓣 julkaisussa\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "pakkausalgoritmin t瓣ytyy olla v瓣lilt瓣 %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed t瓣ytyy olla suurempi kuin 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed t瓣ytyy olla suurempi kuin 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth tulee olla v瓣lill瓣 1-255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level ei kelpaa; t瓣ytyy olla 0, 1, 2 tai 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level ei kelpaa; t瓣ytyy olla 1, 2 tai 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella k瓣ytett瓣v瓣ksi\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "virheellinen S2K-tila; t瓣ytyy olla 0, 1 tai 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "virheelliset oletusarvoiset valinnat\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "virheelliset henkil繹kohtaisen salaimen valinnat\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "virheelliset henkil繹kohtaiset tiivisteen valinnat\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "virheelliset henkil繹kohtaiset pakkausvalinnat\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ja %s eiv瓣t viel瓣 toimi yhdess瓣\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "salausalgoritmia \"%s\" ei voi k瓣ytt瓣瓣 %s-tilassa\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "tiivistealgoritmia \"%s\" ei voi k瓣ytt瓣瓣 %s-tilassa\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "pakkausalgoritmia \"%s\" ei voi k瓣ytt瓣瓣 %s-tilassa\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROITUS: vastaanottajia (-r) annettu k瓣ytt瓣m瓣tt瓣 julkisen avaimen salausta\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [tiedostonimi]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [tiedostonimi]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [tiedostonimi]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--allekirjoita [tiedostonimi]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [tiedostonimi]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [tiedostonimi]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [tiedostonimi]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key k瓣ytt瓣j瓣tunnus" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key k瓣ytt瓣j瓣tunnus" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrlsign-key k瓣ytt瓣j瓣tunnus" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key k瓣ytt瓣j瓣tunnus" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key k瓣ytt瓣j瓣tunnus [komennot]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "tiedostoa %s ei voi avata: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [k瓣ytt瓣j瓣tunnus] [avainrengas]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "avainpalvelimelle l瓣hett瓣minen ep瓣onnistui: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "avainpalvelimelta vastaanotto ep瓣onnistui: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "avaimen vienti ep瓣onnistui: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "avainpalvelimelta etsiminen ep瓣onnistui: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "avainpalvelimen p瓣ivitys ep瓣onnistui: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "ascii-koodauksen purku ep瓣onnistui: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "ascii-koodaaminen ep瓣onnistui: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "virheellinen tiivistealgoritmi \"%s\"\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[tiedostonimi]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Kirjoita viestisi...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "tiedostoa \"%s\" ei voi avata\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1188,19 +1184,19 @@ msgstr "" "notaation nimen t瓣ytyy sis瓣lt瓣瓣 vain tulostettavia merkkej瓣 tai " "v瓣lily繹ntej瓣, ja sen t瓣ytyy loppua merkkiin \"=\"\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "k瓣ytt瓣j瓣notaatin t瓣ytyy sis瓣lt瓣瓣 \"@\"-merkki\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "notaatiosssa ei saa olla erikoismerkkej瓣\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "annettu varmennek瓣yt瓣nn繹n URL on virheellinen\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "annettu allekirjoitusk瓣yt瓣nn繹n URL on virheellinen\n" @@ -1328,7 +1324,6 @@ msgstr "mit瓣t繹innin syy: " msgid "revocation comment: " msgstr "mit瓣t繹intikommentti: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMlLoO" @@ -1383,7 +1378,6 @@ msgstr " %d = Luotan t瓣ysin\n" msgid " %d = I trust ultimately\n" msgstr " %d = Luotan ehdottomasti\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = n瓣yt瓣 lis瓣tietoja\n" @@ -1702,14 +1696,6 @@ msgstr "avainkoko on liian pieni; RSA va msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1794,7 +1780,6 @@ msgstr "arvo ei kelpaa\n" msgid "%s does not expire at all\n" msgstr "%s ei vanhene koskaan\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2115,7 +2100,6 @@ msgstr "avain %08lX: ei suojattu - ohite msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2131,9 +2115,7 @@ msgstr "VAROITUS: mit瓣瓣n ei viety\n" msgid "too many entries in pk cache - disabled\n" msgstr "pk-v瓣limuistissa on liian monta kohdetta - poistettu k瓣yt繹st瓣\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[K瓣ytt瓣j瓣tunnusta ei l繹ytynyt]" @@ -2368,7 +2350,6 @@ msgstr "salaiselle avainrenkaalle ei ole msgid "key %08lX: secret key imported\n" msgstr "avain %08lX: salainen avain tuotu\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2607,8 +2588,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Haluatko tehd瓣 uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2962,7 +2941,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "poista k瓣ytt瓣j瓣tunnus" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3260,8 +3238,6 @@ msgstr "T瓣m瓣 avain voidaan mit瓣t繹id msgid " (sensitive)" msgstr " (luottamuksellinen)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3388,9 +3364,6 @@ msgstr "Sy繹t瓣 m瓣瓣r瓣tyn mit瓣t繹ij瓣 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x -avainta ei voi nimet瓣 m瓣瓣r瓣tyksi mit瓣t繹ij瓣ksi\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "et voi nimitt瓣瓣 avainta sen omaksi m瓣瓣r瓣tyksi mit瓣t繹ij瓣ksi\n" @@ -3483,7 +3456,6 @@ msgstr "Haluatko varmasti mit瓣t繹id瓣 s msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Luodaanko t瓣lle alekirjoitukselle mit瓣t繹intivarmenne? (k/E) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Olet allekirjoittanut seuraavat k瓣ytt瓣j瓣tunnukset:\n" @@ -3524,10 +3496,6 @@ msgstr "salainen avain ei ole saatavilla msgid "user ID \"%s\" is already revoked\n" msgstr "k瓣ytt瓣j瓣tunnus \"%s\" on jo mit瓣t繹ity\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3595,7 +3563,6 @@ msgstr " Ensisijaisen avaimen sormenj瓣l msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenj瓣lki:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Avaimen sormenj瓣lki =" @@ -3605,8 +3572,6 @@ msgstr " Avaimen sormenj瓣lki =" msgid "weird size for an encrypted session key (%d)\n" msgstr "outo koko salatulle istuntoavaimelle (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3719,7 +3684,6 @@ msgstr "K瓣yt瓣nt繹: " msgid "signature verification suppressed\n" msgstr "allekirjoituksen varmistus vaiennetaan\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "n瓣it瓣 allekirjoituksia ei voi k瓣sitell瓣\n" @@ -3730,10 +3694,6 @@ msgid "Signature made %.*s using %s key msgstr "" "Allekirjoitus tehty %.*s k瓣ytt瓣m瓣ll瓣 %s-algoritmia avaintunnuksella %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Avain saatavilla kohteessa: " @@ -3898,7 +3858,7 @@ msgstr "GPG_AGENT_INFO-ymp瓣rist繹muuttu msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n" @@ -3907,11 +3867,11 @@ msgstr "yhteys kohteeseen \"%s\" ei onni msgid "communication problem with gpg-agent\n" msgstr "gpg-agentin kanssa yhteysongelma\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "agentin k瓣yt繹ss瓣 on ongelmia - agenttia ei k瓣ytet瓣\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (p瓣瓣avaimen tunnus %08lX)" @@ -3943,16 +3903,16 @@ msgstr "salasana on liian pitk瓣\n" msgid "invalid response from agent\n" msgstr "agentin l瓣hett瓣m瓣 vastaus ei kelpaa\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "k瓣ytt瓣j瓣n peruma\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "agentin k瓣yt繹ss瓣 on ongelmia: agentti vastaa 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3961,20 +3921,20 @@ msgstr "" "\n" "Tarvitset salasanan avataksesi salaisen avaimen k瓣ytt瓣j瓣lle: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "salasanan kysyminen ei onnistu er瓣ajossa\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Sy繹t瓣 salasana: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Toista salasana: " @@ -4041,41 +4001,41 @@ msgstr "HUOM: salainen avain %08lX vanhe msgid "NOTE: key has been revoked" msgstr "HUOM: avain on mit瓣t繹ity!" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "pyydet瓣瓣n avainta %08lX kohteesta %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "avainpalvelimelta ei saa avainta: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "virhe l瓣hett瓣ess瓣 kohteeseen \"%s\": %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "kohteeseen \"%s\" l瓣hett瓣minen onnistui (tila=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "virhe l瓣hett瓣ess瓣 kohteeseen \"%s\": tila=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "t瓣m瓣 avainpalvelin ei tue valitsinta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "etsit瓣瓣n \"%s\" HKP-palvelimelta %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr " avainpalvelimelta ei pysty etsim瓣瓣n: %s\n" @@ -4508,9 +4468,6 @@ msgstr "ehdottomasti luotettavia avaimia msgid "public key of ultimately trusted key %08lX not found\n" msgstr "ehdottomasti luotettu julkinen avain %08lX ei l繹ytynyt\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4562,7 +4519,6 @@ msgstr "" "ohitetaan \"%s\": t瓣m瓣 on PGP:n luoma ElGamal-avain, jolla ei voi " "allekirjoittaa turvallisesti!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4634,7 +4590,7 @@ msgstr "" "heikon avaimen luomista symmetriselle salaimelle ei voitu v瓣ltt瓣瓣; \n" "yritettiin %d kertaa!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA vaatii 160-bittisen tiivistealgoritmin k瓣ytt繹瓣\n" @@ -5039,17 +4995,17 @@ msgstr "Ei ohjeita saatavilla" msgid "No help available for `%s'" msgstr "Ei ohjetta aiheesta \"%s\"" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "virhe luotaessa avainrengasta \"%s\": %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "avainrengas \"%s\" luotu\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "avainrenkaan v瓣limuistin uudelleenluominen ep瓣onnistui: %s\n" @@ -5155,7 +5111,6 @@ msgid "this platform requires temp files msgstr "" "t瓣m瓣 ymp瓣rist繹 vaatii v瓣liaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5233,7 +5188,6 @@ msgstr "ASCII-koodattu tuloste m瓣瓣rite msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet ep瓣onnistui: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Mit瓣t繹intivarmenne luotu.\n" @@ -5265,7 +5219,6 @@ msgstr "tuntematon suojausalgoritmi\n" msgid "NOTE: This key is not protected!\n" msgstr "HUOM: T瓣t瓣 avainta ei ole suojattu!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5346,7 +5299,6 @@ msgstr "virhe: sormenj瓣lki on v瓣瓣r瓣\ msgid "error: no ownertrust value\n" msgstr "virhe: ei luottamusarvoa\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/fr.po gnupg-1.2.6/po/fr.po --- gnupg-1.2.5/po/fr.po 2004-07-26 12:26:40.000000000 +0000 +++ gnupg-1.2.6/po/fr.po 2004-08-25 14:59:15.000000000 +0000 @@ -5,13 +5,13 @@ # Thanks to R幦i Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.60.2.17 2004/07/20 14:05:52 werner Exp $ +# $Id: fr.po,v 1.60.2.19 2004/08/13 17:02:48 werner Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-16 20:20+0200\n" "Last-Translator: Ga螔 Qu廨i \n" "Language-Team: French \n" @@ -37,7 +37,6 @@ msgstr "" msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-皻re utilis un programme non adapt cette fin)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "oui" @@ -46,7 +45,6 @@ msgstr "oui" msgid "yY" msgstr "oO" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "non" @@ -55,7 +53,6 @@ msgstr "non" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quitter" @@ -260,7 +257,6 @@ msgstr "non chiffr" msgid "not processed" msgstr "non trait" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "cl publique inutilisable" @@ -754,21 +750,21 @@ msgstr "|N|utiliser l'algorithme de comp msgid "throw keyid field of encrypted packets" msgstr "supprimer l'ident. des paquets chiffr廥" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Montrer les photos d'identit" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Ne pas montrer les photos d'identit" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" "Choisir la ligne de commande servant 赨n" "afficher les photos d'identit" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -776,7 +772,7 @@ msgstr "" "@\n" "(Voir la page de manuel pour une liste compl鋈e des commandes et options)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -796,17 +792,17 @@ msgstr "" " --list-keys [utilisateur] montrer les cl廥\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Signaler toutes anomalies (en anglais)\n" "et tout probl鋗e de traduction .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -816,7 +812,7 @@ msgstr "" "signer, v廨ifier, chiffrer ou d嶰hiffrer\n" "l'op廨ation par d嶨aut d廧end des donn嶪s entr嶪s\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -824,389 +820,389 @@ msgstr "" "\n" "Algorithmes support廥:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Cl publique: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Chiffrement: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hachage: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compression: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = signature trouv嶪 dans la d嶨inition du groupe \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVERTISSEMENT: propri彋aire de %s \"%s\" peu sr\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu sres\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "AVERTISSEMENT: le propri彋aire du r廧ertoire contenant est peu\n" "sr pour %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "AVERTISSEMENT: les permissions du r廧ertoire contenant %s \"%s\"\n" "sont peu sres\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "幨幦ent de configuration \"%s\" inconnu\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: l'ancien fichier d'options par d嶨aut `%s' a 彋 ignor嬞n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: pas de fichier d'options par d嶨aut `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "l'extension de chiffrement \"%s\" n'a pas 彋 charg嶪 car ses\n" "permissions sont peu sres\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n'est pas une table de caract鋨es valide\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "impossible d'interpr彋er l'URI du serveur de cl廥\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: options d'import invalides\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "options d'import invalides\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: options d'export invalides\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "options d'export invalides\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossible de mettre le chemin d'ex嶰ution %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "ATTENTION: Le programme peut cr嶪r un fichier 剃ore !\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENTION: %s remplace %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s n'est pas pour une utilisation normale !\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "il n'est possible de faire une signature d彋ach嶪 ou en texte clair\n" "qu'en mode --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "vous ne pouvez pas signer et chiffrer en m瘱e temps en mode --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n" "est activ.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "chiffrer un message en mode --pgp2 n嶰essite l'algorithme de chiffrage IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement s幨ectionn est invalide\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage s幨ectionn嶪 est invalide\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "la fonction de hachage de certification s幨ectionn嶪 est invalide\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" "l'algorithme de compression `%s' ne fonctionne qu'en lecture pour\n" "cette version\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "剃ompletes-needed doit 皻re sup廨ieur 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "匍arginals-needed doit 皻re sup廨ieur 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "匍ax-cert-depth doit 皻re compris entre 1 et 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalide; doit 皻re 0, 1, 2 ou 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalide; doit 皻re 0, 1, 2 ou 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: le mode S2K simple (0) est fortement d嶰onseill嬞n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; ce doit 皻re 0, 1 ou 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "pr嶨廨ences par d嶨aut invalides\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "pr嶨廨ences de chiffrement personnelles invalides\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "pr嶨廨ences de hachage personnelles invalides\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "pr嶨廨ences de compression personnelles invalides\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne marche pas encore avec %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de chiffrement \"%s\"\n" "en mode %s.\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de hachage \"%s\"\n" "en mode %s.\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de compression \"%s\"\n" "en mode %s.\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISSEMENT: des r嶰ipients (-r) ont donn廥 alors que le chiffrement\n" "ne se fait pas par cl publique\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom du fichier]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key utilisateur" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key utilisateur" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "impossible d'ouvrir %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-cl廥]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'envoi vers le serveur de cl廥 a 嶰hou: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la r嶰eption depuis le serveur de cl廥 a 嶰hou: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "l'export de la cl a 嶰hou: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "la recherche au sein du serveur de cl廥 a 嶰hou: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "le rafra蟃hissement par le serveur de cl廥 a 嶰hou: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "la suppression d'une armure a 嶰hou: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "la construction d'une armure a 嶰hou: %s \n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Vous pouvez taper votre message...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "impossible d'ouvrir `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1214,19 +1210,19 @@ msgstr "" "le nom d'une notation ne doit comporter que des caract鋨es imprimables\n" "ou des espaces, et se terminer par un signe '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notation utilisateur doit contenir le caract鋨e '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "une valeur de notation ne doit utiliser aucun caract鋨e de contr犨e\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "l'URL de politique de certification donn嶪 est invalide\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "l'URL de politique de signature donn嶪 est invalide\n" @@ -1355,7 +1351,6 @@ msgstr "cause de r憝ocation: " msgid "revocation comment: " msgstr "commentaire de r憝ocation: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1409,7 +1404,6 @@ msgstr " %d = je fais enti鋨ement confia msgid " %d = I trust ultimately\n" msgstr " %d = je donne une confiance ultime\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = donnez-moi plus d'informations\n" @@ -1732,14 +1726,6 @@ msgstr "taille trop petite; 1024 est la msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "taille trop petite; 768 est la plus petite valeur permise.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1824,7 +1810,6 @@ msgstr "valeur invalide\n" msgid "%s does not expire at all\n" msgstr "%s n'expire pas du tout\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2158,7 +2143,6 @@ msgstr "cl %08lX: non prot嶲嶪 - ignor msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "cl %08lX: cl de style PGP 2.x - ignor嶪\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2174,9 +2158,7 @@ msgstr "ATTENTION: rien n'a 彋 export嬞 msgid "too many entries in pk cache - disabled\n" msgstr "trop d'entr嶪s dans le cache pk - d廥activ嬞n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Nom utilisateur introuvable]" @@ -2411,7 +2393,6 @@ msgstr "pas de porte-cl廥 par d嶨aut: %s msgid "key %08lX: secret key imported\n" msgstr "cl %08lX: cl secr鋈e import嶪\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2652,8 +2633,6 @@ msgstr "" "Voulez-vous cr嶪r une nouvelle signature pour remplacer celle qui a\n" "expir ? (o/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -3009,7 +2988,6 @@ msgstr "suppr.ut" msgid "delete user ID" msgstr "enlever un utilisateur" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "suppr.photo" @@ -3307,8 +3285,6 @@ msgstr "Cette cl peut 皻re r憝oqu嶪 par msgid " (sensitive)" msgstr " (sensible)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3443,9 +3419,6 @@ msgstr "" "impossible d'utiliser une cl de style PGP 2.x comme r憝ocateur\n" "d廥ign.\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3543,7 +3516,6 @@ msgstr "Etes-vous sr de vouloir toujour msgid "Create a revocation certificate for this signature? (y/N) " msgstr "G幯廨er un certificat de r憝ocation pour cette signature ? (o/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Vous avez sign ces noms d'utilisateurs:\n" @@ -3584,10 +3556,6 @@ msgstr "pas de cl secr鋈e\n" msgid "user ID \"%s\" is already revoked\n" msgstr "Le nom d'utilisateur \"%s\" est d嶴 r憝oqu.\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3654,7 +3622,6 @@ msgstr " Empreinte de la cl principale: msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-cl:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Empreinte de la cl =" @@ -3664,8 +3631,6 @@ msgstr " Empreinte de la cl =" msgid "weird size for an encrypted session key (%d)\n" msgstr "taille 彋onnante pour une cl de session chiffr嶪 (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3778,7 +3743,6 @@ msgstr "Politique: " msgid "signature verification suppressed\n" msgstr "v廨ification de signature supprim嶪\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "le traitement de ces signatures multiples est impossible\n" @@ -3788,10 +3752,6 @@ msgstr "le traitement de ces signatures msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature faite %.*s avec la cl %s ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Cl disponible sur: " @@ -3962,7 +3922,7 @@ msgstr "la variable d'environnement GPG_ msgid "gpg-agent protocol version %d is not supported\n" msgstr "le protocole gpg-agent version %d n'est pas support嬞n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossible de se connecter `%s': %s\n" @@ -3971,11 +3931,11 @@ msgstr "impossible de se connecter `%s msgid "communication problem with gpg-agent\n" msgstr "probl鋗e de communication avec ssh-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probl鋗e avec l'agent - arr皻 d'utilisation de l'agent\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID cl principale %08lX)" @@ -4008,16 +3968,16 @@ msgstr "mot de passe trop long\n" msgid "invalid response from agent\n" msgstr "r廧onse de l'agent invalide\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "annul par l'utilisateur\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probl鋗e avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4027,20 +3987,20 @@ msgstr "" "Vous avez besoin d'un mot de passe pour d憝errouiller la cl secr鋈e pour\n" "l'utilisateur: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "cl de %u bits %s, ID %08lX, cr澭e le %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "impossible de demander un mot de passe en mode automatique\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "R廧彋ez le mot de passe: " @@ -4110,41 +4070,41 @@ msgstr "NOTE: la cl secr鋈e %08lX a exp msgid "NOTE: key has been revoked" msgstr "NOTE: la cl a 彋 r憝oqu嶪" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "requ皻e de la cl %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "impossible d'obtenir les cl廥 du serveur: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "erreur pendant l'envoi de `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "l'envoi `%s' s'est d廨oul avec succ鋊 (r廥ultat=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "l'envoi `%s' a 嶰hou: le r廥ultat est %u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "ce serveur de cl廥 ne supporte pas --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "recherche de \"%s\" du serveur HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "impossible de chercher une cl dans le serveur : %s\n" @@ -4594,9 +4554,6 @@ msgstr "aucune cl de confiance ultime n msgid "public key of ultimately trusted key %08lX not found\n" msgstr "la cl publique de la cl de confiace ultime %08lX est introuvable\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4649,7 +4606,6 @@ msgstr "" "`%s' a 彋 ignor嶪: c'est une cl ElGamal g幯廨嶪 par PGP qui n'est pas\n" "sre pour les signatures !\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4720,7 +4676,7 @@ msgstr "" "impossible d'憝iter une cl faible pour le chiffrement sym彋rique:\n" "%d essais ont eu lieu !\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA n嶰essite l'utilisation d'un algorithme de hachage de 160 bits\n" @@ -5117,17 +5073,17 @@ msgstr "Pas d'aide disponible" msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "erreur durant la cr嶧tion du porte-cl廥 `%s' : %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "le porte-cl廥 `%s` a 彋 cr澭\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "la reconstruction du cache de porte-cl廥 a 嶰hou : %s\n" @@ -5235,7 +5191,6 @@ msgstr "" "cette plateforme a besoin de fichiers temporaires pour appeler des\n" "programmes externes\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5317,7 +5272,6 @@ msgstr "sortie avec armure ASCII forc嶪. msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet a 嶰hou: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Certificat de r憝ocation cr澭.\n" @@ -5349,7 +5303,6 @@ msgstr "algorithme de protection inconnu msgid "NOTE: This key is not protected!\n" msgstr "NOTE: Cette cl n'est pas prot嶲嶪 !\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5430,7 +5383,6 @@ msgstr "erreur: empreinte invalide\n" msgid "error: no ownertrust value\n" msgstr "erreur: pas de valeur de confiance au propri彋aire\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/gl.po gnupg-1.2.6/po/gl.po --- gnupg-1.2.5/po/gl.po 2004-07-26 12:26:40.000000000 +0000 +++ gnupg-1.2.6/po/gl.po 2004-08-25 14:59:15.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -30,7 +30,6 @@ msgstr "a operaci鏮 non posible sen me msgid "(you may have used the wrong program for this task)\n" msgstr "(pode que usara o programa equivocado para esta tarefa)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "si|sim" @@ -39,7 +38,6 @@ msgstr "si|sim" msgid "yY" msgstr "sS" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "non|nom" @@ -48,7 +46,6 @@ msgstr "non|nom" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "abandonar" @@ -253,7 +250,6 @@ msgstr "non cifrado" msgid "not processed" msgstr "non procesado" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "chave pblica non utilizable" @@ -739,19 +735,19 @@ msgstr "|N|emprega-lo algoritmo de compr msgid "throw keyid field of encrypted packets" msgstr "descarta-lo campo de id de chave dos paquetes cifrados" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Amosar Identificaci鏮s Fotogr塻icas" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Non amosar Identificaci鏮s Fotogr塻icas" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Estabrece-la li鎙 de comando para ve-las Identificaci鏮s Fotogr塻icas" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -759,7 +755,7 @@ msgstr "" "@\n" "(Vexa a p嫞ina man para un listado completo de comandos e opci鏮s)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -779,17 +775,17 @@ msgstr "" " --list-keys [nomes] amosa-las chaves\n" " --fingerprint [nomes] amosa-las pegadas dactilares\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Por favor, informe dos erros no programa a ,\n" "e dos erros na traducci鏮 a .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opci鏮s] [ficheiros] (-h para ve-la axuda)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -799,7 +795,7 @@ msgstr "" "asinar, verificar, cifrar ou descifrar\n" "a operaci鏮 por defecto depende dos datos de entrada\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -807,374 +803,374 @@ msgstr "" "\n" "Algoritmos soportados:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Pblica: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Cifra: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compresi鏮: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "uso: gpg [opci鏮s] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "comandos conflictivos\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "non se atopou un signo = na definici鏮 do grupo \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVISO: propiedade insegura en %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVISO: permisos inseguros en %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr " creouse un novo ficheiro de configuraci鏮 `%s'\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: ign鏎ase o antigo ficheiro de opci鏮s por defecto `%s'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: non existe o ficheiro de opci鏮s por defecto `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opci鏮s `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "lendo as opci鏮s de `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "non se cargou a extensi鏮 de cifrado \"%s\" debido a permisos inseguros\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non un xogo de caracteres v嫮ido\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opci鏮s de importaci鏮 non v嫮idas\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "opci鏮s de importaci鏮 non v嫮idas\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opci鏮s de exportaci鏮 non v嫮idas\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "opci鏮s de exportaci鏮 non v嫮idas\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "non se puido estabrecer exec-path a %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: ︽ programa pode crear un ficheiro 'core'!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s fai que se ignore %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s non para uso normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s non se admite con %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s non ten sentido empreg嫕doo con %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "s pode crear sinaturas separadas ou en claro no modo --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "debe empregar ficheiros (e non canalizaci鏮s) ao traballar con --pgp2 " "activado.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "para cifrar unha mensaxe en modo --pgp2 prec疄ase da cifra IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non v嫮ido\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de resumo seleccionado non v嫮ido\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de resumo de certificaci鏮 seleccionado non v嫮ido\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "o algoritmo de compresi鏮 `%s' de s lectura nesta versi鏮\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compresi鏮 debe estar entre %d e %d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser superior a 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser superior a 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth debe valer entre 1 e 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nivel de comprobaci鏮 por defecto non v嫮ido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nivel de comprobaci鏮 por defecto non v嫮ido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: desacons幨lase encarecidamente o modo S2K simple (0)\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non v嫮ido; debe ser 0, 1 ou 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "preferencias por defecto non v嫮idas\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "preferencias de cifrado personais non v嫮idas\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "preferencias de resumo personais non v嫮idas\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "preferencias de compresi鏮 personais non v嫮idas\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s a璯da non traballa con %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "non se pode empregar o algoritmo de compresi鏮 \"%s\" no modo %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pblica\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [ficheiro]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [ficheiro]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [ficheiro]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [ficheiro]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ficheiro]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [ficheiro]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [ficheiro]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id-de-usuario" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id-de-usuario" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-de-usuario" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-de-usuario" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-de-usuario [comandos]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "non se puido abrir %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "o env甐 ao servidor de chaves fallou: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "a recepci鏮 do servidor de chaves fallou: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "a exportaci鏮 da chave fallou: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "a busca no servidor de chaves fallou fallou: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "a actualizaci鏮 no servidor de chaves fallou: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "non se puido quita-la armadura: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "non se puido po鎑-la armadura: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash non v嫮ido `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[ficheiro]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Escriba a sa mensaxe ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "non se puido abrir `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1182,19 +1178,19 @@ msgstr "" "un nome de notaci鏮 s debe ter caracteres imprimibles ou espacios, e debe " "rematar en '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "un nome de notaci鏮 de usuario debe conte-lo car塶ter '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "un valor de notaci鏮 non pode empregar ningn car塶ter de control\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "o URL de normativa de certificaci鏮 dado non v嫮ido\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non v嫮ido\n" @@ -1321,7 +1317,6 @@ msgstr "motivo para a revocaci鏮: " msgid "revocation comment: " msgstr "comentario de revocaci鏮: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMsSoO" @@ -1375,7 +1370,6 @@ msgstr " %d = Conf甐 totalmente\n" msgid " %d = I trust ultimately\n" msgstr " %d = Conf甐 absolutamente\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = amosar m壾s informaci鏮\n" @@ -1694,14 +1688,6 @@ msgstr "chave pequena de m壾s; 1024 o msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "chave pequena de m壾s; 768 o menor valor admitido\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1786,7 +1772,6 @@ msgstr "valor non v嫮ido\n" msgid "%s does not expire at all\n" msgstr "%s non caduca nunca\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2112,7 +2097,6 @@ msgstr "chave %08lX: non est protexida msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2127,9 +2111,7 @@ msgstr "AVISO: non se exportou nada\n" msgid "too many entries in pk cache - disabled\n" msgstr "demasiadas entradas na cach de chaves pblicas - desactivada\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Non se atopou o id de usuario]" @@ -2365,7 +2347,6 @@ msgstr "non hai un chaveiro privado por msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2607,8 +2588,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "熹uere emitir unha nova sinatura que substita caducada? (s/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2961,7 +2940,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "borrar un ID de usuario" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3261,8 +3239,6 @@ msgstr "Esta chave pode estar revocada p msgid " (sensitive)" msgstr " (sensible)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3393,9 +3369,6 @@ msgid "cannot appoint a PGP 2.x style ke msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n" @@ -3490,7 +3463,6 @@ msgstr "激st seguro de que quere revoca msgid "Create a revocation certificate for this signature? (y/N) " msgstr "澧rear un certificado de revocaci鏮 para esta sinatura? (s/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Asinou estes IDs de usuario: \n" @@ -3531,10 +3503,6 @@ msgstr "non hai chave secreta\n" msgid "user ID \"%s\" is already revoked\n" msgstr "o ID de usuario \"%s\" xa est revocado\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3600,7 +3568,6 @@ msgstr "Pegada dactilar da chave primari msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Pegada dactilar =" @@ -3610,8 +3577,6 @@ msgstr " Pegada dactilar =" msgid "weird size for an encrypted session key (%d)\n" msgstr "tama隳 moi estra隳 para unha chave de sesi鏮 cifrada (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3722,7 +3687,6 @@ msgstr "Normativa: " msgid "signature verification suppressed\n" msgstr "verificaci鏮 de sinatura suprimida\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "non se poden manexar estas sinaturas mltiples\n" @@ -3732,10 +3696,6 @@ msgstr "non se poden manexar estas sinat msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Chave dispo鎴ble en: " @@ -3900,7 +3860,7 @@ msgstr "variable de ambiente GPG_AGENT_I msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versi鏮 %d do protocolo de gpg-agent non est soportada\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "non se puido conectar a `%s': %s\n" @@ -3909,11 +3869,11 @@ msgstr "non se puido conectar a `%s': %s msgid "communication problem with gpg-agent\n" msgstr "problema de comunicaci鏮 con gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema co axente - desactivando o emprego do axente\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -3945,16 +3905,16 @@ msgstr "contrasinal demasiado longo\n" msgid "invalid response from agent\n" msgstr "resposta do axente non v嫮ida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "cancelado polo usuario\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3964,20 +3924,20 @@ msgstr "" "Necesita un contrasinal para desbloquea-la chave secreta para\n" "o usuario \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bits, chave %s, ID %08lX, creada %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introduza o contrasinal: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " @@ -4043,41 +4003,41 @@ msgstr "NOTA: a chave secreta %08lX cadu msgid "NOTE: key has been revoked" msgstr "NOTA: a chave est revocada" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "non se pode obte-la chave do servidor de chaves: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "erro ao enviar a `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "憖ito ao enviar a `%s' (estado=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "fallo ao enviar a `%s': estado=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "este servidor de chaves non soporta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "non se pode buscar no servidor de chaves: %s\n" @@ -4512,9 +4472,6 @@ msgstr "non se atoparon chaves de confia msgid "public key of ultimately trusted key %08lX not found\n" msgstr "non se atopou a chave pblica da clave de confianza absoluta %08lX\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4567,7 +4524,6 @@ msgstr "" "om癃ese `%s': 〔sta unha chave ElGamal xerada por PGP que non segura " "para sinaturas!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4635,7 +4591,7 @@ msgstr "" "non se pode evitar unha chave feble para o cifrado sim彋rico; tentouse %d " "veces\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n" @@ -5029,17 +4985,17 @@ msgstr "Non hai axuda dispo鎴ble" msgid "No help available for `%s'" msgstr "Non hai axuda dispo鎴ble para `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "erro ao crea-lo chaveiro `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "chaveiro `%s' creado\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "fallo ao reconstru-la cach de chaveiros: %s\n" @@ -5145,7 +5101,6 @@ msgstr "" "esta plataforma precisa de ficheiros temporais ao chamar a programas " "externos\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5223,7 +5178,6 @@ msgstr "Forzouse unha sa獮a con armadura msgid "make_keysig_packet failed: %s\n" msgstr "a chamada a make_keysig_packet fallou: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Creouse o certificado de revocaci鏮.\n" @@ -5255,7 +5209,6 @@ msgstr "algoritmo de protecci鏮 desco鎑c msgid "NOTE: This key is not protected!\n" msgstr "NOTA: •sta chave non est protexida!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5334,7 +5287,6 @@ msgstr "erro: pegada dactilar non v嫮ida msgid "error: no ownertrust value\n" msgstr "erro: non hai un valor de confianza no propietario\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/gnupg.pot gnupg-1.2.6/po/gnupg.pot --- gnupg-1.2.5/po/gnupg.pot 2004-07-26 12:26:37.000000000 +0000 +++ gnupg-1.2.6/po/gnupg.pot 2004-08-25 14:59:11.000000000 +0000 @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) YEAR Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,6 @@ msgstr "" msgid "(you may have used the wrong program for this task)\n" msgstr "" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "" @@ -41,7 +40,6 @@ msgstr "" msgid "yY" msgstr "" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "" @@ -50,7 +48,6 @@ msgstr "" msgid "nN" msgstr "" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "" @@ -255,7 +252,6 @@ msgstr "" msgid "not processed" msgstr "" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "" @@ -717,25 +713,25 @@ msgstr "" msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -747,407 +743,407 @@ msgid "" " --fingerprint [names] show fingerprints\n" msgstr "" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "" -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "" -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "" @@ -1270,7 +1266,6 @@ msgstr "" msgid "revocation comment: " msgstr "" -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "" @@ -1319,7 +1314,6 @@ msgstr "" msgid " %d = I trust ultimately\n" msgstr "" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr "" @@ -1617,14 +1611,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1693,7 +1679,6 @@ msgstr "" msgid "%s does not expire at all\n" msgstr "" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -1985,7 +1970,6 @@ msgstr "" msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -1999,9 +1983,7 @@ msgstr "" msgid "too many entries in pk cache - disabled\n" msgstr "" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "" @@ -2229,7 +2211,6 @@ msgstr "" msgid "key %08lX: secret key imported\n" msgstr "" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2456,8 +2437,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2783,7 +2762,6 @@ msgstr "" msgid "delete user ID" msgstr "" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "" @@ -3081,8 +3059,6 @@ msgstr "" msgid " (sensitive)" msgstr "" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3200,9 +3176,6 @@ msgstr "" msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3290,7 +3263,6 @@ msgstr "" msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "" @@ -3331,10 +3303,6 @@ msgstr "" msgid "user ID \"%s\" is already revoked\n" msgstr "" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3398,7 +3366,6 @@ msgstr "" msgid " Subkey fingerprint:" msgstr "" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr "" @@ -3408,8 +3375,6 @@ msgstr "" msgid "weird size for an encrypted session key (%d)\n" msgstr "" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3520,7 +3485,6 @@ msgstr "" msgid "signature verification suppressed\n" msgstr "" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "" @@ -3530,10 +3494,6 @@ msgstr "" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "" @@ -3693,7 +3653,7 @@ msgstr "" msgid "gpg-agent protocol version %d is not supported\n" msgstr "" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "" @@ -3702,11 +3662,11 @@ msgstr "" msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "" @@ -3735,36 +3695,36 @@ msgstr "" msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "" -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "" @@ -3830,41 +3790,41 @@ msgstr "" msgid "NOTE: key has been revoked" msgstr "" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "" @@ -4268,9 +4228,6 @@ msgstr "" msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4313,7 +4270,6 @@ msgid "" "signatures!\n" msgstr "" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4379,7 +4335,7 @@ msgstr "" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -4668,17 +4624,17 @@ msgstr "" msgid "No help available for `%s'" msgstr "" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "" @@ -4775,7 +4731,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -4853,7 +4808,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "" @@ -4885,7 +4839,6 @@ msgstr "" msgid "NOTE: This key is not protected!\n" msgstr "" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -4955,7 +4908,6 @@ msgstr "" msgid "error: no ownertrust value\n" msgstr "" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/hu.po gnupg-1.2.6/po/hu.po --- gnupg-1.2.5/po/hu.po 2004-07-26 12:26:40.000000000 +0000 +++ gnupg-1.2.6/po/hu.po 2004-08-25 14:59:16.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc L嫳zl \n" "Language-Team: Hungarian \n" @@ -30,7 +30,6 @@ msgstr "A mvelet nem lehets嶲es biztons msgid "(you may have used the wrong program for this task)\n" msgstr "(Lehet, hogy nem a megfelel programot haszn嫮ja a feladatra.)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "igen" @@ -39,7 +38,6 @@ msgstr "igen" msgid "yY" msgstr "iI" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nem" @@ -48,7 +46,6 @@ msgstr "nem" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "kil廧廥|kilepes" @@ -253,7 +250,6 @@ msgstr "nem titkos癃ott" msgid "not processed" msgstr "nem feldolgozott" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "haszn嫮hatatlan nyilv嫕os kulcs" @@ -734,19 +730,19 @@ msgstr "|N|N. sorsz嫥 t闣顤癃 algoritm msgid "throw keyid field of encrypted packets" msgstr "titkos癃ott csomagok keyid mez鰋幯ek eldob嫳a" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "fot鏇zonos癃鏦 mutat嫳a" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "ne mutassa a fot鏇zonos癃鏦at" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "parancssor 嫮l癃嫳a fot鏇zonos癃鏦 megn憴廥嶭ez" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -754,7 +750,7 @@ msgstr "" "@\n" "(A parancsok 廥 opci鏦 teljes list奫嫢 a man oldalon tekintheti meg.)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -774,15 +770,15 @@ msgstr "" " --list-keys [nevek] kulcsok ki甏at嫳a\n" " --fingerprint [nevek] ujjlenyomatok ki甏at嫳a\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "A hib嫜at (angolul) a c璥re 甏ja meg!\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Haszn嫮at: gpg [opci鏦] [f奫lok] (-h a sg鏌oz)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -792,7 +788,7 @@ msgstr "" "Al摿r嫳, ellen鰎z廥, titkos癃嫳 vagy visszafejt廥.\n" "Az alap廨telmezett mvelet a bemeneti adatt鏊 fgg.\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -800,371 +796,371 @@ msgstr "" "\n" "T嫥ogatott algoritmusok:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Nyilv嫕os kulcs (pubkey): " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Rejtjelez (cipher): " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Kivonatol (hash): " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "T闣顤癃 (compression): " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "Haszn嫮at: gpg [opci鏦] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "Egym嫳nak ellentmond parancsok!\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "Nem tal嫮tam = jelet a \"%s\" csoportdefin獳i鏏an!\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "FIGYELEM: Nem biztons墔os tulajdonos: %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "FIGYELEM: nem biztons墔os enged幨yek: %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "FIGYELEM: nem biztons墔os k霵yvt嫫tulajdonos: %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "FIGYELEM: nem biztons墔os k霵yvt嫫enged幨yek: %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "\"%s\": ismeretlen konfigur塶i鏀 elem.\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MEGJEGYZ仉: Figyelmen k癉l hagytam a r嶲i opci鏦at (%s).\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MEGJEGYZ仉: Nincs alap廨telmezett opci鏀 f奫l (%s).\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "\"%s\" opci鏀 f奫l: %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "Az opci鏦at a \"%s\" 嫮lom嫕yb鏊 olvasom.\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "A \"%s\" rejtjelez b鰉癃廥t rossz enged幨yek miatt t闤t闣 be.\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nem 廨v幯yes karakterkioszt嫳!\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "宁telmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 宁v幯ytelen import opci鏦!\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "宁v幯ytelen import opci鏦!\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 宁v幯ytelen export opci鏦!\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "宁v幯ytelen export opci鏦!\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Nem tudom a v嶲rehajt嫳i el廨廥i utat %s 廨t幧re 嫮l癃ani!\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "FIGYELEM: A program core 嫮lom嫕yt hozhat l彋re!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "FIGYELEM: %s hat嫳talan癃ja %s-t!\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MEGJEGYZ仉: %s nem norm嫮 haszn嫮atra van!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 廥 %s nem haszn嫮hat egytt!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 廨telmetlen %s mellett!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "Csak kl霵嫮l 廥 olvashat鏀z饘eg-al摿r嫳t k廥z癃het --pgp2 m鏚ban!\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Nem 甏hat al 廥 titkos癃hat egyszerre --pgp2 m鏚ban!\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Csak 嫮lom嫕yokat (pipe-ot nem) haszn嫮hat --pgp2 m鏚ban!\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "閌enet titkos癃嫳a --pgp2 m鏚ban IDEA rejtjelez鰗 ig幯yel!\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "A kiv嫮asztott rejtjelez algoritmus 廨v幯ytelen!\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "A kiv嫮asztott kivonatol algoritmus 廨v幯ytelen!\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "Az igazol嫳hoz kiv嫮asztott kivonatol algoritmus 廨v幯ytelen!\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "\"%s\" t闣顤癃騮lgoritmus csak olvashat ebben a kiad嫳ban.\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "A t闣顤癃騮lgoritmus sz嫥a %d 廥 %d k驆 kell essen!\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed nagyobb kell legyen 0-n嫮!\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed nagyobb kell legyen 1-n幨!\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth 1 廥 255 k驆 kell essen!\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "宁v幯ytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "宁v幯ytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MEGJEGYZ仉: Egyszer S2K m鏚 (0) er鰆en ellenjavallt!\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "宁v幯ytelen S2K m鏚; 0, 1 vagy 3 lehet.\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "宁v幯ytelen alap廨telmezett preferenci嫜!\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "宁v幯ytelen szem幨yes rejtjelez-preferenci嫜!\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "宁v幯ytelen szem幨yes kivonatol鏕referenci嫜!\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "宁v幯ytelen szem幨yes t闣顤癃鱀referenci嫜!\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 廥 %s egyel鰎e nem haszn嫮hat egytt!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" "Lehet, hogy nem haszn嫮hatja \"%s\" rejtjelez algoritmust %s m鏚ban!\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" "Lehet, hogy nem haszn嫮hatja \"%s\" kivonatol algoritmust %s m鏚ban!\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "Lehet, hogy nem haszn嫮hatja \"%s\" t闣顤癃 algoritmust %s m鏚ban!\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Bizalmi adatb嫙is (%s) inicializ嫮嫳a sikertelen!\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "FIGYELEM: C璥zett megadva (-r), de nincs nyilv嫕os kulcs titkos癃嫳!\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [f奫ln憝]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [f奫ln憝]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [f奫ln憝]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [f奫ln憝]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [f奫ln憝]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [f奫ln憝]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [f奫ln憝]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [f奫ln憝]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key felh-azonos癃" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key felh-azonos癃" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key felh-azonos癃" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key felh-azonos癃" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key felh-azonos癃 [parancsok]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "Nem tudom megnyitni %s-t: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [felh-azonos癃鄿 [kulcskarika]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "Kld廥 a kulcsszerverre sikertelen: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "V彋el a kulcsszerverr鯷 sikertelen: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "Kulcsexport嫮嫳 sikertelen: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "Keres廥 a kulcsszerveren sikertelen: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Friss癃廥 a kulcsszerverr鯷 sikertelen: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "P嫕c幨 elt嫛ol癃嫳a nem sikerlt: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "P嫕c幨oz嫳 nem sikerlt: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "宁v幯ytelen kivonatol algoritmus: %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[f奫ln憝]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Kezdheti g廧elni az zenetet...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "Nem tudom megnyitni %s-t!\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1172,19 +1168,19 @@ msgstr "" "Egy jel闤廥 neve csak nyomtathat karaktereket 廥 sz鏦驆t tartalmazhat, 廥 = " "jellel kell befejez髇j霵.\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "Egy felhaszn嫮鎩el闤廥nek tartalmaznia kell a \"@\" karaktert!\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "Egy jel闤廥 廨t幧嶵en nem szerepelhet vez廨l鰈arakter!\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "A megadott igazol嫳i elj嫫嫳m鏚 URL-je 廨v幯ytelen!\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "A megadott al摿r嫳i elj嫫嫳m鏚 URL-je 廨v幯ytelen!\n" @@ -1310,7 +1306,6 @@ msgstr "Visszavon嫳 oka: " msgid "revocation comment: " msgstr "Megjegyz廥 a visszavon嫳hoz: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iIfFkKhH" @@ -1365,7 +1360,6 @@ msgstr " %d = teljesen megb瞵om benne\n" msgid " %d = I trust ultimately\n" msgstr " %d = alapvet髊n megb瞵om benne\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = tov墎bi inform塶i鏦at k廨ek\n" @@ -1680,14 +1674,6 @@ msgstr "Kulcsm廨et tl kicsi; 1024 a leg msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "Kulcsm廨et tl kicsi; 768 a legkisebb megengedett 廨t幧.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1772,7 +1758,6 @@ msgstr "宁v幯ytelen 廨t幧!\n" msgid "%s does not expire at all\n" msgstr "%s soha nem j嫫 le.\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2093,7 +2078,6 @@ msgstr "%08lX kulcs: nem v嶮ett - kihagy msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "%08lX kulcs: PGP 2.x st璱us kulcs - kihagytam.\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2107,9 +2091,7 @@ msgstr "FIGYELEM: Semmit sem export嫮tam msgid "too many entries in pk cache - disabled\n" msgstr "Tl sok bejegyz廥 van a nyilv嫕oskulcs-gyors癃鏒嫫ban - letiltom.\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[ismeretlen kulcs]" @@ -2343,7 +2325,6 @@ msgstr "Nincs alap廨telmezett titkoskulc msgid "key %08lX: secret key imported\n" msgstr "%08lX kulcs: Titkos kulcs import嫮va.\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2580,8 +2561,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Szeretne kiadni egy j al摿r嫳t, amellyel lecser幨i a lej嫫tat? (i/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2934,7 +2913,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "felhaszn嫮鏙 azonos癃 t顤l廥e" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3232,8 +3210,6 @@ msgstr "Ezt a kulcsot a k饘etkez %s kul msgid " (sensitive)" msgstr " (廨z幧eny)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3362,9 +3338,6 @@ msgstr "甾ja be a kijel闤t visszavon fe msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Nem adhat meg PGP 2.x st璱us kulcsot kijel闤t visszavon鏮ak!\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Nem adhat meg egy kulcsot saj嫢 kijel闤t visszavon鎩嫕ak!\n" @@ -3457,7 +3430,6 @@ msgstr "Biztos benne, hogy m嶲is visszav msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Csin嫮junk egy visszavon igazol嫳t ehhez az al摿r嫳hoz? (i/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "琄 al摿rta a k饘etkez felhaszn嫮鏇zonos癃鏦at:\n" @@ -3498,10 +3470,6 @@ msgstr "Nincs titkos kulcs.\n" msgid "user ID \"%s\" is already revoked\n" msgstr "\"%s\" felhaszn嫮鏙 azonos癃鏒 m嫫 visszavont嫜.\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3566,7 +3534,6 @@ msgstr "Els髇legeskulcs-ujjlenyomat:" msgid " Subkey fingerprint:" msgstr " Alkulcsujjlenyomat:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Kulcs ujjlenyomata =" @@ -3576,8 +3543,6 @@ msgstr " Kulcs ujjlenyomata =" msgid "weird size for an encrypted session key (%d)\n" msgstr "Furcsa m廨et (%d) titkos癃ott munkafolyamatkulcs.\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3691,7 +3656,6 @@ msgstr "Elj嫫嫳m鏚: " msgid "signature verification suppressed\n" msgstr "Al摿r嫳-ellen鰎z廥 elnyomva.\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "Nem tudom kezelni ezeket a t鐽bsz顤飉 al摿r嫳okat!\n" @@ -3701,10 +3665,6 @@ msgstr "Nem tudom kezelni ezeket a t鐽bs msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Al摿rva: %.*s; kulcs: %s, %08lX.\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Kulcs tal嫮hat: " @@ -3867,7 +3827,7 @@ msgstr "Nem megfelel form奫 GPG_AGENT_ msgid "gpg-agent protocol version %d is not supported\n" msgstr "%d gpg-agent protokollverzi nem t嫥ogatott!\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Nem tudok kapcsol鏚ni \"%s\" objektumhoz: %s\n" @@ -3876,11 +3836,11 @@ msgstr "Nem tudok kapcsol鏚ni \"%s\" obj msgid "communication problem with gpg-agent\n" msgstr "Kommunik塶i鏀 probl幦a a gpg gyn闥kel!\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "Probl幦a van az gyn闥kel. Letiltom a haszn嫮at嫢.\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "" @@ -3915,16 +3875,16 @@ msgstr "A jelsz tl hossz!\n" msgid "invalid response from agent\n" msgstr "宁v幯ytelen v嫮asz az gyn闥t鯷!\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "A felhaszn嫮 megszak癃otta a mveletet.\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Probl幦a az gyn闥kel: gyn闥 v嫮asza: 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3935,20 +3895,20 @@ msgstr "" "haszn嫮at墏oz:\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u bites %s kulcs, azonos癃: %08lX, l彋rehozva: %s." -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "Nem tudok jelsz鏒 bek廨ni k飆egelt m鏚ban!\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "甾ja be a jelsz鏒: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ism彋elje meg a jelsz鏒: " @@ -4015,41 +3975,41 @@ msgstr "MEGJEGYZ仉: %08lX titkos kulcs % msgid "NOTE: key has been revoked" msgstr "MEGJEGYZ仉: A kulcsot visszavont嫜." -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "Lek廨em a %08lX kulcsot a %s kulcsszerverr鯷.\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "Nem tudom leh癉ni a kulcsot a %s kulcsszerverr鯷.\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "Hiba %s-ra/-re kld廥kor: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "Sikeresen felkldtem %s kulcsszerverre. (St嫢usz: %u.)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "Nem tudtam felkldeni %s kulcsszerverre. St嫢usz: %u.\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "Ez a kulcsszerver nem t嫥ogatja a --search-keys kapcsol鏒.\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "Nem tudok keresni a %s kulcsszerveren.\n" @@ -4476,9 +4436,6 @@ msgstr "Nem tal嫮tam alapvet髊n megb瞵ha msgid "public key of ultimately trusted key %08lX not found\n" msgstr "Nem tal嫮om az alapvet髊n megb瞵hat %08lX kulcs nyilv嫕os kulcs嫢!\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4529,7 +4486,6 @@ msgstr "" "Kihagytam \"%s\"-t: ez egy PGP 嫮tal l彋rehozott ElGamal kulcs, amely nem\n" "biztons墔os al摿r嫳okhoz!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4599,7 +4555,7 @@ msgstr "" "Nem tudom elkerlni a gyenge kulcsot a szimmetrikus titkos癃鏌oz.\n" "%d alkalommal pr鏏嫮tam!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "A DSA 160 bites hash (kivonatol) algoritmust ig幯yel.\n" @@ -5002,17 +4958,17 @@ msgstr "Nem 嫮l rendelkez廥re seg癃s嶲." msgid "No help available for `%s'" msgstr "Nem 嫮l rendelkez廥re seg癃s嶲 \"%s\" t幦墏oz." -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "Hiba a(z) \"%s\" kulcskarika l彋rehoz嫳akor: %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "\"%s\" kulcskarik嫢 l彋rehoztam.\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Nem tudtam jra廧癃eni a kulcskarika cache-彋: %s\n" @@ -5117,7 +5073,6 @@ msgid "this platform requires temp files msgstr "" "Ez a platform 嫢meneti 嫮lom嫕yokat ig幯yel kls programok h癉嫳墏oz.\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5196,7 +5151,6 @@ msgstr "ASCII-p嫕c幨ozott kimenet kiv嫮a msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet sikertelen: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Visszavon igazol嫳 l彋rehozva.\n" @@ -5228,7 +5182,6 @@ msgstr "Ismeretlen v嶮elmi algoritmus!\n msgid "NOTE: This key is not protected!\n" msgstr "MEGJEGYZ仉: Ez a kulcs nem v嶮ett.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5307,7 +5260,6 @@ msgstr "Hiba: 宁v幯ytelen ujjlenyomat.\n msgid "error: no ownertrust value\n" msgstr "Hiba: Nincs tulajdonosmegb瞵hat鏀墔i 廨t幧.\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/id.po gnupg-1.2.6/po/id.po --- gnupg-1.2.5/po/id.po 2004-07-26 12:26:41.000000000 +0000 +++ gnupg-1.2.6/po/id.po 2004-08-25 14:59:17.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-id\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -33,7 +33,6 @@ msgstr "operasi tidak mungkin tanpa meng msgid "(you may have used the wrong program for this task)\n" msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "y|ya" @@ -42,7 +41,6 @@ msgstr "y|ya" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "n|t|tidak" @@ -51,7 +49,6 @@ msgstr "n|t|tidak" msgid "nN" msgstr "tT" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "q|k|keluar" @@ -256,7 +253,6 @@ msgstr "tidak dienkripsi" msgid "not processed" msgstr "tidak diproses" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "kunci publik tidak dapat dipakai" @@ -736,19 +732,19 @@ msgstr "|N|gunakan algoritma kompresi N" msgid "throw keyid field of encrypted packets" msgstr "buang field keyid paket terenkripsi" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Tampilkan Photo IDs" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Jangan tampilkan Photo IDs" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Set perintah baris untuk melihat Photo IDs" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -756,7 +752,7 @@ msgstr "" "@\n" "(Lihat man page untuk daftar lengkap semua perintah dan option)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -776,15 +772,15 @@ msgstr "" " --list-keys [nama] tampilkan kunci\n" " --fingerprint [nama] tampilkan fingerprint\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Laporkan bug ke .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -794,7 +790,7 @@ msgstr "" "tandai, cek, enkripsi atau dekripsi\n" "operasi baku tergantung pada data input\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -802,379 +798,379 @@ msgstr "" "\n" "Algoritma yang didukung:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Cipher: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Kompresi: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "pemakaian: gpg [pilihan] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "perintah saling konflik\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "Item Konfigurasi tidak dikenal \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "CATATAN: tidak ada file pilihan baku `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "file pilihan `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "tidak dapat menset path exec ke %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "PERINGATAN: program mungkin membuat file core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "PERINGATAN: %s menimpa %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "anda hanya dapat membuat signature detached atau clear saat dalam mode --" "pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --" "pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --" "pgpg2\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "algoritma kompresi `%s' adalah hanya-baca dalam rilis ini\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritma kompresi harus di antara %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth harus di antara 1 hingga 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "preferensi baku tidak valid\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "preferensi cipher personal tidak valid\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "preferensi digest personal tidak valid\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "preferensi kompresi personal tidak valid\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s belum dapat dipakai dengan %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public " "key \n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [namafile]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "tidak dapat membuka %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "Ekspor kunci gagal: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "Pencarian keyserver gagal: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh keyserver gagal: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[namafile]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Teruskan dan ketikkan pesan anda ....\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "tidak dapat membuka `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1182,19 +1178,19 @@ msgstr "" "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, " "dan diakhiri dengan sebuah '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" @@ -1321,7 +1317,6 @@ msgstr "Alasan pembatalan:" msgid "revocation comment: " msgstr "Komentar pembatalan:" -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1376,7 +1371,6 @@ msgstr " %d = Saya sangat percaya\n" msgid " %d = I trust ultimately\n" msgstr " %d = Saya sangat percaya sekali\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = beri saya informasi lebih banyak lagi\n" @@ -1691,14 +1685,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1783,7 +1769,6 @@ msgstr "nilai yang tidak valid\n" msgid "%s does not expire at all\n" msgstr "%s tidak pernah berakhir\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2103,7 +2088,6 @@ msgstr "kunci %08lX: tidak diproteksi - msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2118,9 +2102,7 @@ msgstr "PERINGATAN: tidak ada yang dieks msgid "too many entries in pk cache - disabled\n" msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User id tidak ditemukan]" @@ -2350,7 +2332,6 @@ msgstr "tidak ada keyring rahasia baku: msgid "key %08lX: secret key imported\n" msgstr "kunci %08lX: kunci rahasia diimpor\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2587,8 +2568,6 @@ msgstr "" "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis " "berlaku? (y/N)" -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2943,7 +2922,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "hapus ID user" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3241,8 +3219,6 @@ msgstr "Kunci ini dapat dibatalkan oleh msgid " (sensitive)" msgstr " (sensitive)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3371,9 +3347,6 @@ msgid "cannot appoint a PGP 2.x style ke msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3470,7 +3443,6 @@ msgstr "Anda tetap ingin membatalkannya? msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Anda telah menandai ID user ini:\n" @@ -3511,10 +3483,6 @@ msgstr "tidak ada kunci rahasia\n" msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3578,7 +3546,6 @@ msgstr " Fingerprint kunci primer =" msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Fingerprint kunci =" @@ -3588,8 +3555,6 @@ msgstr " Fingerprint kunci =" msgid "weird size for an encrypted session key (%d)\n" msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3700,7 +3665,6 @@ msgstr "Kebijakan: " msgid "signature verification suppressed\n" msgstr "verifikasi signature tidak diabaikan\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "tidak dapat menangani banyak signature ini\n" @@ -3710,10 +3674,6 @@ msgstr "tidak dapat menangani banyak sig msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Kunci tersedia di:" @@ -3877,7 +3837,7 @@ msgstr "variabel lingkungan GPG_AGENT_IN msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokol gpg-agent versi %d tidak didukung\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "tidak dapat terkoneksi ke `%s': %s\n" @@ -3886,11 +3846,11 @@ msgstr "tidak dapat terkoneksi ke `%s': msgid "communication problem with gpg-agent\n" msgstr "masalah komunikasi dengan gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "masalah dengan agen - tiadakan penggunaan agen\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID kunci utama %08lX)" @@ -3922,16 +3882,16 @@ msgstr "passphrase terlalu panjang\n" msgid "invalid response from agent\n" msgstr "respon tidak valid dari agen\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3941,20 +3901,20 @@ msgstr "" "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -4020,41 +3980,41 @@ msgstr "CATATAN: kunci pribadi %08lX ber msgid "NOTE: key has been revoked" msgstr "CATATAN: kunci telah dibatalkan" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "tidak dapat memperoleh kunci keyserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "kesalahan mengirim ke `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "success sending to `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "failed sending to `%s': status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "keyserver ini tidak mendukung --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "tidak dapat mencari keyserver: %s\n" @@ -4478,9 +4438,6 @@ msgstr "tidak ditemukan kunci yang benar msgid "public key of ultimately trusted key %08lX not found\n" msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4530,7 +4487,6 @@ msgstr "" "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman " "untuk signature!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4598,7 +4554,7 @@ msgid "cannot avoid weak key for symmetr msgstr "" "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA butuh penggunaan algoritma hash 160 bit\n" @@ -5004,17 +4960,17 @@ msgstr "Tidak tersedia bantuan" msgid "No help available for `%s'" msgstr "Tidak tersedia bantuan untuk `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "kesalahan menulis keyring `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "%s: keyring tercipta\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "gagal membuat kembali cache keyring: %s\n" @@ -5121,7 +5077,6 @@ msgid "this platform requires temp files msgstr "" "platform ini membutuhkan file temp ketika memanggil program eksternal\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5199,7 +5154,6 @@ msgstr "Pemaksaan output mode ASCII.\n" msgid "make_keysig_packet failed: %s\n" msgstr "gagal make_keysig_packet: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Sertifikat pembatalan tercipta.\n" @@ -5231,7 +5185,6 @@ msgstr "algoritma proteksi tidak dikenal msgid "NOTE: This key is not protected!\n" msgstr "CATATAN: Kunci ini tidak diproteksi!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5313,7 +5266,6 @@ msgstr "kesalahan: fingerprint tidak val msgid "error: no ownertrust value\n" msgstr "kesalahan: tidak ada nilai ownertrust\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/insert-header.sin gnupg-1.2.6/po/insert-header.sin --- gnupg-1.2.5/po/insert-header.sin 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/insert-header.sin 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,23 @@ +# Sed script that inserts the file called HEADER before the header entry. +# +# At each occurrence of a line starting with "msgid ", we execute the following +# commands. At the first occurrence, insert the file. At the following +# occurrences, do nothing. The distinction between the first and the following +# occurrences is achieved by looking at the hold space. +/^msgid /{ +x +# Test if the hold space is empty. +s/m/m/ +ta +# Yes it was empty. First occurrence. Read the file. +r HEADER +# Output the file's contents by reading the next line. But don't lose the +# current line while doing this. +g +N +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff -urpP gnupg-1.2.5/po/it.po gnupg-1.2.6/po/it.po --- gnupg-1.2.5/po/it.po 2004-07-26 12:26:41.000000000 +0000 +++ gnupg-1.2.6/po/it.po 2004-08-25 14:59:17.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -30,7 +30,6 @@ msgstr "l'operazione non possibile sen msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "si|s" @@ -39,7 +38,6 @@ msgstr "si|s" msgid "yY" msgstr "sS" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no" @@ -48,7 +46,6 @@ msgstr "no" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit" @@ -254,7 +251,6 @@ msgstr "non cifrato" msgid "not processed" msgstr "non esaminato" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "chiave pubblica inutilizzabile" @@ -739,19 +735,19 @@ msgstr "|N|usa l'algoritmo di compressio msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti cifrati" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Mostra le fotografie" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Non mostra le fotografie" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Imposta la riga di comando per vedere le fotografie" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -759,7 +755,7 @@ msgstr "" "@\n" "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -779,15 +775,15 @@ msgstr "" " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -797,7 +793,7 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -805,377 +801,377 @@ msgstr "" "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "A chiave pubblica: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Cifrari: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compressione: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "uso: gpg [opzioni] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "non stato trovato il segno = nella definizione del gruppo \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s insicuro\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s insicuro\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "elemento della configurazione sconosciuto \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" "NOTA: il vecchio file `%s' con le opzioni predefinite stato ignorato\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "l'estensione crittografica \"%s\" non stata caricata a causa dei\n" "permessi insicuri.\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s non un set di caratteri valido\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossibile impostare exec-path a %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENZIONE: %s ha la precedenza su %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non permesso usare %s con %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nella modalit --pgp2 puoi fare solo firme in chiaro o separate\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "nella modalit --pgp2 non puoi firmare e cifrare contemporaneamente\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 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/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non valido\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non valido\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non valido\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" "in questa versione l'algoritmo di compressione `%s' in sola lettura\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algoritmo di compressione deve essere tra %d e %d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) fortemente scoraggiato\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "preferenze predefinite non valide\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "preferenze personali del cifrario non valide\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "preferenze personali del digest non valide\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "preferenze personali di compressione non valide\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s non funziona ancora con %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "non possibile usare l'algoritmo di cifratura \"%s\" in modalit %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "non possibile usare l'algoritmo di digest \"%s\" in modalit %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" "non possibile usare l'algoritmo di compressione \"%s\" in modalit %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n" "crittografia a chiave pubblica\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nomefile]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "esportazione della chiave fallita: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "ricerca nel keyserver fallita: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aggiornamento del keyserver fallito: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1183,19 +1179,19 @@ msgstr "" "il nome di una nota deve essere formato solo da caratteri stampabili o\n" "spazi e terminare con un '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "l'URL della politica di certificazione indicato non valido\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "l'URL della politica di firma indicato non valido\n" @@ -1322,7 +1318,6 @@ msgstr "ragione della revoca: " msgid "revocation comment: " msgstr "commento alla revoca: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1377,7 +1372,6 @@ msgstr " %d = Mi fido completamente\n" msgid " %d = I trust ultimately\n" msgstr " %d = Mi fido definitivamente\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = mostrami ulteriori informazioni\n" @@ -1693,14 +1687,6 @@ msgstr "la chiave troppo corta; 1024 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "la chiave troppo corta; 768 il minimo valore permesso.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1785,7 +1771,6 @@ msgstr "valore non valido\n" msgid "%s does not expire at all\n" msgstr "%s non ha scadenza\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2114,7 +2099,6 @@ msgstr "chiave %08lX: non protetta - sal msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2128,9 +2112,7 @@ msgstr "ATTENZIONE: non stato esportat msgid "too many entries in pk cache - disabled\n" msgstr "troppe voci nella pk cache - disabilitata\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User ID non trovato]" @@ -2360,7 +2342,6 @@ msgstr "nessun portachiavi segreto prede msgid "key %08lX: secret key imported\n" msgstr "chiave %08lX: chiave segreta importata\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2598,8 +2579,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2954,7 +2933,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "cancella un user ID" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3252,8 +3230,6 @@ msgstr "Questa chiave pu essere revocat msgid " (sensitive)" msgstr " (sensibile)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3386,9 +3362,6 @@ msgid "cannot appoint a PGP 2.x style ke msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3486,7 +3459,6 @@ msgstr "Sei ancora sicuro di volerlo agg msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creare un certificato di revoca per questa firma? (s/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" @@ -3527,10 +3499,6 @@ msgstr "manca la chiave segreta\n" msgid "user ID \"%s\" is already revoked\n" msgstr "l'user ID \"%s\" gi stato revocato\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3596,7 +3564,6 @@ msgstr " Impronta digitale della chiave msgid " Subkey fingerprint:" msgstr " Impronta digitale della subchiave:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Impronta digitale =" @@ -3606,8 +3573,6 @@ msgstr " Impronta digitale =" msgid "weird size for an encrypted session key (%d)\n" msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3718,7 +3683,6 @@ msgstr "Policy: " msgid "signature verification suppressed\n" msgstr "verifica della firma soppressa\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "impossibile gestire queste firme multiple\n" @@ -3728,10 +3692,6 @@ msgstr "impossibile gestire queste firme msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma fatta %.*s usando %s con ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Chiave disponibile presso: " @@ -3895,7 +3855,7 @@ msgstr "variabile di ambiente GPG_AGENT_ msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versione %d del protocollo di gpg-agent non gestita\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossibile connettersi a `%s': %s\n" @@ -3904,11 +3864,11 @@ msgstr "impossibile connettersi a `%s': msgid "communication problem with gpg-agent\n" msgstr "problema di comunicazione con gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema con l'agent - uso dell'agent disattivato\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (key ID principale %08lX)" @@ -3940,16 +3900,16 @@ msgstr "passphrase troppo lunga\n" msgid "invalid response from agent\n" msgstr "risposta non valida dall'agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3959,20 +3919,20 @@ msgstr "" "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -4040,41 +4000,41 @@ msgstr "NOTA: chiave %08lX scaduta il %s msgid "NOTE: key has been revoked" msgstr "NOTA: la chiave stata revocata" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "impossibile scaricare la chiave dal keyserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "errore leggendo `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "inviata con successo a `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "invio a `%s' fallito: status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "questo keyserver non gestisce --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "impossibile cercare sul keyserver: %s\n" @@ -4512,9 +4472,6 @@ msgstr "non stata trovata alcuna chiav msgid "public key of ultimately trusted key %08lX not found\n" msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4564,7 +4521,6 @@ msgstr "" "saltata %s: questa una chiave ElGamal generata da PGP che NON sicura per " "le firme!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4636,7 +4592,7 @@ msgstr "" "Impossibile evitare una chiave debole per il cifrario simmetrico;\n" "ho provato %d volte!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 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" @@ -5047,17 +5003,17 @@ msgstr "Non disponibile un aiuto" msgid "No help available for `%s'" msgstr "Non disponibile un aiuto per `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "errore creando il portachiavi `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "portachiavi `%s' creato\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "rebuild della cache del portachiavi fallito: %s\n" @@ -5166,7 +5122,6 @@ msgstr "" "questa piattaforma richiede file temporanei quando si chiamano programmi " "esterni\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5244,7 +5199,6 @@ msgstr "Forzato l'output con armatura AS msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet fallito: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Certificato di revoca creato.\n" @@ -5276,7 +5230,6 @@ msgstr "algoritmo di protezione sconosci msgid "NOTE: This key is not protected!\n" msgstr "NOTA: Questa chiave non protetta!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5357,7 +5310,6 @@ msgstr "errore: impronta digitale non va msgid "error: no ownertrust value\n" msgstr "errore: non c' il valore della fiducia\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/ja.po gnupg-1.2.6/po/ja.po --- gnupg-1.2.5/po/ja.po 2004-07-26 12:26:42.000000000 +0000 +++ gnupg-1.2.6/po/ja.po 2004-08-25 14:59:17.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-06 00:44+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -33,7 +33,6 @@ msgstr "賡渝祭碧心及兜蟈卅丟乒伉□互卅中 msgid "(you may have used the wrong program for this task)\n" msgstr "(仇及杴讀卞反貲勻凶皿伕弘仿丞毛迕中凶及匹仄斤丹)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "yes" @@ -42,7 +41,6 @@ msgstr "yes" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no" @@ -51,7 +49,6 @@ msgstr "no" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit" @@ -256,7 +253,6 @@ msgstr "剪寞祭今木化中引六氏" msgid "not processed" msgstr "怳質咥" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "銀迕匹五卅中跤釩萼匹允" @@ -776,21 +772,21 @@ msgstr "" "剪寞由弗永玄及萼ID白奴□伙玉\n" "毛霜請" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "白巧玄ID毛刓憎" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "白巧玄ID毛刓憎仄卅中" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" "白巧玄ID毛旌厖允月戊穴件玉墊\n" "毛澀爛" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -799,7 +795,7 @@ msgstr "" "(戊穴件玉午左皿扑亦件蟈朿及域厖反﹜\n" "穴瓦亙失伙’矢□斥毛仍厖仁分今中)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -819,15 +815,15 @@ msgstr "" " --list-keys [抩蟆] 萼毛刓憎\n" " --fingerprint [抩蟆] 隙杸毛刓憎\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "田弘毛葦勾仃凶日 引匹仍扷屢仁分今中﹝\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "銀中杅: gpg [左皿扑亦件] [白央奶伙] (目伙皿反 -h)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -837,7 +833,7 @@ msgstr "" "踢抩﹜腹犖﹜剪寞祭支汊寞\n" "湃爛及が綜反﹜ェ恘犯□正卞匙繡\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -845,389 +841,389 @@ msgstr "" "\n" "扔禾□玄仄化中月失伙打伉朮丞:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "跤釩萼: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "剪寞: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "甩永扑亙: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "做諒: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "銀中杅: gpg [左皿扑亦件] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "覆峏允月戊穴件玉\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "=筏寞互﹜弘伙□皿爛聒＞%s＝ま卞葦勾井曰引六氏\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "煞屢: %s ＞%s＝及兜蟈匹卅中赭肣樊\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "煞屢: %s ＞%s＝及兜蟈匹卅中袱第\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "煞屢: %s ＞%s＝及兜蟈匹卅中曉匏犯奴伊弁玄伉□赭肣樊\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "煞屢: %s ＞%s＝及兜蟈匹卅中曉匏犯奴伊弁玄伉□袱第\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "蕙仄中厭嶽白央奶伙`%s'互匹五引仄凶\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "鏜啦: 檣﹜湃爛分勻凶左皿扑亦件’白央奶伙＞%s＝反﹜拑骰今木引允\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "鏜啦: 湃爛及左皿扑亦件’白央奶伙＞%s＝互丐曰引六氏\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "左皿扑亦件’白央奶伙＞%s＝: %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "＞%s＝井日左皿扑亦件毛づ心慇心引允\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "兜蟈匹卅中袱第及凶戶﹜剪寞傀艦＞%s＝毛伕□玉仄引六氏\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s反﹜肣躲卅妐儂螂寧匹反丐曰引六氏\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "萼扔□田□及URI毛荸橾尕Х\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 拑躲卅づ慇心左皿扑亦件\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "拑躲卅づ慇心左皿扑亦件匹允\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 拑躲卅踏請仄左皿扑亦件\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "拑躲卅踏請仄左皿扑亦件匹允\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path毛%s卞澀爛尕Х\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "煞屢: 皿伕弘仿丞及戊失’白央奶伙互匹五月仇午互丐曰引允!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "煞屢: %s反%s方曰穸燮\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "鏜啦: 忔騷%s反迕中引六氏!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s反%s午午手卞迕中月仇午反匹五引六氏!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s反%s午午手卞迕中化手拑啦怗匹允!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2乒□玉匹反坌峊踢抩井弁伉失踢抩分仃仄井匹五引六氏\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2乒□玉匹反踢抩午剪寞毛き凜卞匹五引六氏\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2毛隙爛仄凶日﹜(由奶皿匹卅仁) 白央奶伙毛隙爛六友壬卅曰引六氏﹝\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2乒□玉及丟永本□斥剪寞祭匹反﹜IDEA剪寞互优邰匹允 \n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "薊鎗今木凶剪寞失伙打伉朮丞反拑躲匹允\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "薊鎗今木凶邰沶失伙打伉朮丞反﹜拑躲匹允\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "薊鎗今木凶據抸踏邰沶失伙打伉朮丞反﹜拑躲匹允\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "做諒失伙打伉朮丞＞%s＝反﹜仇及リ壑づ請仄分仃匹允\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "做諒失伙打伉朮丞反%d..%d及炾洃リ吨惜鴗苳吨磥牏誘酀n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed反懇及襖互优邰匹允\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed反1方曰釐五卅襖互优邰匹允\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth反1井日255及炾洃リ吨惜鴗苳吨磥牏誘酀n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "拑躲卅default-check-level﹝0井1井2井3匹卅仃木壬卅曰引六氏\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "拑躲卅default-check-level﹝0井1井2井3匹卅仃木壬卅曰引六氏\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "鏜啦: 簽賬卅S2K乒□玉(0)及銀迕卞反雄仁螞苳楔牏鈾n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "拑躲卅S2K乒□玉﹝0井1井3匹卅仃木壬卅曰引六氏\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "拑躲卅湃爛及薊馴\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "拑躲卅蜊諦迕剪寞及薊馴\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "拑躲卅蜊諦迕邰沶及薊馴\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "拑躲卅蜊諦迕做諒及薊馴\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s反%s匹窗Х仄引六氏\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "剪寞失伙打伉朮丞＞%s＝毛%s乒□玉匹迕中月仇午反匹五引六氏\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "邰沶失伙打伉朮丞＞%s＝毛%s乒□玉匹迕中月仇午反匹五引六氏\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "做諒失伙打伉朮丞＞%s＝毛%s乒□玉匹迕中月仇午反匹五引六氏\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "耨迕犯□正矛□旦及賡渝祭卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "煞屢: 跤釩萼剪寞毛銀歹內卞﹜熬潸諦 (-r) 毛隙爛仄化中引允\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [白央奶伙抩]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [白央奶伙抩]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [白央奶伙抩]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [白央奶伙抩]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [白央奶伙抩]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [白央奶伙抩]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [白央奶伙抩]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [白央奶伙抩]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key 交□扒□id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key 交□扒□id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key 交□扒□id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key 交□扒□id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key 交□扒□id [戊穴件玉]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "%s互釩仃引六氏: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [交□扒□id] [萼挎]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "萼扔□田□尺及霜耨卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "萼扔□田□井日及熬耨卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "萼及踏請仄卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "萼扔□田□及腹綢卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "萼扔□田□及莢汊卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "抁隸輪蛔卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "抁隸卞撩л仄引仄凶: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "拑躲卅甩永扑亙’失伙打伉朮丞`%s'匹允\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[白央奶伙抩]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "釩銨仄引允﹝丟永本□斥毛正奶皿仄化仁分今中 ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "＞%s＝互釩仃引六氏\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" "鏜澄抩卞反執儂第Х卅妐儂井塢⑩及心毛迕中﹜'='匹蔽歹日卅仃木壬卅曰引六氏\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "交□扒□鏜澄抩反﹜'@'妐儂毛殖引卅仃木壬卅曰引六氏\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "鏜澄抩及襖卞孺豢妐儂毛迕中化反中仃引六氏\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "丐凶尹日木凶據抸踏禾伉扑□URL反拑躲匹允\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "丐凶尹日木凶踢抩禾伉扑□URL反拑躲匹允\n" @@ -1354,7 +1350,6 @@ msgstr "撩躲咥苀: " msgid "revocation comment: " msgstr "撩躲及贗邰: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1408,7 +1403,6 @@ msgstr " %d = 敦蟈卞耨迕允月\n" msgid " %d = I trust ultimately\n" msgstr " %d = 濮覆讀卞耨迕允月\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = 方曰擇仄中樹扷毛刓憎允月\n" @@ -1720,14 +1714,6 @@ msgstr "萼贏互凝今允亢引允﹝RSA反瘉凝匹 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "萼贏互凝今允亢引允﹝瘉凝匹手768匹允﹝\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1812,7 +1798,6 @@ msgstr "拑躲卅襖\n" msgid "%s does not expire at all\n" msgstr "%s反拑渝蜃匹允\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2126,7 +2111,6 @@ msgstr "萼 %08lX: 忡賃今木化中引六氏 - msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "萼 %08lX: PGP 2.x溥摯及萼匹允 - 旦平永皿\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2140,9 +2124,7 @@ msgstr "煞屢: 窒手踏五請仄化中引六氏\n" msgid "too many entries in pk cache - disabled\n" msgstr "pk平乓永扑亙及巨件玄伉□互聶允亢引允 - 銀迕嗟鞅\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[交□扒□id互葦勾井曰引六氏]" @@ -2370,7 +2352,6 @@ msgstr "湃爛及輲弩匿堣洶═磥牏誘: %s\n msgid "key %08lX: secret key imported\n" msgstr "萼%08lX: 輲弩陘藫氻葙心引仄凶\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2601,8 +2582,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "渝蜃濠木踢抩毛蕙仄中踢抩午跟晶仄凶中匹允井? (y/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2953,7 +2932,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "交□扒□ID及綽輪" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3251,8 +3229,6 @@ msgstr "仇及萼反﹜%s萼卞方勻化撩躲今木凶 msgid " (sensitive)" msgstr " (犯伉弗□玄)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3378,9 +3354,6 @@ msgstr "隙抩撩躲樊及交□扒□ID毛ェ恘仄化 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x溥摯及萼反﹜隙抩撩躲樊卞リ抰匹五引六氏\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "隙抩撩躲樊卞反﹜公及萼憤蟲毛リ抰匹五引六氏\n" @@ -3472,7 +3445,6 @@ msgstr "公木匹手呿癲卞撩躲仄凶中匹允井? msgid "Create a revocation certificate for this signature? (y/N) " msgstr "仇及踢抩卞凶中允月撩躲據抸踏毛綜曰引允井? (y/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "仇木日及交□扒□ID卞踢抩仄引仄凶:\n" @@ -3513,10 +3485,6 @@ msgstr "輲弩陘洶═磥牏誘酀n" msgid "user ID \"%s\" is already revoked\n" msgstr "交□扒□ID＞%s＝反﹜手丹撩躲今木化中引允\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3580,7 +3548,6 @@ msgstr " 潛萼及隙杸:" msgid " Subkey fingerprint:" msgstr " 汏萼及隙杸:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " 隙杸 =" @@ -3590,8 +3557,6 @@ msgstr " 隙杸 =" msgid "weird size for an encrypted session key (%d)\n" msgstr "庍卅贏今及剪寞祭碧心本永扑亦件萼 (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3702,7 +3667,6 @@ msgstr "禾伉扑□: " msgid "signature verification suppressed\n" msgstr "踢抩及腹據毛彊峎\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "仇及聶褐踢抩反潸曰健尹引六氏\n" @@ -3712,10 +3676,6 @@ msgstr "仇及聶褐踢抩反潸曰健尹引六氏\n" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "%.*s 及%s萼ID %08lX卞方月踢抩\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "動票卞萼互丐曰引允: " @@ -3877,7 +3837,7 @@ msgstr "GPG_AGENT_INFO棕雁庍醒及踏摯互懇 msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent皿伕玄戊伙’田□斥亦件%d反扔禾□玄仄化中引六氏\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "`%s'尺濤糧匹五引六氏: %s\n" @@ -3886,11 +3846,11 @@ msgstr "`%s'尺濤糧匹五引六氏: %s\n" msgid "communication problem with gpg-agent\n" msgstr "gpg-agent午及騷耨整陴\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "巨□斥尼件玄卞整陴: 巨□斥尼件玄厙迕嗟鞅\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (潛萼ID %08lX)" @@ -3922,16 +3882,16 @@ msgstr "由旦白伊□朮互贏聊亢引允\n" msgid "invalid response from agent\n" msgstr "巨□斥尼件玄井日及拑躲卅殺蠶\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "交□扒□卞方月潸壅仄\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "巨□斥尼件玄卞整陴: 巨□斥尼件玄互0x%lx毛忒萃\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3941,20 +3901,20 @@ msgstr "" "慼及交□扒□及輲弩陘峊磳疇砟繰羷允月卞反\n" "由旦白伊□朮互中曰引允: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u申永玄%s萼, ID %08lX綜嶽ゥ尥反%s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "田永民乒□玉匹反由旦伐□玉及杽寧六互匹五引六氏\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "由旦白伊□朮毛ェ恘: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "由旦白伊□朮毛瘋ェ恘: " @@ -4022,41 +3982,41 @@ msgstr "鏜啦: 輲弩%08lX反%s匹渝蜃濠木 msgid "NOTE: key has been revoked" msgstr "鏜啦: 萼反撩躲碧心匹允" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "萼%08lX毛%s卞邰菲\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "萼扔□田□井日萼毛づ心慇戶引六氏: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "`%s'尺及霜耨巨仿□: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "`%s'尺及霜耨卞嶽跦 (橇謫=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "`%s'尺及霜耨卞撩л仄引仄凶: 橇謫=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "仇及萼扔□田□反﹜--search-keys毛扔禾□玄仄引六氏\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "＞%s＝毛HKP扔□田□%s井日腹綢\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "萼扔□田□毛腹綢匹五引六氏: %s\n" @@ -4463,9 +4423,6 @@ msgstr "濮覆讀卞耨迕允月萼互葦勾井曰引六 msgid "public key of ultimately trusted key %08lX not found\n" msgstr "濮覆讀卞耨迕允月萼%08lX及跤釩萼互葦勾井曰引六氏\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4515,7 +4472,6 @@ msgstr "" "＞%s＝毛旦平永皿: 仇木反PGP及戲嶽仄凶ElGamal萼匹允﹝\n" "踢抩卞迕中月卞反﹜兜蟈匹反丐曰引六氏!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4581,7 +4537,7 @@ msgstr "澆中萼互匹五引仄凶 - 瘋撢墊\n" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "覆憊剪寞芊及澆中萼毛莢礞馱諵酗互匹五引六氏﹝%d莢魂心引仄凶!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA匹反160申永玄及甩永扑亙’失伙打伉朮丞及銀迕互优邰匹允\n" @@ -4970,17 +4926,17 @@ msgstr "目伙皿反丐曰引六氏" msgid "No help available for `%s'" msgstr "＞%s＝及目伙皿反丐曰引六氏" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "萼挎＞%s＝及綜嶽巨仿□: %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "萼挎＞%s＝互匹五引仄凶\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "萼挎平乓永扑亙及瘋厭蹲卞撩л仄引仄凶: %s\n" @@ -5085,7 +5041,6 @@ msgid "this platform requires temp files msgstr "" "仇及皿仿永玄石□丞分午﹜陸朿皿伕弘仿丞及裟請仄卞反﹜域凜白央奶伙互优邰匹允\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5163,7 +5118,6 @@ msgstr "ASCII抁隸請恘毛雄孺仄引允﹝\n" msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 卞撩л仄引仄凶: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "撩躲據抸踏毛綜嶽﹝\n" @@ -5195,7 +5149,6 @@ msgstr "怳襞及忡賃失伙打伉朮丞匹允\n" msgid "NOTE: This key is not protected!\n" msgstr "鏜啦: 仇及萼反忡賃今木化中引六氏!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5274,7 +5227,6 @@ msgstr "巨仿□: 拑躲卅隙杸\n" msgid "error: no ownertrust value\n" msgstr "巨仿□: 赭肣樊毛耨迕仄凶襖互丐曰引六氏\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/nl.po gnupg-1.2.6/po/nl.po --- gnupg-1.2.5/po/nl.po 2004-07-26 12:26:42.000000000 +0000 +++ gnupg-1.2.6/po/nl.po 2004-08-25 14:59:18.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-05-10 19:23+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -32,7 +32,6 @@ msgstr "bewerking is niet mogelijk zonde msgid "(you may have used the wrong program for this task)\n" msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ja" @@ -41,7 +40,6 @@ msgstr "ja" msgid "yY" msgstr "jJ" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nee" @@ -50,7 +48,6 @@ msgstr "nee" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "afsluiten" @@ -255,7 +252,6 @@ msgstr "niet gecodeerd" msgid "not processed" msgstr "niet verwerkt" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "onbruikbare openbare sleutel" @@ -737,19 +733,19 @@ msgstr "|N|inpakalgoritme N gebruiken" msgid "throw keyid field of encrypted packets" msgstr "keyid-veld uit gecodeerde pakketten gooien" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Foto's weergeven" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Niet foto's weergeven" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Opdrachtregel instellen voor weergeven van foto's" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -758,7 +754,7 @@ msgstr "" "(Zie de man-handleiding voor een volledige lijst met alle opdrachten en " "opties)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -778,17 +774,17 @@ msgstr "" " --list-keys [namen] sleutels weergeven\n" " --fingerprint [namen] vingerafdrukken weergeven\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Rapporteer softwarefouten alstublieft aan .\n" "Rapporteer fouten in de vertaling alstublieft aan .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -798,7 +794,7 @@ msgstr "" "ondertekenen, controleren, coderen of decoderen\n" "standaardbewerking hangt af van invoergegevens\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -806,374 +802,374 @@ msgstr "" "\n" "Ondersteunde algoritmes:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Openbare sleutel: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Codering: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compressie: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "gebruik: gpg [opties] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "conflicterende opdrachten\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "geen =-teken gevonden in groepdefinitie \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "nieuw configuratiebestand `%s' aangemaakt\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "LET OP: oude bestand voor standaard opties `%s' genegeerd\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "LET OP: geen bestand voor standaard opties `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "optiebestand `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "bezig met lezen opties uit `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "coderingsuitbreiding \"%s\" niet geladen vanwege onveilige toegangsrechten\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s is geen geldige tekenset\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "kon sleutelserver URI niet inlezen\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ongeldige invoeropties\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "ongeldige invoeropties\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ongeldige uitvoeropties\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "ongeldige uitvoeropties\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kan exec-path niet instellen op %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "WAARSCHUWING: programma maakt mogelijk een core-bestand aan!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WAARSCHUWING: %s gaat boven %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "LET OP: %s is niet voor normaal gebruik!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s niet toegestaan met %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s slaat nergens op met %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "u kunt alleen losse of ongecodeerde ondertekeningen maken in --pgp2 modus\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "u kunt niet tegelijkertijd ondertekenen en coderen in --pgp2 modus\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "u dient bestanden te gebruiken (en niet een pijp) in --pgp2 modus.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "het coderen van een bericht in --pgp2 modus vereist de IDEA-codering\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "het gekozen coderingsalgoritme is ongeldig\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "het gekozen digest-algoritme is ongeldig\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "het gekozen certificaat-digest-algoritme is ongeldig\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, fuzzy, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "digest-algoritme `%s' is alleen-lezen in deze uitgave\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "inpakalgoritme moet binnen bereik %d..%d liggen\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed moet groter zijn dan 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed moet groter zijn dan 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth moet binnen het bereik 1 tot 255 vallen\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "LET OP: eenvoudige S2K-modus (0) wordt sterk ontraden\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "ongeldige standaardvoorkeuren\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "ongeldige persoonlijke coderingsvoorkeuren\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "ongeldige persoonlijke digestvoorkeuren\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "ongeldige persoonlijke inpakvoorkeuren\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s slaat nergens op met %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "u kunt %s niet gebruiken in %s modus\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, fuzzy, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "u kunt %s niet gebruiken in %s modus\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "u kunt %s niet gebruiken in %s modus\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "WAARSCHUWING: ontvangers (-r) gegeven zonder gebruik te maken van openbare " "sleutel codering\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [bestandsnaam]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [bestandsnaam]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [bestandsnaam]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [bestandsnaam]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [bestandsnaam]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [bestandsnaam]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [bestandsnaam]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [bestandsnaam]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key gebruikerscode" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key gebruikerscode" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key gebruikerscode" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key gebruikerscode" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key gebruikerscode [opdrachten]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "kan %s niet openen: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [gebruikerscode] [sleutelbos]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Sleutelaanmaak mislukt: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "Sleutelaanmaak mislukt: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Sleutelaanmaak mislukt: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "Sleutelaanmaak mislukt: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "bijwerken geheim mislukt: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "ontpantseren mislukt: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "bepantseren mislukt: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ongeldig hash-algoritme `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[bestandsnaam]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Ga uw gang en typ uw bericht...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan `%s' niet openen\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1181,19 +1177,19 @@ msgstr "" "een notatienaam mag slechts afdrukbare tekens of spaties bevatten, en moet " "eindigen met een '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "een gebruikersnotatienaam moet het '@'-teken bevatten\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "een notatiewaarde mag geen stuurtekens bevatten\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "de gegeven certificatiebeleid URL is ongeldig\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n" @@ -1318,7 +1314,6 @@ msgstr "reden voor herroeping: " msgid "revocation comment: " msgstr "herroepingsopmerking: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1374,7 +1369,6 @@ msgstr " %d = Ik vertrouw volledig\n" msgid " %d = I trust ultimately\n" msgstr " %d = Ik vertrouw maximaal\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = meer informatie weergeven\n" @@ -1696,14 +1690,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "sleutelgrootte te klein; 768 is de kleinste toegestane waarde.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1788,7 +1774,6 @@ msgstr "ongeldige waarde\n" msgid "%s does not expire at all\n" msgstr "%s verloopt nooit\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2119,7 +2104,6 @@ msgstr "sleutel %08lX: niet beschermd - msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "sleutel %08lX: PGP 2.x stijl sleutel - overgeslagen\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2134,9 +2118,7 @@ msgstr "WAARSCHUWING: niets uitgevoerd\n msgid "too many entries in pk cache - disabled\n" msgstr "teveel ingangen in pk buffer - uit gezet\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Gebruikerscode niet gevonden]" @@ -2371,7 +2353,6 @@ msgstr "geen standaard geheime sleutelbo msgid "key %08lX: secret key imported\n" msgstr "sleutel %08lX: geheime sleutel ge簿mporteerd\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2615,8 +2596,6 @@ msgid "Do you want to issue a new signat msgstr "" "Wilt u een nieuwe ondertekening plaatsen om de oude te vervangen? (j/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2974,7 +2953,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "gebruikerscode verwijderen" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3272,8 +3250,6 @@ msgstr "Deze sleutel is mogelijk herroep msgid " (sensitive)" msgstr " (gevoelig)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3402,9 +3378,6 @@ msgid "cannot appoint a PGP 2.x style ke msgstr "" "kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n" @@ -3499,7 +3472,6 @@ msgstr "Weet u zeker dat u deze nog stee msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "U heeft deze gebruikerscodes ondertekend:\n" @@ -3540,10 +3512,6 @@ msgstr "geen geheime sleutel\n" msgid "user ID \"%s\" is already revoked\n" msgstr "gebruikerscode \"%s\" is al herroepen\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3611,7 +3579,6 @@ msgstr " Vingerafdruk primaire sleutel:" msgid " Subkey fingerprint:" msgstr " Vingerafdruk deelsleutel:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Vingerafdruk sleutel =" @@ -3621,8 +3588,6 @@ msgstr " Vingerafdruk sleutel =" msgid "weird size for an encrypted session key (%d)\n" msgstr "vreemde grootte voor een gecodeerde sessiesleutel (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3736,7 +3701,6 @@ msgstr "Beleid: " msgid "signature verification suppressed\n" msgstr "verificatie van ondertekening onderdrukt\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "kan deze meervoudige ondertekeningen niet verwerken\n" @@ -3746,10 +3710,6 @@ msgstr "kan deze meervoudige ondertekeni msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Ondertekening gemaakt op %.*s met %s sleutel ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3916,7 +3876,7 @@ msgstr "misvormde GPG_AGENT_INFO omgevin msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protocol versie %d wordt niet ondersteund\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan niet verbinden met `%s': %s\n" @@ -3925,11 +3885,11 @@ msgstr "kan niet verbinden met `%s': %s\ msgid "communication problem with gpg-agent\n" msgstr "communicatieprobleem met gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probleem met de agent - gebruik van agent uit gezet\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hoofdsleutel ID %08lX)" @@ -3962,16 +3922,16 @@ msgstr "wachtwoord te lang\n" msgid "invalid response from agent\n" msgstr "ongeldig antwoord van agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "geannuleerd door gebruiker\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem met agent: agent geeft 0x%lx terug\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3981,20 +3941,20 @@ msgstr "" "U heeft een wachtwoord nodig om de geheime sleutel\n" "voor de gebruiker te ontgrendelen: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "kan niet vragen om wachtwoord in batch-modus\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Geef wachtwoord: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Herhaal wachtwoord: " @@ -4062,41 +4022,41 @@ msgstr "LET OP: geheime sleutel %08lX ve msgid "NOTE: key has been revoked" msgstr "LET OP: sleutel is herroepen" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "bezig met opvragen sleutel %08lX van %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "kan sleutel niet ontvangen van sleutelserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "fout bij verzenden aan `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "succes bij zenden aan `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "verzenden aan `%s' mislukt: status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "kan niet zoeken op sleutelserver: %s\n" @@ -4526,9 +4486,6 @@ msgstr "geen maximaal vertrouwde sleutel msgid "public key of ultimately trusted key %08lX not found\n" msgstr "openbare sleutel van maximaal vertrouwde sleutel %08lX niet gevonden\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4580,7 +4537,6 @@ msgstr "" "`%s' overgeslagen: dit is een met PGP aangemaakte ElGamal-sleutel die niet " "veilig is voor ondertekeningen!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4651,7 +4607,7 @@ msgstr "" "kan zwakke sleutel voor symmetrische codering niet vermijden; %d keer " "geprobeerd!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA vereist het gebruik van een 160-bits hash-algoritme\n" @@ -5070,17 +5026,17 @@ msgstr "Geen hulp beschikbaar" msgid "No help available for `%s'" msgstr "Geen hulp beschikbaar voor `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "fout bij aanmaken sleutelbos `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "sleutelbos `%s' aangemaakt\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n" @@ -5187,7 +5143,6 @@ msgstr "" "dit platform vereist het maken van tijdelijke bestanden bij het aanroepen " "van externe programma's\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5265,7 +5220,6 @@ msgstr "ASCII-bepantserde uitvoer afgedw msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet mislukt: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Herroepingscertificaat aangemaakt.\n" @@ -5297,7 +5251,6 @@ msgstr "onbekend beschermingsalgoritme\n msgid "NOTE: This key is not protected!\n" msgstr "LET OP: deze sleutel wordt niet beschermd!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5377,7 +5330,6 @@ msgstr "fout: ongeldige vingerafdruk\n" msgid "error: no ownertrust value\n" msgstr "fout: geen eigenaarsvertrouwen waarde\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/pl.po gnupg-1.2.6/po/pl.po --- gnupg-1.2.5/po/pl.po 2004-07-26 12:26:43.000000000 +0000 +++ gnupg-1.2.6/po/pl.po 2004-08-25 14:59:18.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -40,7 +40,6 @@ msgstr "bez zabezpieczenia pami璚i nie m msgid "(you may have used the wrong program for this task)\n" msgstr "(prawdopodobnie u篡wany program jest niew豉軼iwy dlatego zadania)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "tak" @@ -49,7 +48,6 @@ msgstr "tak" msgid "yY" msgstr "tT" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nie" @@ -58,7 +56,6 @@ msgstr "nie" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "wyj軼ie" @@ -263,7 +260,6 @@ msgstr "nie zaszyfrowany" msgid "not processed" msgstr "nie zosta przetworzony" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "bezu篡teczny klucz publiczny" @@ -754,19 +750,19 @@ msgstr "|N|wymuszenie algorytmu kompresj msgid "throw keyid field of encrypted packets" msgstr "usuni璚ie numer闚 kluczy adresat闚 z szyfrogram闚" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "okazywanie zdj璚ia - identyfikatora u篡tkownika" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "bez pokazywania zdj耩" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "polecenie wywo逝j帷e przegl康ark do zdj耩" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -774,7 +770,7 @@ msgstr "" "@\n" "(Pe軟 list polece i opcji mo積a znale潭 w podr璚zniku systemowym.)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -795,15 +791,15 @@ msgstr "" " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "B喚dy prosimy zg豉sza na adres .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Wywo豉nie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -813,7 +809,7 @@ msgstr "" "podpisywanie, sprawdzanie podpis闚, szyfrowanie, deszyfrowanie\n" "domy郵nie wykonywana operacja zale篡 od danych wej軼iowych\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -821,378 +817,378 @@ msgstr "" "\n" "Obs逝giwane algorytmy:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Asymetryczne: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Symetryczne: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Skr鏒闚: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Kompresji: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "wywo豉nie: gpg [opcje]" -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "OSTRZE浩NIE: niebezpieczne prawa w豉sno軼i do %s ,,%s''.\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "OSTRZE浩NIE: niebezpieczne prawa dost瘼u do %s ,,%s''.\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "OSTRZE浩NIE: niebezpieczne prawa w豉sno軼i do katalogu\n" " zawieraj帷ego %s ,,%s''\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "OSTRZE浩NIE: niebezpieczne prawa dost瘼u do katalogu \n" " zawieraj帷ego %s ,,%s''\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "nieznana opcja ,,%s''\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "UWAGA: stary domy郵ny plik opcji ,,%s'' zosta zignorowany\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy郵nego pliku opcji ,,%s''\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji ,,%s'': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z ,,%s''\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "modu szyfru ,,%s'' nie zosta za豉dowany z powodu niebezpiecznych praw " "dost瘼u\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie jest poprawn nazw zestawu znak闚\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "niezrozuma造 URI serwera kluczy\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nie mo積a ustawi 軼ie磬i program闚 wykonywalnych na %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "OSTRZE浩NIE: program mo瞠 stworzy plik zrzutu pami璚i!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "OSTRZE浩NIE: %s powoduje obej軼ie %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u篡tku!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie wolno u篡wa %s z %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu w po陰czeniu z %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "w trybie --pgp2 mo積a sk豉da tylko podpisy oddzielne lub do陰czone do " "tekstu\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "w trybie --pgp2 nie mo積a jednocze郾ie szyfrowa i podpisywa潿n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "w trybie --pgp2 trzeba u篡wa plik闚 a nie potok闚.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "szyfrowanie wiadomo軼i w trybie --pgp2 wymaga modu逝 szyfru IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj帷y jest niepoprawny\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm skr鏒闚 wiadomo軼i jest niepoprawny\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "wybrany algorytm skr鏒闚 po鈍iadcze jest niepoprawny\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "w tej wersji kompresja ,,%s'' jest tylko do odczytu\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ustawienie kompresji musi pochodzi z zakresu %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "warto嗆 completes-needed musi by wi瘯sza od 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "warto嗆 marginals-needed musi by wi瘯sza od 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "warto嗆 max-cert-depth musi mie軼i si w zakresie od 1 do 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "niew豉軼iwy domy郵ny poziom sprawdzania; musi mie warto嗆 0, 1, 2 lub 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "niew豉軼iwy minimalny poziom sprawdzania; musi mie warto嗆 0, 1, 2 lub 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mie warto嗆 0, 1 lub 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "niew豉軼iwe domy郵ne ustawienia\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "niew豉軼iwe ustawienia szyfr闚\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "niew豉軼iwe ustawienia skr鏒闚\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "niew豉軼iwe ustawienia algorytm闚 kompresji\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s jeszcze nie dzia豉 z %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "szyfr ,,%s'' nie jest dost瘼ny w trybie %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "skr鏒 ,,%s'' nie jest dost瘼ny w trybie %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "kompresja ,,%s'' nie jest dost瘼na w trybie %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod這 si: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "OSTRZE浩NIE: podano adresat闚 (-r) w dzia豉niu kt鏎e ich nie dotyczy\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [plik]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key nazwa u篡tkownika" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u篡tkownika" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key nazwa u篡tkownika" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrsign-key nazwa u篡tkownika" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u篡tkownika [polecenia]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "nie mo積a otworzy %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbi鏎 kluczy]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "wysy趾a do serwera kluczy nie powiod豉 si: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "odbi鏎 z serwera kluczy nie powi鏚 si: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "eksport kluczy nie powi鏚 si: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "szukanie w serwerze kluczy nie powiod這 si: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "od鈍ie瞠nie kluczy z serwera nie powiod這 si: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "zdj璚ie opakowania ASCII nie powiod這 si: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod這 si: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew豉軼iwy algorytm skr鏒u ,%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj wiadomo嗆 ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "nie mo積a otworzy ,,%s''\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1200,19 +1196,19 @@ msgstr "" "nazwa adnotacji mo瞠 zawiera tylko litery, cyfry, kropki i podkre郵enia, \n" "i musi ko鎍zy si ,,=''\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "adnotacja u篡tkownika musi zawiera znak '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "tre嗆 adnotacji nie mo瞠 zawiera znak闚 steruj帷ych\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "podany URL regulaminu po鈍iadczania jest niepoprawny\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "podany URL regulaminu podpis闚 jest niepoprawny\n" @@ -1339,7 +1335,6 @@ msgstr "pow鏚 uniewa積ienia: " msgid "revocation comment: " msgstr "komentarz do uniewa積ienia: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMwWpP" @@ -1394,7 +1389,6 @@ msgstr " %d = mam pe軟e zaufanie\n" msgid " %d = I trust ultimately\n" msgstr " %d = ufam absolutnie\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = potrzebuj wi璚ej informacji\n" @@ -1710,14 +1704,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "D逝go嗆 klucza zbyt ma豉; minimalna dopuszczona wynosi 768 bit闚.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1802,7 +1788,6 @@ msgstr "niepoprawna warto嗆\n" msgid "%s does not expire at all\n" msgstr "%s nie ma daty wa積o軼i\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2132,7 +2117,6 @@ msgstr "klucz %08lX: nie jest chroniony msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "klucz %08lX: klucz PGP 2.x - pomini皻y\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2146,9 +2130,7 @@ msgstr "OSTRZE浩NIE: nic nie zosta這 wye msgid "too many entries in pk cache - disabled\n" msgstr "zbyt wiele wpis闚 w buforze kluczy publicznych - wy陰czony\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[brak identyfikatora u篡tkownika]" @@ -2379,7 +2361,6 @@ msgstr "brak domy郵ego zbioru kluczy taj msgid "key %08lX: secret key imported\n" msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2619,8 +2600,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Czy chcesz zast徙i przeterminowany podpis nowym? (t/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2975,7 +2954,6 @@ msgstr "usid" msgid "delete user ID" msgstr "usuni璚ie identyfikatora u篡tkownika z klucza" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "usfoto" @@ -3274,8 +3252,6 @@ msgstr "Klucz mo瞠 zosta uniewa積iony p msgid " (sensitive)" msgstr " (poufne)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3403,9 +3379,6 @@ msgstr "Podaj identyfikator klucza uniew msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klucza PGP 2.x nie mo積a wyznaczy jako uniewa積iaj帷ego\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nie mo積a wyznaczu klucza do uniewa積iania jego samego\n" @@ -3498,7 +3471,6 @@ msgstr "Czy dalej chcesz go uniewa積i? msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Stworzy certyfikat uniewa積ienia tego podpisu? (t/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Te identyfikatory s podpisane przez Ciebie:\n" @@ -3539,10 +3511,6 @@ msgstr "brak klucza tajnego\n" msgid "user ID \"%s\" is already revoked\n" msgstr "identyfikator u篡tkownika ,,%s'' zosta ju uniewa積iony\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3608,7 +3576,6 @@ msgstr " Odcisk klucza g堯wnego:" msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Odcisk klucza =" @@ -3618,8 +3585,6 @@ msgstr " Odcisk klucza =" msgid "weird size for an encrypted session key (%d)\n" msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3731,7 +3696,6 @@ msgstr "Regulamin: " msgid "signature verification suppressed\n" msgstr "wymuszono pomini璚ie sprawdzenia podpisu\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "nie mo積a obs逝zy tych wielokrotnych podpis闚\n" @@ -3741,10 +3705,6 @@ msgstr "nie mo積a obs逝zy tych wielokro msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Klucz dost瘼ny w: " @@ -3908,7 +3868,7 @@ msgstr "z造 format zmiennej 鈔odowiskowe msgid "gpg-agent protocol version %d is not supported\n" msgstr "wersja %d protoko逝 agenta nie jest obs逝giwana\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nie mo積a si po陰czy z ,,%s'': %s\n" @@ -3917,11 +3877,11 @@ msgstr "nie mo積a si po陰czy z ,,%s'': msgid "communication problem with gpg-agent\n" msgstr "problem z porozumiewaniem si z agentem\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problem z agentem - zostaje wy陰czony\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (podklucz %08lX)" @@ -3953,16 +3913,16 @@ msgstr "has這 zbyt d逝gie\n" msgid "invalid response from agent\n" msgstr "b喚dna odpowied agenta\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "anulowano przez u篡tkownika\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwr鏂i 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3972,20 +3932,20 @@ msgstr "" "Musisz poda has這 aby odbezpieczy klucz prywatny u篡tkownika:\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "d逝go嗆 %u bit闚, typ %s, numer %08lX, stworzony %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "pytanie o has這 nie dzia豉 w trybie wsadowym\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Podaj has這: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Powt鏎z has這: " @@ -4052,41 +4012,41 @@ msgstr "UWAGA: wa積o嗆 klucza tajnego %0 msgid "NOTE: key has been revoked" msgstr "UWAGA: klucz zosta uniewa積iony" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "zapytanie o klucz %08lX w %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nie mo積a pobra klucza z serwera: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "b陰d przy wysy豉niu do ,,%s'': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "wysy豉nie do ,,%s'' powiod這 si (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "wysy豉nie do ,,%s'' nie powiod這 si (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "ten serwer kluczy nie umo磧iwia przeszukiwania\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nie mo積a przeszuka serwera: %s\n" @@ -4514,9 +4474,6 @@ msgstr "brak absolutnie zaufanych kluczy msgid "public key of ultimately trusted key %08lX not found\n" msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4568,7 +4525,6 @@ msgstr "" "pomini皻y ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n" "podpisy sk豉dane tym kluczem nie zapewniaj bezpiecze雟twa!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4637,7 +4593,7 @@ msgstr "" "brak mo磧iwo軼i generacji dobrego klucza dla szyfru symetrycznego;\n" "operacja by豉 powtarzana %d razy!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" "Algorytm DSA wymaga u篡cia algorytmu skr鏒u daj帷ego 160-bitowy wynik.\n" @@ -5039,17 +4995,17 @@ msgstr "Pomoc niedost瘼na" msgid "No help available for `%s'" msgstr "Brak pomocy o ,,%s''" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "b陰d tworzenia zbioru kluczy `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "zbi鏎 kluczy ,,%s'' zosta utworzony\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "nie powiod豉 si odbudowa bufora bazy: %s\n" @@ -5154,7 +5110,6 @@ msgstr "" "platforma wymaga u篡cia plik闚 tymczasowych do wo豉nia zewn皻rznych " "program闚\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5232,7 +5187,6 @@ msgstr "wymuszono opakowanie ASCII wynik msgid "make_keysig_packet failed: %s\n" msgstr "wywo豉nie funkcji make_keysig_packet nie powiod這 si: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Certyfikat uniewa積ienia zosta utworzony.\n" @@ -5264,7 +5218,6 @@ msgstr "nieznany algorytm ochrony\n" msgid "NOTE: This key is not protected!\n" msgstr "UWAGA: Ten klucz nie jest chroniony!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5349,7 +5302,6 @@ msgstr "b陰d: niew豉軼iwy odcisk klucza\ msgid "error: no ownertrust value\n" msgstr "b陰d: brak warto嗆i zaufania w豉軼iciela\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/pt.po gnupg-1.2.6/po/pt.po --- gnupg-1.2.5/po/pt.po 2004-07-26 12:26:43.000000000 +0000 +++ gnupg-1.2.6/po/pt.po 2004-08-25 14:59:19.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -33,7 +33,6 @@ msgstr "a opera誽o n緌 poss癉el sem me msgid "(you may have used the wrong program for this task)\n" msgstr "(voc pode ter usado o programa errado para esta tarefa)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 #, fuzzy msgid "yes" @@ -43,7 +42,6 @@ msgstr "sim" msgid "yY" msgstr "sS" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "n緌" @@ -52,7 +50,6 @@ msgstr "n緌" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "sair" @@ -257,7 +254,6 @@ msgstr "n緌 cifrado" msgid "not processed" msgstr "n緌 processado" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "chave pblica n緌 utiliz嫛el" @@ -751,19 +747,19 @@ msgstr "|N|usar algoritmo de compress緌 msgid "throw keyid field of encrypted packets" msgstr "eliminar campo keyid dos pacotes cifrados" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Mostrar IDs Fotogr塻icos" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "N緌 mostrar IDs Fotogr塻icos" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Configurar linha de comandos para ver fotografias" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -771,7 +767,7 @@ msgstr "" "@\n" "(Veja a p墔ina man para uma lista completa de comandos e op踥es)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -791,15 +787,15 @@ msgstr "" " --list-keys [nomes] mostrar chaves\n" " --fingerprint [nomes] mostrar impress髊s digitais\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [op踥es] [ficheiros] (-h para ajuda)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -809,7 +805,7 @@ msgstr "" "assina, verifica, cifra ou decifra\n" "a opera誽o por omiss緌 depende dos dados de entrada\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -817,374 +813,374 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Chave pblica: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Cifra: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Dispers緌: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compress緌: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "uso: gpg [op踥es] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "comandos em conflito\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "nenhum sinal = encontrada na defini誽o de grupo \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVISO: permiss髊s pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "AVISO: permiss髊s pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "criado um novo ficheiro de configura誽o `%s'\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: o ficheiro antigo de op踥es por omiss緌 `%s' foi ignorado\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: ficheiro de op踥es por omiss緌 `%s' inexistente\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de op踥es `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "a ler op踥es de `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "a extens緌 de cifra \"%s\" n緌 foi carregada devido 跴 suas permiss髊s " "inseguras\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n緌 um conjunto de caracteres v嫮ido\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "n緌 consegui processar a URI do servidor de chaves\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: op踥es de importa誽o inv嫮idas\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "op踥es de importa誽o inv嫮idas\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: op踥es de exporta誽o inv嫮idas\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "op踥es de exporta誽o inv嫮idas\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "n緌 foi poss癉el alterar o exec-path para %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um ficheiro core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sobrep髊 %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s n緌 para uso normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n緌 permitido com %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n緌 faz sentido com %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "s pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "n緌 pode assinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "deve utilizar ficheiros (e n緌 um 'pipe') quando trabalho no modo --pgp2.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 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/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado inv嫮ido\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado inv嫮ido\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" de certifica誽o selecionado inv嫮ido\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, fuzzy, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "o algoritmo de compress緌 deve estar na faixa %d..%d\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compress緌 deve estar na faixa %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "n癉el de verifica誽o por omiss緌 inv嫮ido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "n癉el de verifica誽o por omiss緌 inv嫮ido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) n緌 recomend嫛el\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inv嫮ido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "prefer瘽cias por omiss緌 inv嫮idas\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "prefer瘽cias pessoais de cifra inv嫮idas\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "prefer瘽cias pessoais de 'digest' inv嫮idas\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "prefer瘽cias pessoais de compress緌 inv嫮idas\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s n緌 faz sentido com %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "n緌 pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, fuzzy, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "n緌 pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "n緌 pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confian蓷: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: destinat嫫ios (-r) dados sem utilizar uma cifra de chave pblica\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nome_do_ficheiro]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizador" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizador" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "imposs癉el abrir %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A gera誽o de chaves falhou: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "A gera誽o de chaves falhou: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A gera誽o de chaves falhou: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "A gera誽o de chaves falhou: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualiza誽o da chave secreta falhou: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "cria誽o de armadura falhou: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de dispers緌 inv嫮ido `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nome_do_ficheiro]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Digite a sua mensagem ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "imposs癉el abrir `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1192,19 +1188,19 @@ msgstr "" "um nome de nota誽o deve ter apenas caracteres imprim癉eis ou espa蔞s, e " "terminar com um '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "um valor de nota誽o de utilizador n緌 deve conter o caracter '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "um valor de nota誽o n緌 deve usar caracteres de controle\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "a URL de pol癃ica de certifica誽o dada inv嫮ida\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "a URL de pol癃ica de assinatura dada inv嫮ida\n" @@ -1332,7 +1328,6 @@ msgstr "motivo da revoca誽o: " msgid "revocation comment: " msgstr "coment嫫io da revoca誽o: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1387,7 +1382,6 @@ msgstr " %d = Confio plenamente\n" msgid " %d = I trust ultimately\n" msgstr " %d = Confio de forma total\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = mostrar mais informa踥es\n" @@ -1704,14 +1698,6 @@ msgstr "tamanho muito pequeno; 1024 o msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamanho muito pequeno; 768 o valor m璯imo permitido.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1796,7 +1782,6 @@ msgstr "valor inv嫮ido\n" msgid "%s does not expire at all\n" msgstr "A %s n緌 expira nunca\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2123,7 +2108,6 @@ msgstr "chave %08lX: n緌 est protegida msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chave %08lX: tipo PGP 2.x - ignorada\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2137,9 +2121,7 @@ msgstr "AVISO: nada exportado\n" msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desactivado\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Utilizador n緌 encontrado]" @@ -2369,7 +2351,6 @@ msgstr "sem porta-chaves pblico por omi msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2608,8 +2589,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2964,7 +2943,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "remove ID de utilizador" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3263,8 +3241,6 @@ msgstr "Esta chave pode ser revogada pel msgid " (sensitive)" msgstr " (sens癉el)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3391,9 +3367,6 @@ msgstr "Insira o ID de utilizador do rev msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "n緌 pode escolher uma chave do tipo PGP 2.x como revogadora\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "n緌 pode escolher uma chave como revogadora de si mesmo\n" @@ -3487,7 +3460,6 @@ msgstr "Tem a certeza de que quer revog msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revoga誽o para esta assinatura? (s/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Assinou estes identificadores de utilizadores:\n" @@ -3528,10 +3500,6 @@ msgstr "nenhuma chave secreta\n" msgid "user ID \"%s\" is already revoked\n" msgstr "o utilizador com o id \"%s\" j est revocado\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3597,7 +3565,6 @@ msgstr "Impress緌 da chave prim嫫ia:" msgid " Subkey fingerprint:" msgstr " Impress緌 da subchave:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Impress緌 da chave =" @@ -3607,8 +3574,6 @@ msgstr " Impress緌 da chave =" msgid "weird size for an encrypted session key (%d)\n" msgstr "tamanho estranho para uma chave de sess緌 cifrada (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3720,7 +3685,6 @@ msgstr "Pol癃ica: " msgid "signature verification suppressed\n" msgstr "verifica誽o de assinatura suprimida\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "n緌 consigo tratar estas assinaturas mltiplas\n" @@ -3730,10 +3694,6 @@ msgstr "n緌 consigo tratar estas assinat msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3900,7 +3860,7 @@ msgstr "vari嫛el de ambiente GPG_AGENT_I msgid "gpg-agent protocol version %d is not supported\n" msgstr "a vers緌 %d do protocolo gpg-agent n緌 suportada\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "imposs癉el ligar a `%s': %s\n" @@ -3909,11 +3869,11 @@ msgstr "imposs癉el ligar a `%s': %s\n" msgid "communication problem with gpg-agent\n" msgstr "problemas na comunica誽o com o gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema com o agente - a desactivar a utiliza誽o deste\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -3947,16 +3907,16 @@ msgstr "frase secreta demasiado longa\n" msgid "invalid response from agent\n" msgstr "resposta do agente inv嫮ida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3966,20 +3926,20 @@ msgstr "" "Voc precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "imposs癉el pedir senha em modo n緌-interactivo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4045,41 +4005,41 @@ msgstr "NOTA: chave secreta %08lX expiro msgid "NOTE: key has been revoked" msgstr "NOTA: a chave foi revogada" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "n緌 consigo obter chave do servidor: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "erro ao enviar para `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "sucesso ao enviar para `%s' (estado=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "erro ao enviar para `%s': estado=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "n緌 consigo procurar no servidor de chaves: %s\n" @@ -4509,9 +4469,6 @@ msgid "public key of ultimately trusted msgstr "" "chave pblica da chave absolutamente de confian蓷 %08lX n緌 encontrada\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4561,7 +4518,6 @@ msgstr "" "ignorado `%s': esta uma chave ElGamal gerada pelo PGP que n緌 segura " "para assinaturas!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4630,7 +4586,7 @@ msgstr "" "imposs癉el evitar chave fraca para criptografia sim彋rica;\n" "tentei %d vezes!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necessita de utiliza誽o de uma algoritmo de dispers緌 de 160 bit\n" @@ -5031,17 +4987,17 @@ msgstr "Nenhuma ajuda dispon癉el" msgid "No help available for `%s'" msgstr "Nenhuma ajuda dispon癉el para `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "erro ao criar porta-chaves `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "porta-chaves `%s' criado\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "falha ao criar 'cache' do porta-chaves: %s\n" @@ -5141,7 +5097,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, fuzzy, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5222,7 +5177,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "actualiza誽o da chave secreta falhou: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 #, fuzzy msgid "Revocation certificate created.\n" @@ -5257,7 +5211,6 @@ msgstr "algoritmo de compress緌 desconhe msgid "NOTE: This key is not protected!\n" msgstr "Esta chave n緌 protegida.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5335,7 +5288,6 @@ msgstr "%s: vers緌 de ficheiro inv嫮ida msgid "error: no ownertrust value\n" msgstr "exportar os valores de confian蓷" -#. error #: g10/tdbdump.c:204 #, fuzzy, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/pt_BR.po gnupg-1.2.6/po/pt_BR.po --- gnupg-1.2.5/po/pt_BR.po 2004-07-26 12:26:43.000000000 +0000 +++ gnupg-1.2.6/po/pt_BR.po 2004-08-25 14:59:18.000000000 +0000 @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -38,7 +38,6 @@ msgstr "a opera誽o n緌 poss癉el sem me msgid "(you may have used the wrong program for this task)\n" msgstr "(voc pode ter usado o programa errado para esta tarefa)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 #, fuzzy msgid "yes" @@ -48,7 +47,6 @@ msgstr "sim" msgid "yY" msgstr "sS" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "n緌" @@ -58,7 +56,6 @@ msgid "nN" msgstr "nN" # INICIO MENU -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "sair" @@ -264,7 +261,6 @@ msgstr "n緌 criptografado" msgid "not processed" msgstr "n緌 processado(s)" -#. the key cannot be used for a specific usage #: util/errors.c:105 #, fuzzy msgid "unusable public key" @@ -784,25 +780,25 @@ msgstr "" "eliminar o campo keyid dos pacotes\n" "criptografados" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -822,15 +818,15 @@ msgstr "" " --list-keys [nomes] mostrar chaves\n" " --fingerprint [nomes] mostrar impress髊s digitais\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [op踥es] [arquivos] (-h para ajuda)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -840,7 +836,7 @@ msgstr "" "assina, verifica, criptografa ou descriptografa\n" "a opera誽o padr緌 depende dos dados de entrada\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -848,382 +844,382 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 #, fuzzy msgid "Compression: " msgstr "Coment嫫io: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "uso: gpg [op踥es] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "%s: novo arquivo de op踥es criado\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: arquivo de op踥es padr緌 `%s' inexistente\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de op踥es padr緌 `%s' inexistente\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de op踥es `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "lendo op踥es de `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n緌 um conjunto de caracteres v嫮ido\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVISO: `%s' um arquivo vazio\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 #, fuzzy msgid "invalid import options\n" msgstr "armadura inv嫮ida" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVISO: `%s' um arquivo vazio\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 #, fuzzy msgid "invalid export options\n" msgstr "chaveiro inv嫮ido" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s n緌 para uso normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n緌 permitido com %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n緌 faz sentido com %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado n緌 v嫮ido\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado n緌 v嫮ido\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado n緌 v嫮ido\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, fuzzy, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "o algoritmo de compress緌 deve estar na faixa %d..%d\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "o algoritmo de compress緌 deve estar na faixa %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "modo S2K inv嫮ido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "modo S2K inv嫮ido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) n緌 recomend嫛el\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inv嫮ido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 #, fuzzy msgid "invalid default preferences\n" msgstr "lista prefer瘽cias" -#: g10/g10.c:2226 +#: g10/g10.c:2234 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "lista prefer瘽cias" -#: g10/g10.c:2230 +#: g10/g10.c:2238 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "lista prefer瘽cias" -#: g10/g10.c:2234 +#: g10/g10.c:2242 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "lista prefer瘽cias" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s n緌 faz sentido com %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id-usu嫫io" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id-usu嫫io" -#: g10/g10.c:2551 +#: g10/g10.c:2559 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key id-usu嫫io" -#: g10/g10.c:2559 +#: g10/g10.c:2567 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key id-usu嫫io" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usu嫫io [comandos]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "imposs癉el abrir %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usu嫫io] [chaveiro]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A gera誽o de chaves falhou: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "enumera誽o de chaves secretas falhou: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A gera誽o de chaves falhou: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record falhou: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "enumera誽o de chaves secretas falhou: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "cria誽o de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas n緌 fica claro -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inv嫮ido `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "V em frente e digite sua mensagem ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "imposs癉el abrir `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1232,21 +1228,21 @@ msgstr "" "um nome de nota誽o deve ter apenas letras, d璲itos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "um valor de nota誽o n緌 deve usar caracteres de controle\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "um valor de nota誽o n緌 deve usar caracteres de controle\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "a URL de pol癃ica dada inv嫮ida\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "a URL de pol癃ica dada inv嫮ida\n" @@ -1382,7 +1378,6 @@ msgstr "rev- revoga踥es de chaves incorr msgid "revocation comment: " msgstr "[revoga誽o]" -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "" @@ -1444,7 +1439,6 @@ msgstr "%s: n緌 um banco de dados de c msgid " %d = I trust ultimately\n" msgstr "" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr "" @@ -1768,14 +1762,6 @@ msgstr "tamanho muito pequeno; 768 o v msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "tamanho muito pequeno; 768 o valor m璯imo permitido.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1862,7 +1848,6 @@ msgstr "valor inv嫮ido\n" msgid "%s does not expire at all\n" msgstr "A chave n緌 expira nunca\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, fuzzy, c-format msgid "%s expires at %s\n" @@ -2184,7 +2169,6 @@ msgstr "chave %08lX: n緌 uma chave rfc msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "chave %08lX: n緌 uma chave rfc2440 - ignorada\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2198,9 +2182,7 @@ msgstr "AVISO: nada exportado\n" msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desativado\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 #, fuzzy msgid "[User id not found]" msgstr "[usu嫫io n緌 encontrado]" @@ -2429,7 +2411,6 @@ msgstr "imposs癉el bloquear chaveiro sec msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2659,8 +2640,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "" -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -3014,7 +2993,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "remove ID de usu嫫io" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "" @@ -3329,8 +3307,6 @@ msgstr "AVISO: Esta chave foi revogada p msgid " (sensitive)" msgstr "" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3453,9 +3429,6 @@ msgstr "Digite o tamanho da chave" msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3551,7 +3524,6 @@ msgstr "Voc tem certeza de que quer est msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revoga誽o para esta assinatura? (s/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Voc assinou estes IDs de usu嫫io:\n" @@ -3593,10 +3565,6 @@ msgstr "nenhuma chave secreta\n" msgid "user ID \"%s\" is already revoked\n" msgstr "A chave protegida.\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3664,7 +3632,6 @@ msgstr " Impress緌 digital:" msgid " Subkey fingerprint:" msgstr " Impress緌 digital:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 #, fuzzy msgid " Key fingerprint =" @@ -3675,8 +3642,6 @@ msgstr " Impress緌 digital:" msgid "weird size for an encrypted session key (%d)\n" msgstr "" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3789,7 +3754,6 @@ msgstr "Pol癃ica: " msgid "signature verification suppressed\n" msgstr "verifica誽o de assinatura suprimida\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 #, fuzzy msgid "can't handle these multiple signatures\n" @@ -3800,10 +3764,6 @@ msgstr "fazer uma assinatura separada" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3971,7 +3931,7 @@ msgstr "" msgid "gpg-agent protocol version %d is not supported\n" msgstr "algoritmo de prote誽o %d n緌 suportado\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "imposs癉el abrir `%s': %s\n" @@ -3980,11 +3940,11 @@ msgstr "imposs癉el abrir `%s': %s\n" msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -4020,16 +3980,16 @@ msgstr "linha muito longa\n" msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4039,20 +3999,20 @@ msgstr "" "Voc precisa de uma frase secreta para desbloquear a chave secreta do\n" "usu嫫io: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "imposs癉el pedir senha em modo n緌-interativo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4120,41 +4080,41 @@ msgstr "NOTA: chave secreta %08lX expiro msgid "NOTE: key has been revoked" msgstr "chave %08lX: a chave foi revogada!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "imposs癉el escrever para o chaveiro: %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, fuzzy, c-format msgid "can't get key from keyserver: %s\n" msgstr "imposs癉el escrever para o chaveiro: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, fuzzy, c-format msgid "error sending to `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, fuzzy, c-format msgid "can't search keyserver: %s\n" msgstr "imposs癉el escrever para o chaveiro: %s\n" @@ -4572,9 +4532,6 @@ msgstr "Certificados que levam a uma cha msgid "public key of ultimately trusted key %08lX not found\n" msgstr "" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4625,7 +4582,6 @@ msgstr "" "ignorado `%s': esta uma chave ElGamal gerada pelo PGP que n緌 segura " "para assinaturas!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4696,7 +4652,7 @@ msgstr "" "imposs癉el evitar chave fraca para criptografia sim彋rica;\n" "%d tentativas!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -5040,17 +4996,17 @@ msgstr "Nenhuma ajuda dispon癉el" msgid "No help available for `%s'" msgstr "Nenhuma ajuda dispon癉el para `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, fuzzy, c-format msgid "error creating keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, fuzzy, c-format msgid "keyring `%s' created\n" msgstr "%s: chaveiro criado\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, fuzzy, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" @@ -5150,7 +5106,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5230,7 +5185,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "enumera誽o de blocos de chaves falhou: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 #, fuzzy msgid "Revocation certificate created.\n" @@ -5266,7 +5220,6 @@ msgstr "algoritmo de compress緌 desconhe msgid "NOTE: This key is not protected!\n" msgstr "Esta chave n緌 protegida.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5341,7 +5294,6 @@ msgstr "erro: impress緌 digital inv嫮ida msgid "error: no ownertrust value\n" msgstr "erro: nenhum valor de confian蓷\n" -#. error #: g10/tdbdump.c:204 #, fuzzy, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/quot.sed gnupg-1.2.6/po/quot.sed --- gnupg-1.2.5/po/quot.sed 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/quot.sed 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,6 @@ +s/"\([^"]*\)"/\1/g +s/`\([^`']*\)'/\1/g +s/ '\([^`']*\)' / \1 /g +s/ '\([^`']*\)'$/ \1/g +s/^'\([^`']*\)' /\1 /g +s//""/g diff -urpP gnupg-1.2.5/po/remove-potcdate.sin gnupg-1.2.6/po/remove-potcdate.sin --- gnupg-1.2.5/po/remove-potcdate.sin 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/remove-potcdate.sin 2004-08-09 15:28:49.000000000 +0000 @@ -0,0 +1,19 @@ +# Sed script that remove the POT-Creation-Date line in the header entry +# from a POT file. +# +# The distinction between the first and the following occurrences of the +# pattern is achieved by looking at the hold space. +/^"POT-Creation-Date: .*"$/{ +x +# Test if the hold space is empty. +s/P/P/ +ta +# Yes it was empty. First occurrence. Remove the line. +g +d +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff -urpP gnupg-1.2.5/po/ro.po gnupg-1.2.6/po/ro.po --- gnupg-1.2.5/po/ro.po 2004-07-26 12:26:44.000000000 +0000 +++ gnupg-1.2.6/po/ro.po 2004-08-25 14:59:19.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-06-17 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -35,7 +35,6 @@ msgstr "" msgid "(you may have used the wrong program for this task)\n" msgstr "(ai folosit probabil un program nepotrivit pentru aceast sarcin)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "da" @@ -44,7 +43,6 @@ msgstr "da" msgid "yY" msgstr "dD" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nu" @@ -53,7 +51,6 @@ msgstr "nu" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "termin" @@ -258,7 +255,6 @@ msgstr "necifrat" msgid "not processed" msgstr "neprocesat" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "cheie public de nefolosit" @@ -746,19 +742,19 @@ msgstr "|N|folose演e algoritm compresie msgid "throw keyid field of encrypted packets" msgstr "ignor c滵p keyid pentru pachete cifrate" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Arat poze ID-uri" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Nu ar綟a poze ID-uri" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Seteaz linia de comand pentru a vedea poze ID-uri" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -766,7 +762,7 @@ msgstr "" "@\n" "(Arat pagina man pentru o list complet a comenzilor 槐 opiunilor)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -786,15 +782,15 @@ msgstr "" " --list-keys [nume] arat chei\n" " --fingerprint [nume] arat amprente\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Raportai bug-uri la .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Folosire: gpg [opiuni] [fi槐ere] (-h pentru ajutor)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -804,7 +800,7 @@ msgstr "" "sign, check, encrypt sau decrypt\n" "operaiunea implicit depinde de datele de intrare\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -812,382 +808,382 @@ msgstr "" "\n" "Algoritmuri suportate:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "Cifru: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Compresie: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "folosire: gpg [opiuni] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "comenzi 螽 conflict\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "nu am g綼it nici un semn = 螽 definiia grupului \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "AVERTISMENT: proprietate nesigur (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "articol configurare necunoscut \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOT: fisier opiuni implicite vechi `%s' ignorat\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOT: nici un fi槐er opiuni implicit `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "fi槐er opiuni `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "citesc opiuni din `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "extensie cifru \"%s\" nu a fost 螽c綖cat din cauza permisiunilor nesigure " "(unsafe)\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nu este un set de carectere valid\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "nu am putut interpreta URI pentru serverul de chei\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opiuni import invalide\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "opiuni import invalide\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opiuni export invalide\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "opiuni export invalide\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nu pot seta cale-execuie ca %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "AVERTISMENT: programul ar putea crea un fi槐er core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTISMENT: %s 螽locuie演e %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOT: %s nu este pentru o folosire normal!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s nu este permis cu %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nu are sens cu %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "putei crea doar semn綟uri deta榮te sau 螽 clar c漮 vreme suntei 螽 modul " "--pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "nu putei semna 槐 cifra 螽 acela槐 timp c漮 vreme suntei 螽 modul --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "trebuie s folosii fi槐ere (槐 nu un pipe) c滱d lucrai cu modul --pgp2 " "activat.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrarea unui mesaj 螽 modul --pgp2 necesit un cifru IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "algoritm rezumat selectat este invalid\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritm rezumat certificare selectat este invalid\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "algoritm compresie `%s' este numai-citire 螽 acest ediie\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritm compresie trebuie s fie 螽 intervalul %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed trebuie s fie mai mare dec漮 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed trebuie s fie mai mare dec漮 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth trebuie s fie 螽 intervalul 1..255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalid; trebuie s fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalid; trebuie s fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOT: modul S2K simplu (0) este contraindicat cu insisten箤n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mod S2K invalid; trebuie s fie 0, 1 sau 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "preferine implicite invalide\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "preferine cifrare personale invalide\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "preferine rezumat personale invalide\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "preferine compresie personale invalide\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s nu merge 螽c cu %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "nu putei folosi algoritmul de cifrare \"%s\" c漮 vreme 螽 modul %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "nu putei folosi algorimul de rezumat \"%s\" c漮 vreme 螽 modul %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "" "nu putei folosi algoritmul de compresie \"%s\" c漮 vreme 螽 modul %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "am e滾at s iniializez TrustDB:%s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISMENT: destinatari (-r) furnizai f綖 a folosi cifrare cu cheie " "public箤n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [nume_fi槐er]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [nume_fi槐er]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [nume_fi槐er]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [nume_fi槐er]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fi槐er]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nume_fi槐er]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [nume_fi槐er]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [nume_fi槐er]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id-utilizator" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizator" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizator" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizator" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizator [comenzi]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "nu pot deschide %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "trimitere server de chei e滾at: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepie server de chei e滾at: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "export cheie e滾at: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "c綦tare server de chei e滾at: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualizare server de chei e滾at: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminarea armurii a e滾at: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "punerea armurii a e滾at: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritm hash invalid `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[nume_fi槐er]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Dai-i drumul 槐 scriei mesajul ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "nu pot deschide `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1195,20 +1191,20 @@ msgstr "" "un nume de notaie trebuie s conin numai caractere imprimabile sau spaii " "槐 s se termine cu un '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "un nume de notaie utilizator trebuie s conin caracterul '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "" "o valoare de notaie trebuie s nu foloseasc nici un caracter de control\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "URL-ul politicii de certificare furnizat este invalid\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "URL-ul politicii de semn綟uri furnizat este invalid\n" @@ -1335,7 +1331,6 @@ msgstr "motiv pentru revocare: " msgid "revocation comment: " msgstr "comentariu revocare: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMtTsS" @@ -1390,7 +1385,6 @@ msgstr " %d = Am toat 螽crederea\n" msgid " %d = I trust ultimately\n" msgstr " %d = Am 螽credere suprem箤n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = arat-mi mai multe informaii\n" @@ -1709,14 +1703,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "lungime cheie prea mic; 768 este cea mai mic valoare permis.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1801,7 +1787,6 @@ msgstr "valoare invalid箤n" msgid "%s does not expire at all\n" msgstr "%s nu expir deloc\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2125,7 +2110,6 @@ msgstr "cheia %08lX: nu e protejat - s msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "cheia %08lX: cheie stil PGP 2.x - s綖it箤n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2139,9 +2123,7 @@ msgstr "AVERTISMENT: nimic exportat\n" msgid "too many entries in pk cache - disabled\n" msgstr "prea multe intr綖i 螽 cache-ul pk - deactivat\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[ID utilizator nu a fost g綼it]" @@ -2371,7 +2353,6 @@ msgstr "nici un inel de chei secret impl msgid "key %08lX: secret key imported\n" msgstr "cheia %08lX: cheie secret importat箤n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2609,8 +2590,6 @@ msgid "Do you want to issue a new signat msgstr "" "Dorii s creai o nou semn綟ur pentru a o 螽locui pe cea expirat? (d/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2966,7 +2945,6 @@ msgstr "steuid" msgid "delete user ID" msgstr "演erge ID utilizator" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "stepoza" @@ -3266,8 +3244,6 @@ msgstr "Aceast cheie poate fi revocat msgid " (sensitive)" msgstr " (senzitiv)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3395,9 +3371,6 @@ msgstr "Introducei ID-ul utilizator al msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nu putei desemna o cheie ca propriul s綦 revocator desemnat\n" @@ -3493,7 +3466,6 @@ msgstr "Suntei 螽c sigur() c dorii msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creai un certificat de revocare pentru aceast semn綟ur? (d/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Ai semnat aceste ID-uri utilizator:\n" @@ -3534,10 +3506,6 @@ msgstr "nici o cheie secret箤n" msgid "user ID \"%s\" is already revoked\n" msgstr "ID-ul utilizator \"%s\" este deja revocat\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3602,7 +3570,6 @@ msgstr " Amprent cheie primar:" msgid " Subkey fingerprint:" msgstr " Amprent subcheie:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Amprent cheie =" @@ -3612,8 +3579,6 @@ msgstr " Amprent cheie =" msgid "weird size for an encrypted session key (%d)\n" msgstr "dimensiune ciudat pentru o cheie de sesiune cifrat (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3724,7 +3689,6 @@ msgstr "Politica: " msgid "signature verification suppressed\n" msgstr "verificare semn綟ur eliminat箤n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "nu pot m滱ui aceste semn綟uri multiple\n" @@ -3734,10 +3698,6 @@ msgstr "nu pot m滱ui aceste semn綟uri mu msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Semn綟ur f綷ut %.*s folosind cheia %s cu ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Cheie disponibil la: " @@ -3903,7 +3863,7 @@ msgstr "variabila de mediu GPG_AGENT_INF msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent versiune protocol %d nu este suportat\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nu m pot conecta la `%s': %s\n" @@ -3912,11 +3872,11 @@ msgstr "nu m pot conecta la `%s': %s\n" msgid "communication problem with gpg-agent\n" msgstr "probleme de comunicare cu gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problem cu agentul - deactivez folosirea agentului\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID cheie principal %08lX)" @@ -3949,16 +3909,16 @@ msgstr "fraz-parol prea lung箤n" msgid "invalid response from agent\n" msgstr "r綼puns invalid de la agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "anulat de utilizator\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem cu agentul: agentul returneaz 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3968,20 +3928,20 @@ msgstr "" "Avei nevoie de o fraz-parol pentru a descuia cheia\n" "secret pentru utilizator: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "cheia %2$s de %1$u-bii, ID %3$08lX, creat %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "nu pot cere parola 螽 modul batch\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introducei fraza-parol: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repetai fraza-parol: " @@ -4048,41 +4008,41 @@ msgstr "NOT: cheia secret %08lX a expi msgid "NOTE: key has been revoked" msgstr "NOT: cheia a fost revocat" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "cer cheia %08lX de la %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nu pot obine cheia de la serverul de chei: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "eroare trimitere la `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "succes trimitere la `%s' (stare=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "a e滾at trimiterea la `%s': stare=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "acest sercer de chei nu suport --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "caut pentru \"%s\" de pe serverul HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nu pot c綦ta serverul de chei: %s\n" @@ -4505,9 +4465,6 @@ msgstr "nu am g綼it nici o cheie cu 螽cr msgid "public key of ultimately trusted key %08lX not found\n" msgstr "cheia public a cheii cu 螽credere suprem %08lX nu a fost g綼it箤n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4555,7 +4512,6 @@ msgstr "" "s綖it `%s': aceasta este o cheie ElGamal generat de PGP care nu e sigur " "pentru semn綟uri!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4623,7 +4579,7 @@ msgstr "cheie slab creat - re螽cerc\n" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "nu pot evita cheie slab pentru cifru simetric; am 螽cercat %d ori!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necesit folosirea unui algoritm cu hash de 160 bii\n" @@ -5031,17 +4987,17 @@ msgstr "Nici un ajutor disponibil" msgid "No help available for `%s'" msgstr "Nici un disponibil disponibil pentru `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "eroare la crearea inelului de chei `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "inelul de chei `%s' creat\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "am e滾at s reconstruiesc cache-ul inelului de chei: %s\n" @@ -5149,7 +5105,6 @@ msgstr "" "aceast platform necesit fi槐ere temporare c滱d sunt chemate programe " "externe\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5227,7 +5182,6 @@ msgstr "Ie槐re 螽 armur ASCII forat.\ msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet a e滾at: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Certificat de revocare creat.\n" @@ -5259,7 +5213,6 @@ msgstr "algoritm de protecie necunoscut msgid "NOTE: This key is not protected!\n" msgstr "NOT: Aceast cheie nu este protejat!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5338,7 +5291,6 @@ msgstr "eroare: amprent invalid箤n" msgid "error: no ownertrust value\n" msgstr "eroare: nici o valoare 螽credere pentru proprietar\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/ru.po gnupg-1.2.6/po/ru.po --- gnupg-1.2.5/po/ru.po 2004-07-26 12:26:44.000000000 +0000 +++ gnupg-1.2.6/po/ru.po 2004-08-25 14:59:19.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: GnuPG 1.2.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-23 19:24+0100\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -33,7 +33,6 @@ msgstr "" "(赲郋郱邾郋迠郇郋, 邽郈郋郅郱迮迮 郇迮郈郋迡郋迡迮迮 郈郋迣訄邾邾郇郋迮 郋訇迮郈迮迮郇邽迮\n" "迡郅 迡訄郇郇郋邿 郱訄迡訄邽)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "迡訄" @@ -42,7 +41,6 @@ msgstr "迡訄" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "郇迮" @@ -51,7 +49,6 @@ msgstr "郇迮" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "郋迡" @@ -256,7 +253,6 @@ msgstr "郇迮 郱訄邽郋赲訄郇郋" msgid "not processed" msgstr "郇迮 赲郈郋郅郇迮郇郋" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "郇迮郈邽邾迮郇邽邾邿 郋郕邿 郕郅" @@ -737,19 +733,19 @@ msgstr "|N|邽郈郋郅郱郋赲訄 邾迮 msgid "throw keyid field of encrypted packets" msgstr "郇迮 郋訄郇 邽迡迮郇邽邽郕訄郋 郕郅訄 赲 郱訄邽郋赲訄郇郇郋邾 郋郋訇迮郇邽邽" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "郋郕訄郱赲訄 郋郋 ID" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "迮 郈郋郕訄郱赲訄 郋郋 ID" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "訄迡訄 郕郋邾訄郇迡郇 郋郕 迡郅 郈郋郕訄郱訄 郋郋 ID" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -757,7 +753,7 @@ msgstr "" "@\n" "(苤邾. 迡郋郕邾迮郇訄邽 迡郅 訇郋郅迮迮 郈郋郅郇郋迣郋 郋郱郇訄郕郋邾郅迮郇邽 郕郋邾訄郇迡訄邾邽 邽 郈訄訄邾迮訄邾邽)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -777,18 +773,18 @@ msgstr "" " --list-keys [邽邾迮郇訄] 郈郋郕訄郱訄 郕郅邽\n" " --fingerprint [邽邾迮郇訄] 郈郋郕訄郱訄 郋郈迮訄郕邽 (fingerprints)\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" " 郇訄邿迡迮郇郇 郋邽訇郕訄 郋郋訇訄邿迮 .\n" "郋迡郈邽邽迮 郇訄 郕郋郱郇 迣郈郈 訄郅郕邽 GnuPG-ru 郋郈訄赲邽赲 郈邽邾郋 郈郋 " "訄迡迮 gnupg-ru-request@gnupg.org 迮邾郋邿 subscribe.\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "郈郋郅郱郋赲訄郇邽迮: gpg [郈訄訄邾迮] [訄邿郅] (-h 迡郅 郈郋迡郕訄郱郕邽)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -798,7 +794,7 @@ msgstr "" "郈郋迡郈邽訄 邽 郈郋赲迮邽, 郱訄邽郋赲訄 邽郅邽 訄邽郋赲訄\n" "郋郈迮訄邽 郈郋 邾郋郅訄郇邽 郱訄赲邽邽 郋 赲郋迡郇 迡訄郇郇\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -806,373 +802,373 @@ msgstr "" "\n" "郋迡迡迮迠邽赲訄 郅迮迡邽迮 訄郅迣郋邽邾:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "苤 郋郕邾 郕郅郋邾: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "苤邽邾邾迮邽郇迮 邽: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "苭-郇郕邽邽: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "郅迣郋邽邾 迠訄邽: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "邽郈郋郅郱郋赲訄郇邽迮: gpg [郋郈邽邽] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "郇迮郋赲邾迮邽邾迮 郕郋邾訄郇迡\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = sign found in group definition \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr ": 郇迮訇迮郱郋郈訄郇邿 赲郅訄迡迮郅迮 訄邿郅訄 %s \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr ": 郇迮訇迮郱郋郈訄郇迮 郈訄赲訄 迡郋郈訄 郕 %s \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr ": 郇迮訇迮郱郋郈訄郇迮 訄郇郋赲郕邽 赲郅訄迡迮郅訄 郕訄訄郅郋迣訄 %s \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr ": 郇迮訇迮郱郋郈訄郇迮 郈訄赲訄 迡郋郈訄 郕 郕訄訄郅郋迣 %s \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "訄邿郅 郕郋郇邽迣訄邽邽 郋迡迮迠邽 郇迮邽郱赲迮郇邿 郈訄訄邾迮 \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "虴: 訄邿郅 郇訄郋迮郕 訄郋迣郋 郋邾訄訄 `%s' 郈郋邽迣郇郋邽郋赲訄郇\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "虴: 訄邿郅 郇訄郋迮郕 `%s' 郇迮 郋訇郇訄迠迮郇\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "訄邿郅 郇訄郋迮郕 `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "郇訄郋邿郕邽 赲郱 邽郱 訄邿郅訄 `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "訄邽迮郇邽迮 邽訄 \"%s\" 郇迮 郱訄迣迠迮郇郋 赲郅迮迡赲邽迮 郇迮訇迮郱郋郈訄郇 郈訄赲 迡郋郈訄\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s 郇迮迡郋郈邽邾訄 訄訇郅邽訄 邽邾赲郋郅郋赲\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "郇迮 邾郋迣 郈郋訄郇訄郅邽郱邽郋赲訄 URI 迮赲迮訄 郕郅迮邿\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 郇迮迡郋郈邽邾迮 郈訄訄邾迮 邽邾郈郋訄\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "郇迮迡郋郈邽邾迮 郈訄訄邾迮 邽邾郈郋訄\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 郇迮迡郋郈邽邾迮 郈訄訄邾迮 郕郈郋訄\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "郇迮迡郋郈邽邾迮 郈訄訄邾迮 郕郈郋訄\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "郇迮 邾郋迣 郋郈迮迡迮郅邽 郈 郱訄郈郕訄 迡郅 %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr ": 赲郋郱邾郋迠郇郋 郋郱迡訄郇邽迮 訄邿郅訄 迡訄邾郈訄 郈訄邾邽!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr ": %s 郱訄邾迮郇邽 %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "虴: %s 郇迮 郈迮迡郇訄郱郇訄迮郇 迡郅 郋訇郇郋迣郋 邽郈郋郅郱郋赲訄郇邽!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 郇迮迡郋郈邽邾郋 邽郈郋郅郱郋赲訄 %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 郇迮 邽邾迮迮 邾郅訄 郋赲邾迮郇郋 %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "郋迠郇郋 迡迮郅訄 郋郅郕郋 郋迡迮郅迮郇郇 邽郅邽 郈郋郱訄郇 郈郋迡郈邽 赲 迮迠邽邾迮 --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr " 郇迮 邾郋迠迮迮 郋迡郇郋赲迮邾迮郇郇郋 郈郋迡郈邽訄 邽 郱訄邽郋赲訄 赲 迮迠邽邾迮 --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr " 迡郋郅迠郇 邽郈郋郅郱郋赲訄 訄邿郅 (訄 郇迮 郕訄郇訄郅 (pipe)) 赲 迮迠邽邾迮 --pgp2.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "迡郅 郱訄邽郋赲郕邽 郋郋訇迮郇邽 赲 迮迠邽邾迮 --pgp2 迮訇迮 邽 IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "赲訇訄郇 郇迮赲迮郇邿 訄郅迣郋邽邾 邽郋赲訄郇邽\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "赲訇訄郇訄 郇迮赲迮郇訄 -郇郕邽\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "赲訇訄郇訄 郇迮赲迮郇訄 -郇郕邽 迡郅 迮邽邽郕訄邽邽\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "" "訄郅迣郋邽邾 迠訄邽 `%s' 赲 郇訄郋迮邿 赲迮邽邽 邽郈郋郅郱迮 郋郅郕郋 迡郅 迮郇邽\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "邾迮郋迡 迠訄邽 迡郋郅迠迮郇 訇 赲 迡邽訄郈訄郱郋郇迮 %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed 迡郋郅迠迮郇 訇 訇郋郅迮 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed 迡郋郅迠迮郇 訇 訇郋郅迮 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth 迡郋郅迠迮郇 訇 赲 迡邽訄郈訄郱郋郇迮 郋 1 迡郋 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "郇迮迡郋郈邽邾邿 default-cert-level; 迡郋郅迠迮郇 訇 0, 1, 2 邽郅邽 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "郇迮迡郋郈邽邾邿 min-cert-level; 迡郋郅迠迮郇 訇 1, 2 邽郅邽 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "虴: 郈郋郋邿 (0) 迮迠邽邾 S2K 郋迣郋 郇迮 迮郕郋邾迮郇迡迮\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "郇迮迡郋郈邽邾邿 迮迠邽邾 S2K; 迡郋郅迠郇郋 訇 0, 1 邽郅邽 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "郇迮迡郋郈邽邾迮 郈迮迡郈郋迮郇邽 郈郋 邾郋郅訄郇邽\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "郇迮迡郋郈邽邾迮 郈迮郋郇訄郅郇迮 郈迮迡郈郋迮郇邽 邽訄\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "郇迮迡郋郈邽邾迮 郈迮郋郇訄郅郇迮 郈迮迡郈郋迮郇邽 -郇郕邽邽\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "郇迮迡郋郈邽邾迮 郈迮郋郇訄郅郇迮 郈迮迡郈郋迮郇邽 訄郅迣郋邽邾郋赲 迠訄邽\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 郇迮 訄訇郋訄迮 郈郋郕訄 %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr " 郇迮 邾郋迠迮迮 邽郈郋郅郱郋赲訄 邽郋赲訄郇邽迮 \"%s\" 赲 迮迠邽邾迮 %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr " 郇迮 邾郋迠迮迮 邽郈郋郅郱郋赲訄 -郇郕邽 \"%s\" 赲 迮迠邽邾迮 %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr " 郇迮 邾郋迠迮迮 邽郈郋郅郱郋赲訄 迠訄邽迮 \"%s\" 赲 迮迠邽邾迮 %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "訇郋邿 邽郇邽邽訄郅邽郱訄邽邽 訄訇郅邽 迡郋赲迮邽邿: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" ": 郈郋郅訄迮郅邽 (-r) 郱訄迡訄郇 訇迮郱 邽郈郋郅郱郋赲訄郇邽 邽郋赲訄郇邽 郋郕邾 " "郕郅郋邾\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "郇迮 邾郋迣 郋郕 %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "郇迮迡訄訄 郈邽 郋郈訄赲郕迮 郇訄 迮赲迮 郕郅迮邿: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "郇迮迡訄訄 郈邽 郈郋郅迮郇邽邽 迮赲迮訄 郕郅迮邿: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "郇迮 迡訄郅郋 郕郈郋邽郋赲訄 郕郅: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "郇迮迡訄訄 郈邽 郈郋邽郕迮 郇訄 迮赲迮迮 郕郅迮邿: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "郇迮迡訄訄 郈邽 郋訇郇郋赲郅迮郇邽邽 郇訄 迮赲迮迮 郕郅迮邿: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "郋邽訇郕訄 郈迮郋訇訄郱郋赲訄郇邽 邽郱 ASCII 郋邾訄訄: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "郋邽訇郕訄 郈迮郋訇訄郱郋赲訄郇邽 赲 ASCII 郋邾訄: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "郇迮迡郋郈邽邾訄 -郇郕邽 `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[filename]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "訄訇邽訄邿迮 訄迮 郋郋訇迮郇邽迮 ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "郇迮 邾郋迣 郋郕 `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1180,19 +1176,19 @@ msgstr "" "邽邾 郈邽邾迮訄郇邽 迡郋郅迠郇郋 郋迡迮迠訄 郋郅郕郋 郈迮訄郇迮 邽邾赲郋郅 邽郅邽 郈郋訇迮郅,邽 " "郱訄郕訄郇邽赲訄 郱郇訄郕郋邾 '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "邽邾 郈邽邾迮訄郇邽 迡郋郅迠郇郋 郋迡迮迠訄 '@' 邽邾赲郋郅\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "郱郇訄迮郇邽迮 郈邽邾迮訄郇邽 郇迮 迡郋郅迠郇郋 郋迡迮迠訄 郈訄赲郅邽迮 邽邾赲郋郅\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "郱訄迡訄郇郇邿 URL 郈訄赲邽郅 迮邽邽郕訄邽邽 郇迮赲迮迮郇\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "郱訄迡訄郇郇邿 URL 郈訄赲邽郅 郈郋迡郈邽邽 郇迮赲迮迮郇\n" @@ -1320,7 +1316,6 @@ msgstr "郈邽邽郇訄 郋郱赲訄: " msgid "revocation comment: " msgstr "郈郋郕郋邾邾迮郇邽邿迮 郋郱赲: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1375,7 +1370,6 @@ msgstr " %d = 郋郅郇郋 迡郋赲 msgid " %d = I trust ultimately\n" msgstr " %d = 訇郋郅郇郋 迡郋赲迮\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = 郈郋郕訄迠邽迮 邾郇迮 訇郋郅迮 邽郇郋邾訄邽邽\n" @@ -1686,14 +1680,6 @@ msgstr "郅邽郕郋邾 邾訄郅邿 訄郱 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "郅邽郕郋邾 邾訄郅邿 訄郱邾迮 郕郅訄; 768 - 邾邽郇邽邾訄郅郇郋 迡郋郈邽邾邿 訄郱邾迮.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1778,7 +1764,6 @@ msgstr "郇迮郈訄赲邽郅郇郋迮 郱郇訄 msgid "%s does not expire at all\n" msgstr "%s 郇迮 邽邾迮迮 郋迣訄郇邽迮郇邽 郋郕訄 迡迮邿赲邽\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2097,7 +2082,6 @@ msgstr "郕郅 %08lX: 郇迮 郱訄邽 msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "郕郅 %08lX: PGP 2.x 邽郅 - 郈郋郈迮郇\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2111,9 +2095,7 @@ msgstr ": 郇迮迮迣郋 msgid "too many entries in pk cache - disabled\n" msgstr "郅邽郕郋邾 邾郇郋迣郋 赲郋迡郋赲 赲 pk 郕迮 - 郋郕郅迮郇郋\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User ID 迮 郇訄邿迡迮郇]" @@ -2343,7 +2325,6 @@ msgstr "郇迮 郋郇郋赲郇郋邿 訄訇郅 msgid "key %08lX: secret key imported\n" msgstr "郕郅 %08lX: 迮郕迮郇邿 郕郅 邽邾郈郋邽郋赲訄郇\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2575,8 +2556,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr " 郋邽迮 迡迮郅訄 郇郋赲 郈郋迡郈邽 迡郅 郱訄邾迮郇 郈郋郋迮郇郇郋邿? (y/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2931,7 +2910,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "迡訄郅邽 User ID" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3229,8 +3207,6 @@ msgstr "訄郇郇邿 郕郅 邾郋迠迮 msgid " (sensitive)" msgstr " (sensitive)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3356,9 +3332,6 @@ msgstr "苺郕訄迠邽迮 User ID 郕郅 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "郇迮郅郱 郇訄郱郇訄邽 PGP 2.x 郕郅, 郕訄郕 郇訄郱郇訄迮郇郇邿 郋郱赲訄邽邾\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "郕郅 郇迮 邾郋迠迮 訇 郇訄郱郇訄迮郇 郋郱赲訄邽邾 訄邾 迮訇\n" @@ -3450,7 +3423,6 @@ msgstr " 赲迮迮郇, 郋 郋 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "苤郋郱迡訄 迮邽邽郕訄 郋郱赲訄 迡郅 迡訄郇郇郋邿 郈郋迡郈邽邽? (y/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr " 郈郋迡郈邽訄郅邽 迡訄郇郇迮 User ID:\n" @@ -3491,10 +3463,6 @@ msgstr "郇迮 迮郕迮郇郋迣郋 郕郅 msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" 迠迮 郋郋郱赲訄郇\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3558,7 +3526,6 @@ msgstr " 郈迮訄郋郕 迣郅訄赲郇郋 msgid " Subkey fingerprint:" msgstr " 郈迮訄郋郕 郈郋迡郕郅訄:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " 郈迮訄郋郕 郕郅訄 =" @@ -3568,8 +3535,6 @@ msgstr " 郈迮訄郋郕 郕郅 msgid "weird size for an encrypted session key (%d)\n" msgstr "訄郇郇邿 訄郱邾迮 迮訄郇郋赲郋迣郋 郕郅訄 邽郋赲訄郇邽 (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3680,7 +3645,6 @@ msgstr "URL 訄赲邽郅: " msgid "signature verification suppressed\n" msgstr "郈郋赲迮郕訄 郈郋迡郈邽邽 郈郋迡訄赲郅迮郇訄\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "郇迮 邾郋迣 郋訇訄訇郋訄 邽 邾郇郋迠迮赲迮郇郇迮 郈郋迡郈邽邽\n" @@ -3690,10 +3654,6 @@ msgstr "郇迮 邾郋迣 郋訇訄訇郋訄 msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "郋迡郈邽 郋郱迡訄郇訄 %.*s 郕郅郋邾 %s ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "郅 迡郋郈迮郇: " @@ -3856,7 +3816,7 @@ msgstr "郇迮郈訄赲邽郅郇訄 郈迮 msgid "gpg-agent protocol version %d is not supported\n" msgstr "郈郋郋郕郋郅 gpg-agent 赲迮邽邽 %d 郇迮 郈郋迡迡迮迠邽赲訄迮\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "郇迮 邾郋迣 郈郋迡郕郅邽 郕 `%s': %s\n" @@ -3865,11 +3825,11 @@ msgstr "郇迮 邾郋迣 郈郋迡郕郅邽 msgid "communication problem with gpg-agent\n" msgstr "郕郋邾邾郇邽郕訄邽郋郇郇邿 郈郋訇郅迮邾 gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "郈郋訇郅迮邾訄 訄迣迮郇郋邾 - 邽郈郋郅郱郋赲訄郇邽迮 訄迣迮郇訄 郋郕郅迮郇郋\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (迣郅訄赲郇邿 邽迡迮郇邽邽郕訄郋 郕郅訄 %08lX)" @@ -3901,16 +3861,16 @@ msgstr "郈訄郋郅 郅邽郕郋邾 迡郅 msgid "invalid response from agent\n" msgstr "郇迮赲迮郇邿 郋赲迮 郋 訄迣迮郇訄\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "郈迮赲訄郇郋 郈郋郅郱郋赲訄迮郅迮邾\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "郈郋訇郅迮邾訄 訄迣迮郇郋邾: 訄迣迮郇 赲迮郇郅 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3920,20 +3880,20 @@ msgstr "" "迮郋訇郋迡邽邾 郈訄郋郅 迡郅 迡郋郈訄 郕 迮郕迮郇郋邾 郕郅 郈郋郅郱郋赲訄迮郅:\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-訇邽 %s 郕郅, ID %08lX, 郋郱迡訄郇 %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "郇迮 邾郋迣 郈郋郅邽 郈訄郋郅 赲 郈訄郕迮郇郋邾 迮迠邽邾迮\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "赲迮迡邽迮 郈訄郋郅: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "郋赲郋邽迮 郈訄郋郅: " @@ -3999,41 +3959,41 @@ msgstr "苠衧苠: 迮郕迮郇 msgid "NOTE: key has been revoked" msgstr "苠衧苠: 郕郅 訇郅 郋郋郱赲訄郇" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "郱訄郈郋 郕郅訄 %08lX %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "郇迮 邾郋迣 郈郋郅邽 郕郅 迮赲迮訄 郕郅迮邿: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "郋邽訇郕訄 郋郈訄赲郕邽 郇訄 `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "郈迮郇郋 郋郈訄赲郅迮郇郋 郇訄 `%s' (訄=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "訇郋邿 郋郈訄赲郕邽 郇訄 `%s': 訄=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "訄郇郇邿 迮赲迮 郕郅迮邿 郇迮 郈郋迡迡迮迠邽赲訄迮 --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "郈郋邽郕 \"%s\" 郇訄 HKP 迮赲迮迮 %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "郇迮 邾郋迣 郇訄邿邽 迮赲迮 郕郅迮邿: %s\n" @@ -4448,9 +4408,6 @@ msgstr "郇迮 郇訄邿迡迮郇郋 訄訇郋郅 msgid "public key of ultimately trusted key %08lX not found\n" msgstr "郋郕邿 郕郅 迡郅 訄訇郋郅郇郋 迡郋赲迮迮邾郋迣郋 郕郅訄 %08lX 郇迮 郇訄邿迡迮郇\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4500,7 +4457,6 @@ msgstr "" "郈郋郈迮郇郋 `%s': 郋 郋郱迡訄郇郇邿 PGP - ElGamal 郕郅, 郇迮 郋訇迮郈迮邽赲訄邽邿\n" "訇迮郱郋郈訄郇郋 郈郋迡郈邽邽\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4568,7 +4524,7 @@ msgid "cannot avoid weak key for symmetr msgstr "" "郇迮赲郋郱邾郋迠郇郋 邽郱訇迮迠訄 郅訄訇郋迣郋 郕郅訄 迡郅 邽邾邾迮邽郇郋迣郋 邽訄; %d 郈郋郈郋郕!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA 迮訇迮 邽郈郋郅郱郋赲訄郇邽 160 訇邽郇郋邿 -郇郕邽邽\n" @@ -4957,17 +4913,17 @@ msgstr "迮 迡郋郈郇郋邿 郈 msgid "No help available for `%s'" msgstr "迮 郈訄赲郕邽 迡郅 `%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "郋邽訇郕訄 郋郱迡訄郇邽 訄訇郅邽 郕郅迮邿 `%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "郋郱迡訄郇訄 訄訇郅邽訄 郕郅迮邿 `%s'\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "訇郋邿 郈迮迮郋邿郕邽 郕訄 訄訇郅邽 郕郅迮邿: %s\n" @@ -5071,7 +5027,6 @@ msgstr "" "郇訄 迡訄郇郇郋邿 郈郅訄郋邾迮 迮訇迮 邽郈郋郅郱郋赲訄郇邽迮 赲迮邾迮郇郇 訄邿郅郋赲\n" " 郈邽 赲郱郋赲迮 赲郇迮郇邽 郈郋迣訄邾邾\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5149,7 +5104,6 @@ msgstr "郅 赲赲郋迡訄 邽郈郋郅 msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet failed: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "苤迮邽邽郕訄 郋郱赲訄 郋郱迡訄郇.\n" @@ -5181,7 +5135,6 @@ msgstr "郇迮邽郱赲迮郇邿 訄郅迣郋 msgid "NOTE: This key is not protected!\n" msgstr "虴: 訄郇郇邿 郕郅 郇迮 郱訄邽迮郇!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5261,7 +5214,6 @@ msgstr "郋邽訇郕訄: 郇迮赲迮郇邿 msgid "error: no ownertrust value\n" msgstr "郋邽訇郕訄: 郇迮 郱郇訄迮郇邽 迡郋赲迮邽 (ownertrust)\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/sk.po gnupg-1.2.6/po/sk.po --- gnupg-1.2.5/po/sk.po 2004-07-26 12:26:44.000000000 +0000 +++ gnupg-1.2.6/po/sk.po 2004-08-25 14:59:20.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -29,7 +29,6 @@ msgstr "vykonanie oper塶ie nie je mo駐 msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdepodobne ste na tto lohu pou養li nespr嫛ny program)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ano" @@ -38,7 +37,6 @@ msgstr "ano" msgid "yY" msgstr "aAyY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nie" @@ -47,7 +45,6 @@ msgstr "nie" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "ukon鋱" @@ -252,7 +249,6 @@ msgstr "neza隘frovan" msgid "not processed" msgstr "nespracovan" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "nepou養te登 verejn k詠" @@ -753,21 +749,21 @@ msgstr "" "zahodi identifik嫢or k詠醀 zo 隘frovanch\n" " paketov" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Zobrazi fotografick ID" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Nezobrazova fotografick ID" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "" "Nastavi pr璭azov riadok na prehliadanie\n" " fotografick嶭o ID" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -776,7 +772,7 @@ msgstr "" "(Pou養te manu嫮ov str嫕ky pre kompletn zoznam v鈹tkch pr璭azov a " "mo駐ost)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -796,17 +792,17 @@ msgstr "" " --list-keys [men塴 vyp疄a k詠鋀\n" " --fingerprint [men塴 vyp疄a fingerprinty\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Chyby ozn嫥te, pros璥, na adresu .\n" "Pripomienky k prekladu .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pou養tie: gpg [mo駐osti] [sbory] (-h pre pomoc)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -816,7 +812,7 @@ msgstr "" "podp疄a, overi, 隘frova alebo de隘frova蓋n" "implicitn oper塶ie z嫛isia od vstupnch d嫢\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -824,374 +820,374 @@ msgstr "" "\n" "Podporovan algoritmy:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "Verejn k詠鋀: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "姆fry: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "Kompresia: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "pou養tie: gpg [mo駐osti] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "konfliktn pr璭azy\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = podpis n奫den v defin獳ii skupiny \"%s\"\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VAROVANIE: vlastn獳tvo pre %s nastaven nebezpe鋝e \"%s\"\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "VAROVANIE: pr疄tupov pr嫛a pre %s nie s nastaven bezpe鋝e \"%s\"\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "VAROVANIE: vlastn獳tvo adres嫫a %s nastaven nebezpe鋝e \"%s\"\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" "VAROVANIE: pr疄tupov pr嫛a adres嫫a %s nie s nastaven bezpe鋝e \"%s\"\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "nezn嫥a polo餒a konfigur塶ie \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZN簍KA: star implicitn sbor s mo駐os蒼mi `%s ignorovan'\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZN簍KA: neexistuje implicitn sbor s mo駐os蒼mi `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "sbor s mo駐os蒼mi `%s': %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "鴈tam mo駐osti z `%s'\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" "隘fra \"%s\" nebola nahran, preto頡 pr疄tupov pr嫛a nie s nastaven " "bezpe鋝e\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s nie je platn znakov sada\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "nemo駐o pou養 URI servera k詠鋌v - chyba analzy URI\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatn parameter pre import\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "neplatn parameter pre import\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatn parameter pre export\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "neplatn parameter pre export\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nemo駐o nastavi exec-path na %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "VAROVANIE: program m藶e vytvori sbor core!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVANIE: %s prep竁e %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZN簍KA: %s nie je pre norm嫮ne pou養tie!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie je dovolen pou橙va %s s %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ned嫛a s %s zmysel!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v m鏚e --pgp2 m藶ete vytv嫫a len oddelen podpisy alebo podpisy 鋱tate登 " "ako text\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v m鏚e --pgp2 nemo駐o s醀sne 隘frova a podpisova蓋n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v m鏚e --pgp2 mus癃e pou養 sbor (nie rru).\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "隘frovanie spr嫛 v m鏚e --pgp2 vy靠duje algoritmus IDEA\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "vybran 隘frovac algoritmus je neplatn\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "vybran hashovac algoritmus je neplatn\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "vybran hashovac algoritmus je neplatn\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "hashovac algoritmus `%s' je len na 鴈tanie v tejto verzii\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "kompresn algoritmus mus by v rozmedz %d..%d\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "polo餒a completes-needed mus by v儰隘a ako 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "polo餒a marginals-needed mus by v儰隘a ako 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "polo餒a max-cert-depth mus by v rozmedz od 1 do 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "neplatn implicitn rove certifik塶ie; mus by 0, 1, 2 alebo 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "neplatn minim嫮na rove certifik塶ie; mus by 0, 1, 2 alebo 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZN簍KA: jednoduch m鏚 S2K (0) je d皾azne nedoporu鋌van\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatn m鏚 S2K; mus by 0, 1 alebo 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "neplatn defaultn predvo琨y\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "neplatn u橙vate盜k predvo琨y pre 隘frovanie\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "neplatn u橙vate盜k predvo琨y pre hashovanie\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "neplatn u橙vate盜k predvo琨y pre kompresiu\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s e靖e nepracuje s %s\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "nem藶ete pou養 隘frovac algoritmus \"%s\" v m鏚e %s\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "nem藶ete pou養 hashovac algoritmus \"%s\" v m鏚e %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "nem藶ete pou養 kompresn algoritmus \"%s\" v m鏚e %s\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nem藶em inicializova datab嫙u d矏ery: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVANIE: dan adres嫢 (-r) bez pou養tia 隘frovania s verejnm k詠鋌m\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [meno sboru]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [meno sboru]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [meno sboru]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [meno sboru]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [meno sboru]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [meno sboru]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [meno sboru]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [meno sboru]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key id u橙vate琦" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key id u橙vate琦" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u橙vate琦" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u橙vate琦" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u橙vate琦 [pr璭azy]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "nemo駐o otvori %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u橙vate琦] [sbor s k詠鋗i (keyring)]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "nepodarilo posla k詠 na server: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "nepodarilo sa prija k詠 zo servera: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "nepodaril sa export k詠醀: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "nepodarilo sa n奫s server: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aktualiz塶ia servera zlyhala: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "dek鏚ovanie z ASCII form嫢u zlyhalo: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "k鏚ovanie do ASCII form嫢u zlyhalo: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatn hashovac algoritmus `%s'\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[meno sboru]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Za鋝ite p疄a svoju spr嫛u ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "nemo駐o otvori `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1199,19 +1195,19 @@ msgstr "" "meno m藶e obsahova len p疄men, 鴈slice, bodky, pod鋱arn璭y alebo medzery a " "kon鋱 s '='\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "hodnota mus obsahova znak '@'\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "hodnota nesmie obsahova 養adne kontroln znaky\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "zadan URL pre certifika鋝 politiku je neplatn嬞n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "zadan URL pre podpisov politiku je neplatn嬞n" @@ -1338,7 +1334,6 @@ msgstr "d矏od na revok塶iu: " msgid "revocation comment: " msgstr "revoka鋝 pozn嫥ka: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMuUsS" @@ -1393,7 +1388,6 @@ msgstr " %d = D矏erujem plne\n" msgid " %d = I trust ultimately\n" msgstr " %d = D矏erujem absoltne\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = pros璥 o viac inform塶璐\n" @@ -1711,14 +1705,6 @@ msgid "keysize too small; 768 is smalles msgstr "" "ve痘os k詠醀 je pr璱i mal; minim嫮na povolen ve痘os je 768 bitov.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1803,7 +1789,6 @@ msgstr "neplatn hodnota\n" msgid "%s does not expire at all\n" msgstr "platnos %s neskon鴈\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2126,7 +2111,6 @@ msgstr "k詠 %08lX: nie je chr嫕en - pr msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "k詠 %08lX: PGP 2.x k詠 - presko鋀n嬞n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2140,9 +2124,7 @@ msgstr "VAROVANIE: ni nebolo vyexportov msgid "too many entries in pk cache - disabled\n" msgstr "pr璱i ve琦 polo養ek v bufferi verejnch k詠鋌v - vypnut嬞n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[User id not found]" @@ -2374,7 +2356,6 @@ msgstr "nie je nastaven implicitn sbo msgid "key %08lX: secret key imported\n" msgstr "k詠 %08lX: tajn k詠 importovan\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2614,8 +2595,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "Chcete, aby platnos V廜ho podpisu vypr鈴la v rovnakom 醀se? (A/n) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2971,7 +2950,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "zmaza identifik嫢or u橙vate琦" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3269,8 +3247,6 @@ msgstr "Tento k詠 m藶e by revokovan k msgid " (sensitive)" msgstr "(citliv inform塶ia)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3396,9 +3372,6 @@ msgstr "Vlo駙e identifik嫢or u橙vate琦 p msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "k詠 vo form嫢e PGP 2.x nemo駐o poveri revok塶iou\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "k詠 nemo駐o poveri revok塶iou n璥 samm\n" @@ -3490,7 +3463,6 @@ msgstr "Ste si ist, 頡 ho chcete st嫮e msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvori pre tento podpis revoka鋝 certifik嫢? (a/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Podp疄ali ste nasledujce identifik嫢ory u橙vate琦:\n" @@ -3531,10 +3503,6 @@ msgstr "neexistuje tajn k詠醆n" msgid "user ID \"%s\" is already revoked\n" msgstr "u橙vate盜k ID \"%s\" je u revokovan嬞n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3599,7 +3567,6 @@ msgstr " Prim嫫ny fingerprint k詠醀:" msgid " Subkey fingerprint:" msgstr " Fingerprint podk詠醀:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Fingerprint k詠醀 =" @@ -3609,8 +3576,6 @@ msgstr " Fingerprint k詠醀 =" msgid "weird size for an encrypted session key (%d)\n" msgstr "zvl廜tna ve痘os 隘frovacieho k詠醀 pre sedenie (%d)\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3727,7 +3692,6 @@ msgstr "Politika: " msgid "signature verification suppressed\n" msgstr "verifik塶ia podpisu potla鋀n塿n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "neviem pracova s tmito n嫳obnmi podpismi\n" @@ -3738,10 +3702,6 @@ msgstr "neviem pracova s tmito n嫳obn msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Podpis vytvoren %.*s pomocou %s k詠醀 ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "K詠 k dispoz獳ii na: " @@ -3905,7 +3865,7 @@ msgstr "zl form嫢 premennej prostredia msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verzie %d nie je podporovan\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nem藶em sa pripoji k `%s': %s\n" @@ -3914,11 +3874,11 @@ msgstr "nem藶em sa pripoji k `%s': %s\n msgid "communication problem with gpg-agent\n" msgstr "probl幦 v komunik塶ii s gpg-agentom\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probl幦 s agentom - pou橙vanie agenta vypnut嬞n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hlavn ID k詠醀 %08lX)" @@ -3950,16 +3910,16 @@ msgstr "heslo je pr璱i dlh嬞n" msgid "invalid response from agent\n" msgstr "neplatn reakcia od agenta\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "zru鈹n u橙vate發m\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probl幦 s agentom: agent vracia 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3969,20 +3929,20 @@ msgstr "" "Mus癃e pozna heslo, aby ste odomkli tajn k詠 pre\n" "u橙vate琦: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "d敺ka %u bitov, typ %s, ID %08lX, vytvoren %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "v d嫛kovom re養me sa nem藶em pta na heslo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Vlo駙e heslo: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -4048,41 +4008,41 @@ msgstr "POZN簍KA: platnos tajn嶭o k詠醀 msgid "NOTE: key has been revoked" msgstr "POZN簍KA: k詠 bol revokovan" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "po靠dujem k詠 %08lX z %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nem藶em dosta k詠 zo servera k詠鋌v: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "chyba pri posielan na `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "spe雉 odoslanie na `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "zlyhalo posielanie na `%s': (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "tento server k詠鋌v nepodporuje --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "vyh琦d嫛am \"%s\" na HKP serveri %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nem藶em preh琦d嫛a server k詠鋌v: %s\n" @@ -4505,9 +4465,6 @@ msgstr "neboli n奫den 養adne absoltne msgid "public key of ultimately trusted key %08lX not found\n" msgstr "verejn k詠 k absoltne d矏eryhodn幦u k詠鋎 %08lX nebol n奫den\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4557,7 +4514,6 @@ msgstr "" "presko鋀n `%s': toto je vygenerovan PGP k詠 pod琦 algoritmu ElGamal,\n" "podpisy vytvoren tmto k詠鋌m nie s bezpe鋝!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4626,7 +4582,7 @@ msgstr "" "nem藶em sa vyvarova slab嶭o k詠醀 pre symetrick 隘fru; oper塶iu som sksil " "%d kr嫢!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA po靠duje pou養tie 160 bitov嶭o hashovacieho algoritmu\n" @@ -5026,17 +4982,17 @@ msgstr "Pomoc nie je k dispoz獳ii" msgid "No help available for `%s'" msgstr "Pomoc nie je dostupn pre '%s'" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "chyba pri vytv嫫an sboru k詠鋌v (keyring)`%s': %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "sbor k詠鋌v (keyring) `%s' vytvoren\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "zlyhalo obnovenie vyrovn嫛acej pam酹i k詠鋌v: %s\n" @@ -5142,7 +5098,6 @@ msgid "this platform requires temp files msgstr "" "t嫢o platforma potrebuje do醀sn sbory na spustenie extern嶭o programu\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5220,7 +5175,6 @@ msgstr "Vynten ASCII textov vstup.\n msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet zlyhala: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Revoka鋝 certifik嫢 bol vytvoren.\n" @@ -5252,7 +5206,6 @@ msgstr "nezn嫥y ochrann algoritmus\n" msgid "NOTE: This key is not protected!\n" msgstr "POZN簍KA: Tento k詠 nie je chr嫕en!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5331,7 +5284,6 @@ msgstr "chyba: neplatn odtla鋌k\n" msgid "error: no ownertrust value\n" msgstr "chyba: 養adna rove d矏eryhodnosti\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/stamp-po gnupg-1.2.6/po/stamp-po --- gnupg-1.2.5/po/stamp-po 1970-01-01 00:00:00.000000000 +0000 +++ gnupg-1.2.6/po/stamp-po 2004-08-25 14:59:25.000000000 +0000 @@ -0,0 +1 @@ +timestamp diff -urpP gnupg-1.2.5/po/sv.po gnupg-1.2.6/po/sv.po --- gnupg-1.2.5/po/sv.po 2004-07-26 12:26:44.000000000 +0000 +++ gnupg-1.2.6/po/sv.po 2004-08-25 14:59:20.000000000 +0000 @@ -15,13 +15,13 @@ # who sends his thanks to Andr Dahlqvist # and to his wife Olivia . # -# $Id: sv.po,v 1.11.2.16 2004/07/20 14:05:40 werner Exp $ +# $Id: sv.po,v 1.11.2.18 2004/08/13 17:02:21 werner Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" @@ -45,7 +45,6 @@ msgstr "operationen 酺 inte m鐱lig utan msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha anv鄚t fel program f顤 denna uppgift)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ja" @@ -54,7 +53,6 @@ msgstr "ja" msgid "yY" msgstr "jJ" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nej" @@ -63,7 +61,6 @@ msgstr "nej" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "avsluta" @@ -269,7 +266,6 @@ msgstr "inte krypterad" msgid "not processed" msgstr "inte behandlade" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "oanv鄚dbar offentlig (publik) nyckel" @@ -751,19 +747,19 @@ msgstr "|N|anv鄚d komprimeringsalgoritme msgid "throw keyid field of encrypted packets" msgstr "sl鄚g bort nyckelidentitetsf鄟tet fr幩 krypterade paket" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Visa fotoidentifikation" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Visa inte fotoidentifikation" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "S酹t komandoraden f顤 att visa fotoientifikation" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -771,7 +767,7 @@ msgstr "" "@\n" "(Se manualsidan f顤 en komplett lista p alla kommandon och flaggor)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -791,17 +787,17 @@ msgstr "" "--list-keys [namn] visa nycklar\n" "--fingerprint [namn] visa fingeravtryck\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Rapportera g酺na fel till .\n" "Rapportera g酺na fel eller synpunkter p 饘ers酹tningen till .\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Anv鄚dning: gpg [flaggor] [filer] (-h f顤 hj鄟p)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -811,7 +807,7 @@ msgstr "" "signera, kontrollera, kryptera eller dekryptera\n" "vilken operation som utf顤s beror p programmets indata\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -819,180 +815,180 @@ msgstr "" "\n" "St鐰da algoritmer:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 #, fuzzy msgid "Compression: " msgstr "Kommentar: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "anv鄚dning: gpg [flaggor] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "motstridiga kommandon\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "VARNING: %s os鄢er 輍are till %s\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "%s: ny inst鄟lningsfil skapad\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "OBSERVERA: inst鄟lningsfilen \"%s\" anv鄚ds inte\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "OBSERVERA: inst鄟lningsfilen \"%s\" saknas\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "inst鄟lningsfil \"%s\": %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "l酲er flaggor fr幩 \"%s\"\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s 酺 ingen giltig teckentabell\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s: felaktiga importalternativ %d\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "felaktiga importalternativ\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s: felaktiga exportalternativ %d\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "felaktiga exportalternativ\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte s酹ta exec-s闥v輍en till %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s g鄟ler ist鄟let f顤 %s\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBSERVERA: %s 酺 inte f顤 normal anv鄚dning!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 酺 inte till廞en tillsammans med %s!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "det 酺 ingen po鄚g att anv鄚da %s tillsammans med %s!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "du kan bara skapa fr幩kopplade signaturereller klartextsignaturer\n" "tillsammans med --pgp2\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "du kan inte b嶟e signera och kryptera samtidigt tillsammans med --pgp2\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "du m廛te anv鄚da filer (och inte r顤) tillsammans med --pgp2\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "f顤 att kryptera meddelanden med --pgp2 kr銥s IDEA-insticksprogrammet\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "den valda krypteringsalgoritmen 酺 ogiltig\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen 酺 ogiltig\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen 酺 ogiltig\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, fuzzy, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "kompressionsalgoritmen m廛te vara i intervallet %d..%d\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "kompressionsalgoritmen m廛te vara i intervallet %d..%d\n" @@ -1003,201 +999,201 @@ msgstr "kompressionsalgoritmen m廛te var # 酺 鄚d litet. Eventuellt borde meddelandena inte alls # 饘ers酹tas f顤 att g顤a eventuell fels闥ning l酹tare # f顤 internationella fels闥are -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "variabeln \"completes-needed\" m廛te ha ett v酺de som 酺 st顤re 鄚 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "variabeln \"marginals-needed\" m廛te vara st顤re 鄚 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "variabeln \"max-cert-depth\" m廛te ha ett v酺de mellan 1 och 255\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ogiltig standardv酺de f顤 test-niv; m廛te vara 0, 1, 2 eller 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ogiltig standardv酺de f顤 test-niv; m廛te vara 0, 1, 2 eller 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBSERVERA: enkelt S2K-l輍e (0) rekommenderas inte\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ogiltigt S2K-l輍e; m廛te vara 0, 1 eller 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "ogiltiga standardinst鄟lningar\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "felaktiga inst鄟lningar av krypteringsalgoritm\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "felaktiga inst鄟lningar av checksummealgoritm\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "felaktiga inst鄟lningar av kompressionsalgoritm\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "det 酺 ingen po鄚g att anv鄚da %s tillsammans med %s!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "du kan inte anv鄚da %s n酺 du 酺 i %s l輍e\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, fuzzy, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "du kan inte anv鄚da %s n酺 du 酺 i %s l輍e\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "du kan inte anv鄚da %s n酺 du 酺 i %s l輍e\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VARNING: Du har valt mottagare (-r) trots att symetrisk kryptering valts\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [filnamn]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [filnamn]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [filnamn]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [filnamn]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnamn]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [filnamn]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [filnamn]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key anv鄚daridentitet" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key anv鄚daridentitet" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key anv鄚daridentitet" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key anv鄚daridentitet" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key anv鄚daridentitet [kommandon]" # Filnamn b嶟e med och utan fnuttar finns. lite ologiskt. Vill n嶓on # fixa en patch? -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "kan inte 鞿pna %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [anv鄚daridentitet] [nyckelring]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "misslyckades med att uppdatera hemligheten: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "misslyckades med att ta bort skalet: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "misslyckades med att skapa skal: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "felaktig hash-algoritm \"%s\"\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[filnamn]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "Skriv ditt meddelande h酺 ...\n" # se f顤ra kommentaren -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan inte 鞿pna \"%s\"\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1205,20 +1201,20 @@ msgstr "" "ett notationsnamn kan bara inneh嶚la bokst銥er, siffror, punkter eller\n" "understrykningstecken och sluta med ett likhetstecken\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "ett notationsv酺de f緳 inte ineh嶚la n嶓ra kontrolltecken\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "ett notationsv酺de f緳 inte ineh嶚la n嶓ra kontrolltecken\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "den angivna URL som beskriver certifikationspolicy 酺 ogiltig\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "den angivna URL som beskriver signaturpolicy 酺 ogiltig\n" @@ -1349,7 +1345,6 @@ msgstr "Anledning till sp酺ren: " msgid "revocation comment: " msgstr "Sp酺rkommentar: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "" @@ -1410,7 +1405,6 @@ msgstr " %d = Jag litar fullst鄚digt p msgid " %d = I trust ultimately\n" msgstr " %d = Jag litar helt och h嶚let p denna anv鄚dare\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = visa mer information\n" @@ -1730,14 +1724,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "nyckelstorleken 酺 f顤 liten; 768 酺 det minsta till廞na v酺det.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1824,7 +1810,6 @@ msgstr "ogiltigt v酺de\n" msgid "%s does not expire at all\n" msgstr "Giltighetstiden f顤 %s g緳 aldrig ut\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2151,7 +2136,6 @@ msgstr "nyckeln %08lX 酺 inte skyddad - msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - 饘erhoppad\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2165,9 +2149,7 @@ msgstr "VARNING: exporterade ingenting\n msgid "too many entries in pk cache - disabled\n" msgstr "f顤 m幩ga poster i pk-cachen - inaktiverad\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Hittade inte anv鄚daridentiteten]" @@ -2404,7 +2386,6 @@ msgstr "ingen f顤vald publik nyckel\n" msgid "key %08lX: secret key imported\n" msgstr "nyckel %08lX: den hemliga nyckeln 酺 importerad\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2644,8 +2625,6 @@ msgid "Do you want to issue a new signat msgstr "" "Vill du att giltighetstiden f顤 signaturen ska upph顤a vid samma tid? (J/n) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -3006,7 +2985,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "ta bort en anv鄚daridentitet" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "ta bort bild" @@ -3311,8 +3289,6 @@ msgstr "VARNING: Denna nyckel har sp酺ra msgid " (sensitive)" msgstr " (k鄚sligt)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3438,9 +3414,6 @@ msgstr "Ange ID f顤 霵skad sp酺rnyckel" msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Det g緳 inte att anv鄚da en PGP 2-nyckel som sp酺rnyckel\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Du kan inte ange en nyckel som sin egen sp酺rnyckel\n" @@ -3538,7 +3511,6 @@ msgstr "" "Vill du skapa ett sp酺rcertifikat (revocation certificate) f顤 denna " "signatur? (j/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Du har signerat f闤jande anv鄚daridentiteter:\n" @@ -3580,10 +3552,6 @@ msgstr "ingen hemlig nyckel\n" msgid "user ID \"%s\" is already revoked\n" msgstr "Anv鄚dar-ID \"%s\" 酺 sp酺rat." -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3651,7 +3619,6 @@ msgstr " Fingeravtryck:" msgid " Subkey fingerprint:" msgstr " Fingeravtryck:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 #, fuzzy msgid " Key fingerprint =" @@ -3662,8 +3629,6 @@ msgstr " Fingeravtryck:" msgid "weird size for an encrypted session key (%d)\n" msgstr "" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3789,7 +3754,6 @@ msgstr "Policy: " msgid "signature verification suppressed\n" msgstr "signaturen verifierades inte\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "kan inte hantera dessa multipla signaturer\n" @@ -3799,10 +3763,6 @@ msgstr "kan inte hantera dessa multipla msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signerades %.*s med hj鄟p av %s-nyckeln med ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3969,7 +3929,7 @@ msgstr "milj饘ariabeln GPG_AGENT_INFO 酺 msgid "gpg-agent protocol version %d is not supported\n" msgstr "skyddsalgoritmen %d st鐰s inte\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan inte ansluta till \"%s\": %s\n" @@ -3978,12 +3938,12 @@ msgstr "kan inte ansluta till \"%s\": %s msgid "communication problem with gpg-agent\n" msgstr "problem vid kommunikation med GPG-Agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 #, fuzzy msgid "problem with the agent - disabling agent use\n" msgstr "problem med agenten: agenten returnerar 0x%lx\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (huvudnyckelns identitet %08lX)" @@ -4015,16 +3975,16 @@ msgstr "l飉enmeningen 酺 f顤 l幩g\n" msgid "invalid response from agent\n" msgstr "felaktigt svar fr幩 agenten\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "avbruten av anv鄚daren\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem med agenten: agenten returnerar 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4034,20 +3994,20 @@ msgstr "" "Du beh饘er en l飉enmening f顤 att l廛a upp den hemliga nyckeln f顤\n" "anv鄚daren: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "kan inte fr嶓a efter l飉enmening i batch-l輍e\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Ange l飉enmening: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repetera l飉enmeningen: " @@ -4114,41 +4074,41 @@ msgstr "OBSERVERA: den hemliga nyckeln % msgid "NOTE: key has been revoked" msgstr "nyckeln %08lX: nyckeln har sp酺rats!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "fr嶓a efter nyckeln %08lX fr幩 %s ...\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "kan inte h鄝ta nyckeln fr幩 en nyckelserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "fel vid s鄚dning till \"%s\": %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "lyckades s鄚da till \"%s\" (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "misslyckades s鄚da till \"%s\": status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, fuzzy, c-format msgid "can't search keyserver: %s\n" msgstr "kan inte h鄝ta nyckeln fr幩 en nyckelserver: %s\n" @@ -4583,9 +4543,6 @@ msgstr "" "Hittar inte den offentliga (publika) nyckeln tillh顤ande den ultimat " "betrodda nyckeln %08lX \n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4635,7 +4592,6 @@ msgstr "" "hoppade 饘er \"%s\": detta 酺 en nyckel av ElGamal-typ genererad av PGP\n" "som inte 酺 s鄢er f顤 signaturer!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4705,7 +4661,7 @@ msgstr "" "kan inte undvika en svag nyckel f顤 symmetrisk kryptering; f顤s闥te\n" "%d g幩ger!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA kr銥er att du anv鄚der en 160-bitars hash-algoritm\n" @@ -5117,17 +5073,17 @@ msgstr "Det finns ingen hj鄟p tillg鄚gli msgid "No help available for `%s'" msgstr "Det finns ingen hj鄟p tillg鄚glig f顤 \"%s\"" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "fel vid skapande av nyckelringen \"%s\": %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "%s: nyckelring skapad\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "misslyckades med att 廞erskapa nyckelringscache: %s\n" @@ -5228,7 +5184,6 @@ msgstr "" msgid "this platform requires temp files when calling external programs\n" msgstr "" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, fuzzy, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5311,7 +5266,6 @@ msgstr "" msgid "make_keysig_packet failed: %s\n" msgstr "misslyckades med att uppdatera hemligheten: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 #, fuzzy msgid "Revocation certificate created.\n" @@ -5346,7 +5300,6 @@ msgstr "ok鄚d komprimeringsalgoritm" msgid "NOTE: This key is not protected!\n" msgstr "Denna nyckel 酺 inte skyddad.\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5423,7 +5376,6 @@ msgstr "%s: ogiltig filversion %d\n" msgid "error: no ownertrust value\n" msgstr "exportera de v酺den som representerar 輍artillit" -#. error #: g10/tdbdump.c:204 #, fuzzy, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/tr.po gnupg-1.2.6/po/tr.po --- gnupg-1.2.5/po/tr.po 2004-07-26 12:26:45.000000000 +0000 +++ gnupg-1.2.6/po/tr.po 2004-08-25 14:59:21.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-07-08 08:10+0300\n" "Last-Translator: Nilg羹n Belma Bug羹ner \n" "Language-Team: Turkish \n" @@ -34,7 +34,6 @@ msgstr "g羹venli bellek haz覺rlanmadan i msgid "(you may have used the wrong program for this task)\n" msgstr "(bu g繹rev i癟in yanl覺 program kullanm覺 olabilirsiniz)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "evet" @@ -43,7 +42,6 @@ msgstr "evet" msgid "yY" msgstr "eE" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "hay覺r" @@ -52,7 +50,6 @@ msgstr "hay覺r" msgid "nN" msgstr "hH" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit" @@ -257,7 +254,6 @@ msgstr "ifrelenemedi" msgid "not processed" msgstr "ilenemedi" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "genel anahtar kullan覺md覺覺" @@ -739,19 +735,19 @@ msgstr "|N|s覺k覺t覺rma algoritmas覺 o msgid "throw keyid field of encrypted packets" msgstr "ifreli paketlerin anahtar-kimlik alanlar覺n覺 atar" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "Foto kimliklerini g繹sterir" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "Foto kimliklerini g繹stermez" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "Komut sat覺r覺n覺 foto kimliklerini g繹stermeye ayarlar" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -759,7 +755,7 @@ msgstr "" "@\n" "(T羹m komut ve se癟eneklerin komple listesi i癟in man sayfalar覺na bak覺n)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -779,15 +775,15 @@ msgstr "" " --list-keys [isimler] anahtarlar覺 listeler\n" " --fingerprint [isimler] parmak izlerini g繹sterir\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "Yaz覺l覺m hatalar覺n覺 l羹tfen adresine bildirin.\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Kullan覺m覺: gpg [se癟enekler] [dosyalar] (yard覺m i癟in -h)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -797,7 +793,7 @@ msgstr "" "imzalama, kontrol, ifreleme veya 癟繹zme\n" "繹ntan覺ml覺 ilem girilen veriye ba覺ml覺d覺r\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -805,369 +801,369 @@ msgstr "" "\n" "Desteklenen algoritmalar:\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "GenAnah: " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "ifre: " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "S覺k覺t覺rma: " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "kullan覺m覺: gpg [se癟enekler] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "癟elien komutlar\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "grup tan覺m覺 \"%s\" i癟inde = iareti yok\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" i癟in g羹vensiz iyelik\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" de g羹vensiz izinler\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" de g羹vensiz ilitirilen dizin iyelii\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "UYARI: %s \"%s\" de g羹vensiz ilitirilen dizin izinleri\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "bilinmeyen yap覺land覺rma 繹esi \"%s\"\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "B襤LG襤: eski 繹ntan覺ml覺 se癟enekler dosyas覺 `%s' yoksay覺ld覺\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "B襤LG襤: \"%s\" 繹ntan覺ml覺 se癟enek dosyas覺 yok\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "se癟enek dosyas覺 \"%s\": %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "\"%s\"den se癟enekler okunuyor\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "ifre uzant覺s覺 \"%s\" g羹vensiz izinlerden dolay覺 y羹klenmedi\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ge癟erli bir karakter seti deil\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "anahtar sunucusunun adresi 癟繹z羹mlenemedi\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ge癟ersiz i癟selletirme se癟enekleri\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "i癟selletirme se癟enekleri ge癟ersiz\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d ge癟ersiz d覺sallat覺rma se癟enekleri\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "d覺sallat覺rma se癟enekleri ge癟ersiz\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "癟al覺t覺r覺labilirlerin patikas覺 %s yap覺lam覺yor\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "UYARI: program bir \"core\" dosyas覺 oluturabilir!\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "UYARI: %s %s'i a覺yor\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "B襤LG襤: %s normal kullan覺m i癟in deil!\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ile %s birlikte kullan覺lmaz!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s, %s ile etkisiz olur!\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2 kipinde sadece ayr覺k veya sade imzalar yapabilirsiniz\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 kipinde ayn覺 anda hem imzalama hem de ifreleme yapamazs覺n覺z\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 ile 癟al覺覺rken veri yolu yerine dosyalar覺 kullanmal覺s覺n覺z.\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2 kipinde ileti ifrelemesi IDEA ifresi gerektirir\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "se癟ilen ifre algoritmas覺 ge癟ersiz\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "se癟ilen 繹z羹mleme algoritmas覺 ge癟ersiz\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "se癟ilen sertifikalama 繹z羹mleme algoritmas覺 ge癟ersiz\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "bu da覺t覺mda s覺k覺t覺rma algoritmas覺 %s salt-okunurdur\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "s覺k覺t覺rma algoritmas覺 %d..%d aral覺覺nda olmal覺\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "\"completes-needed\" 0 dan b羹y羹k olmal覺\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "\"marginals-needed\" 1 den b羹y羹k olmal覺\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "\"max-cert-depth\" 1 ile 255 aras覺nda olmal覺\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "繹ntan覺ml覺 sertifika seviyesi ge癟ersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "asgari sertifika seviyesi ge癟ersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "B襤LG襤: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K kipi ge癟ersiz; 0, 1 veya 3 olmal覺\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "繹ntan覺ml覺 tercihler ge癟ersiz\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "kiisel ifre tercihleri ge癟ersiz\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "kiisel 繹z羹mleme tercihleri ge癟ersiz\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "kiisel s覺k覺t覺rma tercihleri ge癟ersiz\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s hen羹z %s ile 癟al覺m覺yor\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "%2$s kipindeyken %1$s ifreleme algoritmas覺 kullan覺lamayabilir.\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "%2$s kipindeyken %1$s 繹z羹mleme algoritmas覺 kullan覺lamayabilir.\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "%2$s kipindeyken %1$s s覺k覺t覺rma algoritmas覺 kullan覺lamayabilir.\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "\"TrustDB\" g羹vence veritaban覺 balang覺癟 aamas覺nda baar覺s覺z: %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "UYARI: al覺c覺lar (-r) genel anahtar ifrelemesi kullan覺lmadan belirtilmi\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [dosyaismi]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [dosyaismi]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [dosyaismi]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [dosyaismi]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [DOSYA]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [dosyaismi]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [dosyaismi]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key kullan覺c覺-kimlii" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key kullan覺c覺-kimlii" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key KULL-KML" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key KULL-KML" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key kullan覺c覺-kimlii [komutlar]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "%s a癟覺lamad覺: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kullan覺c覺-kimlii] [anahtar-zinciri]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send baar覺s覺zl覺a urad覺: %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive baar覺s覺zl覺a urad覺: %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "key export baar覺s覺zl覺a urad覺: %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search baar覺s覺zl覺a urad覺: %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh baar覺s覺z: %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "z覺rh覺n kald覺r覺lmas覺 baar覺s覺z: %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "z覺rhlama baar覺s覺z: %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "`%s' hash algoritmas覺 ge癟ersiz\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[dosyaismi]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "襤letinizi yaz覺n ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "`%s' a癟覺lamad覺\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1175,19 +1171,19 @@ msgstr "" "bir niteleme ismi sadece harfler, rakamlar ve alt癟izgiler i癟erebilir ve " "sonuna bir '=' gelir.\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "bir kullan覺c覺 niteleme ismi '@' karakteri i癟ermeli\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "bir niteleme deerinde kontrol karakterleri kullan覺lamaz\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "belirtilen sertifika g羹vence adresi ge癟ersiz\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "belirtilen imza g羹vence adresi ge癟ersiz\n" @@ -1314,7 +1310,6 @@ msgstr "y羹r羹rl羹kten kald覺rma sebebi: msgid "revocation comment: " msgstr "y羹r羹rl羹kten kald覺rma a癟覺klamas覺: " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "bBmMaAkK" @@ -1369,7 +1364,6 @@ msgstr " %d = Tamamen g羹veniyorum\n" msgid " %d = I trust ultimately\n" msgstr " %d = Son derece g羹veniyorum\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " b = Daha fazla bilgi gerekli\n" @@ -1686,14 +1680,6 @@ msgstr "" msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "anahtar uzunluu 癟ok k羹癟羹k; en k羹癟羹k anahtar uzunluu 768 bit'tir.\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1778,7 +1764,6 @@ msgstr "deer hatal覺\n" msgid "%s does not expire at all\n" msgstr "%s hep ge癟erli olacak\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2107,7 +2092,6 @@ msgstr "%08lX anahtar覺: korunmam覺 - msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "%08lX anahtar覺: PGP 2.x tarz覺 bir anahtar - atland覺\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2121,9 +2105,7 @@ msgstr "UYARI: hi癟bir ey d覺ar覺 ak msgid "too many entries in pk cache - disabled\n" msgstr "pk belleinde 癟ok fazla girdi - iptal edildi\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[Kullan覺c覺 kimlii bulunamad覺]" @@ -2355,7 +2337,6 @@ msgstr "繹ntan覺ml覺 gizli anahtar zinci msgid "key %08lX: secret key imported\n" msgstr "anahtar %08lX: gizli anahtar indirildi\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2600,8 +2581,6 @@ msgid "Do you want to issue a new signat msgstr "" "Yeni imzan覺z覺n s羹resi dolmu biriyle deitirilmesini ister misiniz? (e/H) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2956,7 +2935,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "kullan覺c覺 kimliini siler" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3257,8 +3235,6 @@ msgstr "" msgid " (sensitive)" msgstr " (duyarl覺)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3391,9 +3367,6 @@ msgstr "" "bir PGP 2.x tarz覺 anahtar bir tasarlanm覺 y羹r羹rl羹kten kald覺rma anahtar覺 " "olarak atanamaz\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" @@ -3492,7 +3465,6 @@ msgid "Create a revocation certificate f msgstr "" "Bu imza i癟in bir y羹r羹rl羹kten kald覺rma sertifikas覺 oluturulsun mu? (e/H) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "Bu kullan覺c覺 kimliklerini imzalam覺s覺n覺z:\n" @@ -3534,10 +3506,6 @@ msgstr "gizli anahtar yok\n" msgid "user ID \"%s\" is already revoked\n" msgstr "kullan覺c覺 kimlii \"%s\" zaten iptal edilmiti\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3603,7 +3571,6 @@ msgstr "Birincil anahtar parmak izi:" msgid " Subkey fingerprint:" msgstr "Yard覺mc覺 anahtar parmak izi:" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " Anahtar parmak izi =" @@ -3613,8 +3580,6 @@ msgstr " Anahtar parmak izi =" msgid "weird size for an encrypted session key (%d)\n" msgstr "bir ifreli oturum anahtar覺 (%d) i癟in tuhaf uzunluk\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3729,7 +3694,6 @@ msgstr "G羹vence: " msgid "signature verification suppressed\n" msgstr "imza dorulama engellendi\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "bu 癟oklu imzalar elde edilemiyor\n" @@ -3739,10 +3703,6 @@ msgstr "bu 癟oklu imzalar elde edilemiyo msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "%.*s imzas覺, %s anahtar覺 ve %08lX kullan覺c覺 kimlii ile yap覺lm覺\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "Anahtar burada: " @@ -3906,7 +3866,7 @@ msgstr "GPG_AGENT_INFO 癟evre deiken msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol羹 s羹r羹m %d desteklenmiyor\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "\"%s\" sunucusuna balan覺lamad覺: %s\n" @@ -3915,11 +3875,11 @@ msgstr "\"%s\" sunucusuna balan覺lamad msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ile haberleme problemi\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "vekil ile problem - vekil kullan覺m覺 iptal ediliyor\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (as覺l anahtar kimlii %08lX)" @@ -3951,16 +3911,16 @@ msgstr "Parola 癟ok uzun\n" msgid "invalid response from agent\n" msgstr "yan覺t ge癟ersiz\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "kullan覺c覺 taraf覺ndan durduruldu\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "vekil ile sorun var: vekil 0x%lx ile sonu癟land覺\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3970,22 +3930,22 @@ msgstr "" "Gizli anahtar覺n kilidini a癟mak i癟in bir anahtar parolas覺na ihtiyac覺n覺z var.\n" "Anahtar覺n sahibi: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" "%u bitlik %s anahtar覺, %08lX kimlii ile\n" "%s tarihinde 羹retilmi" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "繹nceden tan覺mlanm覺 ilemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Anahtar parolas覺n覺 girin: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Tekrar: " @@ -4051,41 +4011,41 @@ msgstr "B襤LG襤: %08lX gizli anahtar覺n msgid "NOTE: key has been revoked" msgstr "B襤LG襤: anahtar y羹r羹rl羹kten kald覺r覺lm覺t覺" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "%08lX anahtar覺 %s adresinden isteniyor\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "anahtar sunucusunun %s adresinden anahtar al覺namad覺\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "\"%s\" adresine g繹nderme hatas覺: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "\"%s\" adresine g繹nderme ilemi baar覺l覺 (durum=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "\"%s\" adresine g繹nderme ilemi baar覺s覺z (durum=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "bu anahtar sunucusu --search-keys se癟eneini desteklemiyor\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aran覺yor\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "anahtar sunucusu aranam覺yor: %s\n" @@ -4512,9 +4472,6 @@ msgstr "son derece g羹venli bir anahtar msgid "public key of ultimately trusted key %08lX not found\n" msgstr "son derece g羹venli %08lX genel anahtar覺 yok\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4564,7 +4521,6 @@ msgstr "" "`%s' atland覺:\n" "Bu, imzalar i癟in g羹venli olmayan PGP 羹retimi bir ElGamal anahtar覺!\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4633,7 +4589,7 @@ msgstr "" "simetrik ifre i癟in zay覺f anahtar覺n 繹nlenmesi m羹mk羹n olamad覺: %d kere " "denendi!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA, 160 bitlik bir hash algoritmas覺 kullan覺lmas覺n覺 gerektiriyor\n" @@ -5023,17 +4979,17 @@ msgstr "yard覺m mevcut deil" msgid "No help available for `%s'" msgstr "\"%s\" i癟in yard覺m mevcut deil" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "`%s' anahtar zinciri oluturulurken hata: %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "`%s' anahtar zinciri oluturuldu\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "anahtar zinciri bellei yeniden oluturulurken hata: %s\n" @@ -5138,7 +5094,6 @@ msgid "this platform requires temp files msgstr "" "bu platformda, d覺 uygulamalar 癟al覺t覺r覺l覺rken ge癟ici dosyalar gerekiyor\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5216,7 +5171,6 @@ msgstr "ASCII z覺rhl覺 癟覺kt覺 istendi. msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet baar覺s覺z: %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "Y羹r羹rl羹kten kald覺rma sertifikas覺 羹retildi.\n" @@ -5248,7 +5202,6 @@ msgstr "bilinmeyen s覺k覺t覺rma algori msgid "NOTE: This key is not protected!\n" msgstr "B襤LG襤: Bu anahtar korunmam覺!\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5328,7 +5281,6 @@ msgstr "hata: parmakizi ge癟ersiz\n" msgid "error: no ownertrust value\n" msgstr "hata: hi癟 sahibining羹vencesi deeri yok\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/zh_CN.po gnupg-1.2.6/po/zh_CN.po --- gnupg-1.2.5/po/zh_CN.po 2004-07-26 12:26:45.000000000 +0000 +++ gnupg-1.2.6/po/zh_CN.po 2004-08-25 14:59:21.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2004-07-20 15:50+0200\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -31,7 +31,6 @@ msgstr "假孩痟禜斑巏撒砠炬酸傰靇赲椕贕n msgid "(you may have used the wrong program for this task)\n" msgstr "(蠟褫夔妏蚚賸渣昫腔最唗懂俇傖森砐恄)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "yes" @@ -40,7 +39,6 @@ msgstr "yes" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no" @@ -49,7 +47,6 @@ msgstr "no" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit" @@ -254,7 +251,6 @@ msgstr "帤掩樓躇" msgid "not processed" msgstr "帤掩揭燴" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "祥褫蚚腔鼠埥" @@ -731,19 +727,19 @@ msgstr "|N|妏蚚菴 N 瘍揤坫呾楊" msgid "throw keyid field of encrypted packets" msgstr "祥蔚彶璃刱興袟髒蚧趧蚚黹笢" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "珆尨桽え梓妎" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "祥珆尨桽え梓妎" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "扢隅脤艘桽え梓妎奀妏蚚腔韜鍔俴" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -751,7 +747,7 @@ msgstr "" "@\n" "(③統蕉婓盄佽隴眕鳳腕垀衄韜鍔睿恁砐腔俇淕ь等)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -771,15 +767,15 @@ msgstr "" " --list-keys [議樅] 珆尨躇埥\n" " --fingerprint [議樅] 珆尨硌恇\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "③砃 惆豢最唗救搳αn" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "蚚楊ㄩ gpg [恁砐] [恅璃] (蚚 -h ⑴翑)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -789,7 +785,7 @@ msgstr "" "ワ趼﹜潰脤﹜樓躇麼賤躇\n" "蘇炵觸椕壨檄靿輮擂奧隅\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -797,386 +793,386 @@ msgstr "" "\n" "盓厥腔呾楊ㄩ\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "鼠埥ㄩ" -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "勤備樓躇ㄩ" -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "汃蹈ㄩ" -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "揤坫ㄩ" -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "蚚楊ㄩgpg [恁砐] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "喳芼腔硌鍔\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "婓※%s§郪隅砱爵梑祥善脹瘍(=)\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "劑豢ㄩ%s 腔垀衄迆趕笮哄%s§\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "劑豢ㄩ%s 腔使瑊趕笮哄%s§\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "劑豢ㄩ%s 腔壽敕醴翹垀衄迆趕笮哄%s§\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "劑豢ㄩ%s 腔壽敕醴翹使瑊趕笮哄%s§\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "帤眭腔饜离砐※%s§\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "蛁砩ㄩ導宒腔蘇狣馺襞躁＆%s＊眒掩綺謹\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "蛁砩ㄩ羶衄蘇狣馺襞躁＆%s＊\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "饜离恅璃＆%s＊ㄩ%s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "植＆%s＊黍×＋螰n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "勤備樓呾躇楊孺桯耀輸※%s§秪峈使瑊趕笮奎靆敢閩媩螏n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s 祥岆珨跺衄虴腔趼睫摩\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "拸楊賤昴鼠埥督昢ん URI\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%sㄩ%dㄩ拸虴腔絳遹＋螰n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "拸虴腔絳遹＋螰n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%sㄩ%dㄩ拸虴腔絳堤恁砐\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "拸虴腔絳堤恁砐\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "拸楊參堍俴繚噤扢傖 %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "劑豢ㄩ最唗褫夔頗斐膘瞄陑囀湔蛌揣ㄐ\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "劑豢ㄩ%s 頗妏腕 %s 囮虴\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "蛁砩ㄩ珨啜①錶狟祥頗蚚善 %sㄐ\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 祥褫迵 %s 甜蚚\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 迵 %s 甜蚚拸砩砱ㄐ\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "蠟硐衄婓 --pgp2 耀宒狟符夔酕煦燭宒麼隴恅ワ趼\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "蠟婓 --pgp2 耀宒狟奀ㄛ祥夔肮奀ワ趼睿樓躇\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "ゐ蚚 --pgp2 奀蠟茼蜆硐妏蚚恅璃ㄛ奧準奪耋\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "婓 --pgp2 耀宒狟樓躇惆恅剒猁 IDEA 呾楊\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "垀恁腔勤備樓躇呾楊拸虴\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "垀恁腔汃蹈呾楊拸虴\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "垀恁腔痐抎汃蹈呾楊拸虴\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "＆%s＊揤坫呾楊婓掛楷俴唳掛笢硐黍\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "揤坫呾楊珨隅猁賡衾 %d 善 %d 眳潔\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "剒猁腔俇姪奾龔抿窐珨隅猁湮衾 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "剒猁腔辭Ч褫陓ワ趼杅珨隅猁湮衾 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "郔湮珋升貕珨隅猁賡衾 1 睿 255 眳潔\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "拸虴腔蘇珇橠仆蒮峉閡辣例羌 0ㄛ1ㄛ2 麼 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "拸虴腔郔苤桄痐脯棒˙珨隅猁岆 0ㄛ1ㄛ2 麼 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "蛁砩ㄩЧ轄祥膘祜妏蚚潠等腔 S2K 耀宒(0)\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "拸虴腔 S2K 耀宒˙斛剕岆 0ㄛ1 麼 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "拸虴腔蘇珅豽＋螰n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "拸虴腔跺侀堀じ蚚嗛蒴京豽＋螰n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "拸虴腔跺侂Ⅸ倓蒴京豽＋螰n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "拸虴腔跺刲嘈廱蒴京豽＋螰n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 醴ヶ拸楊迵 %s 甜蚚\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "蠟祥蜆蔚勤備樓躇呾楊※%s§蚚衾 %s 耀宒笢\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "蠟祥蜆蔚汃蹈呾楊※%s§蚚衾 %s 耀宒笢\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "蠟祥蜆蔚揤坫呾楊※%s§蚚衾 %s 耀宒笢\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "場宎趙陓庤杅擂踱囮啖ㄩ%s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "劑豢ㄩ跤隅賸彶璃(-r)筍甜帤妏蚚鼠埥樓躇\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [恅璃靡]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [恅璃靡]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [恅璃靡]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [恅璃靡]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [恅璃靡]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [恅璃靡]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [恅璃靡]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [恅璃靡]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key 蚚誧梓妎" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key 蚚誧梓妎" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key 蚚誧梓妎" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key 蚚誧梓妎" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key 蚚誧梓妎 [硌鍔]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "拸楊湖羲 %sㄩ%s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [蚚誧梓妎] [埥啻遠]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" msgstr "拸楊楷冞善鼠埥督昢んㄩ%s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" msgstr "拸楊植鼠埥督昢ん諉彶ㄩ%s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" msgstr "拸楊絳堤躇埥ㄩ%s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" msgstr "拸楊婓鼠埥督昢ん奻刲坰ㄩ%s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "拸楊植鼠埥督昢ん奻載陔ㄩ%s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "賤羲 ASCII 猾蚾囮啖ㄩ%s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "輛俴 ASCII 猾蚾囮啖ㄩ%s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "拸虴腔＆%s＊汃蹈呾楊\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[恅璃靡]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "③羲宎瑩踽腔惆恅＃＃\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "拸楊湖羲＆%s＊\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "梓暮靡備斛剕硐漪衄褫湖荂腔趼睫麼諾跡ㄛ甜眕珨跺※=§懂賦帣\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "蚚誧梓暮靡備珨隅猁漪衄※@§趼睫\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "梓暮硉珨隅祥夔妏蚚庥庰醴寎び硊\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "跤隅腔腔珋仆葺 URL 拸虴\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "跤隅腔ワ趼習謹 URL 拸虴\n" @@ -1302,7 +1298,6 @@ msgid "revocation comment: " msgstr "裂种蛁庋ㄩ" # a string with valid answers -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1356,7 +1351,6 @@ msgstr " %d = 扂俇峒囌垥n" msgid " %d = I trust ultimately\n" msgstr " %d = 扂橈勤陓垥n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = ③豢咂扂載嗣陓洘\n" @@ -1665,14 +1659,6 @@ msgstr "躇埥喜渡怮苤ㄩRSA 躇埥喜渡祫屾猁 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "躇埥喜渡怮苤˙祫屾猁衄 768﹝\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1755,7 +1741,6 @@ msgstr "拸虴腔杅硉\n" msgid "%s does not expire at all\n" msgstr "%s 蚗堈祥頗徹ぶ\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2069,7 +2054,6 @@ msgid "key %08lX: PGP 2.x style key - sk msgstr "躇埥 %08lXㄩPGP 2.x 欴宒腔躇埥〞〞眒泐徹\n" # I hope this warning doesn't confuse people. -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2083,9 +2067,7 @@ msgstr "劑豢ㄩ羶衄絳堤庥庤屋贕n" msgid "too many entries in pk cache - disabled\n" msgstr "pk 遣湔爵砐醴怮嗣〞〞眒輦蚚\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[梑祥善蚚誧梓妎]" @@ -2313,7 +2295,6 @@ msgstr "羶衄蘇炵騰諂諮興袘楠 %s\n" msgid "key %08lX: secret key imported\n" msgstr "躇埥 %08lXㄩ佌埥眒絳螏n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2548,8 +2529,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "蠟砑猁楷票珨爺陔腔ワ趼懂●眒徹ぶ腔饒珨跺鎘ˋ(y/N)" -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2901,7 +2880,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "刉壺珨跺蚚誧/桽え梓妎" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3199,8 +3177,6 @@ msgstr "涴參躇埥褫掩森 %s 躇埥裂种ㄩ" msgid " (sensitive)" msgstr " (鏗覜腔)" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3329,9 +3305,6 @@ msgstr "拸楊蔚 PGP 2.x 欴宒腔躇埥扢峈硌 # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "蠟祥夔蔚議參躇埥扢峈坳赻撩腔硌隅裂种氪\n" @@ -3423,7 +3396,6 @@ msgstr "蠟毓乖埱銨遻玥櫼坳鎘ˋ(y/N)" msgid "Create a revocation certificate for this signature? (y/N) " msgstr "猁峈涴爺ワ趼汜傖珨爺裂种痐抎鎘ˋ(y/N)" -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "蠟眒冪峈涴虳蚚誧梓妎氝樓ワ趼ㄩ\n" @@ -3464,10 +3436,6 @@ msgstr "羶衄佌埥\n" msgid "user ID \"%s\" is already revoked\n" msgstr "蚚誧梓妎※%s§眒冪掩裂种﹝\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3533,7 +3501,6 @@ msgid " Subkey fingerprint:" msgstr " 赽埥硌恇ㄩ" # use tty -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " 躇埥硌恇 =" @@ -3543,8 +3510,6 @@ msgstr " 躇埥硌恇 =" msgid "weird size for an encrypted session key (%d)\n" msgstr "樓躇徹腔頗趕躇埥喜渡(%d)察祑\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3655,7 +3620,6 @@ msgstr "習謹ㄩ" msgid "signature verification suppressed\n" msgstr "ワ趼桄痐眒掩眚秶\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "拸楊揭燴涴虳嗣笭ワ趼\n" @@ -3665,10 +3629,6 @@ msgstr "拸楊揭燴涴虳嗣笭ワ趼\n" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "衾 %.*s 膘蕾腔ワ趼ㄛ妏蚚 %sㄛ埥啻瘍 %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 msgid "Key available at: " msgstr "鼠埥褫＝啥" @@ -3828,7 +3788,7 @@ msgstr "GPG_AGENT_INFO 遠噫曹講跡宒渣昫\ msgid "gpg-agent protocol version %d is not supported\n" msgstr "祥盓厥 gpg-agent 衪祜唳掛 %d\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "拸楊蟀諉祫＆%s＊ㄩ%s\n" @@ -3837,11 +3797,11 @@ msgstr "拸楊蟀諉祫＆%s＊ㄩ%s\n" msgid "communication problem with gpg-agent\n" msgstr "迵 gpg-agent 籵捅衄恀枙\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "測燴最唗腔恀枙〞〞淏婓礿蚚測燴最唗\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "(翋埥啻瘍 %08lX)" @@ -3873,16 +3833,16 @@ msgstr "躇鎢怮酗\n" msgid "invalid response from agent\n" msgstr "測燴最唗砒茼拸虴\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "蚚誧＋\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "測燴最唗腔恀枙ㄩ測燴最唗殿隙 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3892,20 +3852,20 @@ msgstr "" "蠟剒猁狟蹈妏蚚氪腔躇鎢ㄛ符夔賤羲佌埥ㄩ\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u 趼誹腔 %s 躇埥ㄛ埥啻瘍 %08lXㄛ膘蕾衾 %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "婓蠶揭燴耀宒笢拸楊戙恀躇鎢\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "③怀踼僉諴" -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "③婬怀遻輕恞僉諴" @@ -3971,41 +3931,41 @@ msgstr "蛁砩ㄩ佌埥 %08lX 眒衾 %s 徹ぶ\n" msgid "NOTE: key has been revoked" msgstr "蛁砩ㄩ躇埥眒掩裂种" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "淏婓脤戙躇埥 %08lXㄛ懂赻 %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "拸楊植鼠埥督昢ん△藤嗩縛 %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "奻換善＆%s＊腔奀緊楷汜渣昫ㄩ%s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "傖髡奻換祫＆%s＊(袨怓 = %u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "奻換善＆%s＊囮啖ㄩ袨怓 = %u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "森鼠埥督昢ん祥盓厥 --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "淏婓刲扆※%s§ㄛ婓 HKP 督昢ん %s 奻\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "拸楊刲扆鼠埥督昢んㄩ%s\n" @@ -4410,9 +4370,6 @@ msgstr "羶衄梑善庥徆禷婕囌庰鏽嗩璞n" msgid "public key of ultimately trusted key %08lX not found\n" msgstr "橈勤陓庰鏽嗩 %08lX 腔鼠埥帤掩梑善\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4458,7 +4415,6 @@ msgid "" "signatures!\n" msgstr "＆%s＊眒泐徹ㄩ涴岆珨參蚕 PGP 汜傖腔 ElGamal 躇埥ㄛ蚚衾ワ趼祥假咯﹏n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4524,7 +4480,7 @@ msgstr "膘蕾賸劗嗩縑炕肪婓笭彸\n" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "勤備樓躇拸楊旌轎汜傖劗嗩縛閡挩韋〨 %d 棒ㄐ\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA 猁⑴妏蚚 160 趼誹腔汃蹈呾楊\n" @@ -4905,17 +4861,17 @@ msgstr "羶衄褫蚚腔堆翑" msgid "No help available for `%s'" msgstr "＆%s＊羶衄褫蚚腔堆翑" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "膘蕾埥啻遠＆%s＊奀楷汜渣昫ㄩ%s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "埥啻遠＆%s＊眒膘蕾\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "笭陔膘蕾埥啻遠遣湔囮啖ㄩ %s\n" @@ -5017,7 +4973,6 @@ msgstr "蚕衾饜离恅璃使瑊趕笮咯疤漜興昐 msgid "this platform requires temp files when calling external programs\n" msgstr "婓涴跺紱釬す怢奻覃蚚俋窒最唗奀剒猁還奀恅璃\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5095,7 +5050,6 @@ msgstr "眒Ч俴妏蚚 ASCII 猾蚾徹腔怀堤﹝\ msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 囮啖ㄩ %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "眒膘蕾裂种痐抎﹝\n" @@ -5127,7 +5081,6 @@ msgstr "帤眭腔悵誘呾楊\n" msgid "NOTE: This key is not protected!\n" msgstr "蛁砩ㄩ涴參躇埥羶衄掩悵誘ㄐ\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5207,7 +5160,6 @@ msgstr "渣昫ㄩ拸虴腔硌恇\n" msgid "error: no ownertrust value\n" msgstr "渣昫ㄩ羶衄陓庤\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/po/zh_TW.po gnupg-1.2.6/po/zh_TW.po --- gnupg-1.2.5/po/zh_TW.po 2004-07-26 12:26:45.000000000 +0000 +++ gnupg-1.2.6/po/zh_TW.po 2004-08-25 14:59:21.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-26 14:26+0200\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-08-25 16:59+0200\n" "PO-Revision-Date: 2003-05-13 15:48+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -33,7 +33,6 @@ msgstr "尚未啟用安全的記憶體前，不可能進 msgid "(you may have used the wrong program for this task)\n" msgstr "(也許妳選錯程式來做這件事了)\n" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:307 util/miscutil.c:344 #, fuzzy msgid "yes" @@ -43,7 +42,6 @@ msgstr "yes" msgid "yY" msgstr "yY" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "no" @@ -52,7 +50,6 @@ msgstr "no" msgid "nN" msgstr "nN" -#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. #: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "quit" @@ -257,7 +254,6 @@ msgstr "未被加密" msgid "not processed" msgstr "未被處理" -#. the key cannot be used for a specific usage #: util/errors.c:105 msgid "unusable public key" msgstr "不可用的公鑰" @@ -734,19 +730,19 @@ msgstr "|N|使用 N 壓縮演算法" msgid "throw keyid field of encrypted packets" msgstr "從已加密的封包中丟棄金鑰 ID 區塊" -#: g10/g10.c:488 +#: g10/g10.c:489 msgid "Show Photo IDs" msgstr "顯示照片 ID" -#: g10/g10.c:489 +#: g10/g10.c:490 msgid "Don't show Photo IDs" msgstr "不顯示照片 ID" -#: g10/g10.c:490 +#: g10/g10.c:491 msgid "Set command line to view Photo IDs" msgstr "設定觀看照片 ID 時要用的命令列" -#: g10/g10.c:497 +#: g10/g10.c:498 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -754,7 +750,7 @@ msgstr "" "@\n" "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n" -#: g10/g10.c:500 +#: g10/g10.c:501 msgid "" "@\n" "Examples:\n" @@ -774,15 +770,15 @@ msgstr "" " --list-keys [名字] 顯示金鑰\n" " --fingerprint [名字] 顯示指紋\n" -#: g10/g10.c:666 g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "請向 回報程式瑕疵。\n" -#: g10/g10.c:683 +#: g10/g10.c:684 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "用法： gpg [選項] [檔案] (或用 -h 求助)" -#: g10/g10.c:686 +#: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -792,7 +788,7 @@ msgstr "" "簽署、檢查、加密或解密\n" "預設的操作會依輸入資料而定\n" -#: g10/g10.c:697 +#: g10/g10.c:698 msgid "" "\n" "Supported algorithms:\n" @@ -800,388 +796,388 @@ msgstr "" "\n" "已被支援的演算法：\n" -#: g10/g10.c:700 +#: g10/g10.c:701 msgid "Pubkey: " msgstr "公鑰： " -#: g10/g10.c:706 g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " msgstr "編密法： " -#: g10/g10.c:712 +#: g10/g10.c:713 msgid "Hash: " msgstr "雜湊： " -#: g10/g10.c:718 g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " msgstr "壓縮： " -#: g10/g10.c:801 +#: g10/g10.c:802 msgid "usage: gpg [options] " msgstr "用法： gpg [選項] " -#: g10/g10.c:869 +#: g10/g10.c:870 msgid "conflicting commands\n" msgstr "指令彼此矛盾\n" -#: g10/g10.c:887 +#: g10/g10.c:888 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "在「%s」群組定義裡找不到 = 記號\n" -#: g10/g10.c:1087 +#: g10/g10.c:1088 #, c-format msgid "WARNING: unsafe ownership on %s \"%s\"\n" msgstr "警告： %s \"%s\" 的所有權並不安全\n" -#: g10/g10.c:1090 +#: g10/g10.c:1091 #, c-format msgid "WARNING: unsafe permissions on %s \"%s\"\n" msgstr "警告： %s \"%s\" 的許可並不安全\n" -#: g10/g10.c:1093 +#: g10/g10.c:1094 #, c-format msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n" msgstr "警告： %s \"%s\" 的封入目錄所有權並不安全\n" -#: g10/g10.c:1097 +#: g10/g10.c:1098 #, c-format msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n" msgstr "警告： %s \"%s\" 的封入目錄許可並不安全\n" -#: g10/g10.c:1223 +#: g10/g10.c:1224 #, fuzzy, c-format msgid "unknown configuration item \"%s\"\n" msgstr "新的設定檔 `%s' 被建立了\n" -#: g10/g10.c:1437 +#: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "請注意：舊有的預設選項檔 `%s' 已被忽略\n" -#: g10/g10.c:1473 +#: g10/g10.c:1481 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "請注意：沒有預設選項檔 `%s'\n" -#: g10/g10.c:1477 +#: g10/g10.c:1485 #, c-format msgid "option file `%s': %s\n" msgstr "選項檔 `%s' ： %s\n" -#: g10/g10.c:1484 +#: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" msgstr "從 `%s' 讀取選項\n" -#: g10/g10.c:1693 +#: g10/g10.c:1701 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "編密法延伸模組 \"%s\" 因為許可不安全而未被載入\n" -#: g10/g10.c:1828 +#: g10/g10.c:1836 #, c-format msgid "%s is not a valid character set\n" msgstr "%s 不是一個有效的字元集\n" -#: g10/g10.c:1846 +#: g10/g10.c:1854 msgid "could not parse keyserver URI\n" msgstr "無法分析金鑰伺服器 URI\n" -#: g10/g10.c:1855 +#: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: 無效的匯入選項\n" -#: g10/g10.c:1858 +#: g10/g10.c:1866 msgid "invalid import options\n" msgstr "無效的匯入選項\n" -#: g10/g10.c:1865 +#: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: 無效的匯出選項\n" -#: g10/g10.c:1868 +#: g10/g10.c:1876 msgid "invalid export options\n" msgstr "無效的匯出選項\n" -#: g10/g10.c:1874 +#: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "無法把執行檔路徑設成 %s\n" -#: g10/g10.c:2032 +#: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "警告：程式可能會傾印出核心檔！\n" -#: g10/g10.c:2036 +#: g10/g10.c:2044 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告： %s 會使得 %s 失效\n" -#: g10/g10.c:2043 g10/g10.c:2054 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "請注意：一般情況下不會用到 %s！\n" -#: g10/g10.c:2045 +#: g10/g10.c:2053 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 不被允許跟 %s 併用\n" -#: g10/g10.c:2048 +#: g10/g10.c:2056 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 跟 %s 放在一起沒有意義！\n" -#: g10/g10.c:2069 +#: g10/g10.c:2077 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n" -#: g10/g10.c:2075 +#: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "妳在 --pgp2 模式下時，不能同時簽署和加密\n" -#: g10/g10.c:2081 +#: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "啟用 --pgp2 時妳祇應該使用檔案，而非管道\n" -#: g10/g10.c:2094 +#: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n" -#: g10/g10.c:2161 g10/g10.c:2179 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" msgstr "所選的編密演算法無效\n" -#: g10/g10.c:2167 g10/g10.c:2185 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" msgstr "所選的摘要演算法無效\n" -#: g10/g10.c:2173 +#: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" msgstr "所選的憑證摘要演算法無效\n" -#: g10/g10.c:2189 +#: g10/g10.c:2197 #, fuzzy, c-format msgid "compress algorithm `%s' is read-only in this release\n" msgstr "`%s' 摘要演算法在這次釋出的版本中唯讀\n" -#: g10/g10.c:2193 +#: g10/g10.c:2201 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "壓縮演算法一定要介於 %d 到 %d 之間\n" -#: g10/g10.c:2195 +#: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed 一定要大於 0\n" -#: g10/g10.c:2197 +#: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed 一定要大於 1\n" -#: g10/g10.c:2199 +#: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth 一定要介於 1 和 255 之間\n" -#: g10/g10.c:2201 +#: g10/g10.c:2209 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "無效的 default-check-level ；一定要是 0 、 1 、 2 或 3\n" -#: g10/g10.c:2203 +#: g10/g10.c:2211 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "無效的 default-check-level ；一定要是 0 、 1 、 2 或 3\n" -#: g10/g10.c:2206 +#: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "請注意：強烈不建議使用單純的 S2K 模式 (0)\n" -#: g10/g10.c:2210 +#: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "無效的 S2K 模式；一定要是 0 、 1 或 3\n" -#: g10/g10.c:2217 +#: g10/g10.c:2225 msgid "invalid default preferences\n" msgstr "無效的預設偏好\n" -#: g10/g10.c:2226 +#: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" msgstr "無效的個人編密法偏好\n" -#: g10/g10.c:2230 +#: g10/g10.c:2238 msgid "invalid personal digest preferences\n" msgstr "無效的個人摘要偏好\n" -#: g10/g10.c:2234 +#: g10/g10.c:2242 msgid "invalid personal compress preferences\n" msgstr "無效的個人壓縮偏好\n" -#: g10/g10.c:2264 +#: g10/g10.c:2272 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s 跟 %s 放在一起沒有意義！\n" -#: g10/g10.c:2308 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "you may not use cipher algorithm \"%s\" while in %s mode\n" msgstr "妳不該將 %s 用於 %s 模式中\n" -#: g10/g10.c:2313 +#: g10/g10.c:2321 #, fuzzy, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" msgstr "妳不該將 %s 用於 %s 模式中\n" -#: g10/g10.c:2318 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" msgstr "妳不該將 %s 用於 %s 模式中\n" -#: g10/g10.c:2410 +#: g10/g10.c:2418 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "信任資料庫啟始失敗： %s\n" -#: g10/g10.c:2421 +#: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：給定的收件者 (-r) 未使用公鑰加密\n" -#: g10/g10.c:2432 +#: g10/g10.c:2440 msgid "--store [filename]" msgstr "--store [檔名]" -#: g10/g10.c:2439 +#: g10/g10.c:2447 msgid "--symmetric [filename]" msgstr "--symmetric [檔名]" -#: g10/g10.c:2451 +#: g10/g10.c:2459 msgid "--encrypt [filename]" msgstr "--encrypt [檔名]" -#: g10/g10.c:2466 +#: g10/g10.c:2474 msgid "--sign [filename]" msgstr "--sign [檔名]" -#: g10/g10.c:2479 +#: g10/g10.c:2487 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [檔名]" -#: g10/g10.c:2493 +#: g10/g10.c:2501 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [檔名]" -#: g10/g10.c:2502 +#: g10/g10.c:2510 msgid "--clearsign [filename]" msgstr "--clearsign [檔名]" -#: g10/g10.c:2527 +#: g10/g10.c:2535 msgid "--decrypt [filename]" msgstr "--decrypt [檔名]" -#: g10/g10.c:2535 +#: g10/g10.c:2543 msgid "--sign-key user-id" msgstr "--sign-key 使用者ID" -#: g10/g10.c:2543 +#: g10/g10.c:2551 msgid "--lsign-key user-id" msgstr "--lsign-key 使用者ID" -#: g10/g10.c:2551 +#: g10/g10.c:2559 msgid "--nrsign-key user-id" msgstr "--nrsign-key 使用者ID" -#: g10/g10.c:2559 +#: g10/g10.c:2567 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key 使用者ID" -#: g10/g10.c:2567 +#: g10/g10.c:2575 msgid "--edit-key user-id [commands]" msgstr "--edit-key 使用者ID [指令]" -#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "無法開啟 %s: %s\n" -#: g10/g10.c:2638 +#: g10/g10.c:2646 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]" -#: g10/g10.c:2675 +#: g10/g10.c:2683 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "產生金鑰失敗： %s\n" -#: g10/g10.c:2677 +#: g10/g10.c:2685 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "產生金鑰失敗： %s\n" -#: g10/g10.c:2679 +#: g10/g10.c:2687 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "產生金鑰失敗： %s\n" -#: g10/g10.c:2690 +#: g10/g10.c:2698 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "產生金鑰失敗： %s\n" -#: g10/g10.c:2700 +#: g10/g10.c:2708 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "更新私鑰失敗： %s\n" -#: g10/g10.c:2741 +#: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" msgstr "解開封裝失敗： %s\n" -#: g10/g10.c:2749 +#: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" msgstr "進行封裝失敗： %s\n" -#: g10/g10.c:2836 +#: g10/g10.c:2844 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "無效的 `%s' 雜湊演算法\n" -#: g10/g10.c:2930 +#: g10/g10.c:2938 msgid "[filename]" msgstr "[檔名]" -#: g10/g10.c:2934 +#: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" msgstr "請開始鍵入妳的訊息 ...\n" -#: g10/g10.c:2937 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "無法開啟 `%s'\n" -#: g10/g10.c:3210 +#: g10/g10.c:3218 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "標記名稱一定要採用可印出的字符或空白，並以一個「=」來結尾\n" -#: g10/g10.c:3219 +#: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" msgstr "使用者標記名稱一定要含有「@」字符\n" -#: g10/g10.c:3229 +#: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" msgstr "標記值一定不能使用任何的控制字符\n" -#: g10/g10.c:3264 +#: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" msgstr "給定的的憑證原則 URL 無效\n" -#: g10/g10.c:3266 +#: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" msgstr "給定的簽章原則 URL 無效\n" @@ -1306,7 +1302,6 @@ msgstr "撤銷原因： " msgid "revocation comment: " msgstr "撤銷註釋： " -#. a string with valid answers #: g10/pkclist.c:254 msgid "iImMqQsS" msgstr "iImMqQsS" @@ -1360,7 +1355,6 @@ msgstr " %d = 我完全信任\n" msgid " %d = I trust ultimately\n" msgstr " %d = 我徹底信任\n" -#. not yet implemented #: g10/pkclist.c:313 msgid " i = please show me more information\n" msgstr " i = 請告訴我更多訊息\n" @@ -1671,14 +1665,6 @@ msgstr "金鑰尺寸太小； RSA 的金鑰尺寸最 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "金鑰尺寸太小；最起碼必須要有 768 。\n" -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. #: g10/keygen.c:1155 #, c-format msgid "keysize too large; %d is largest value allowed.\n" @@ -1761,7 +1747,6 @@ msgstr "無效的數值\n" msgid "%s does not expire at all\n" msgstr "%s 完全不會過期\n" -#. print the date when the key expires #: g10/keygen.c:1281 #, c-format msgid "%s expires at %s\n" @@ -2074,7 +2059,6 @@ msgstr "金鑰 %08lX: 未被保護 ─ 已跳過\n msgid "key %08lX: PGP 2.x style key - skipped\n" msgstr "金鑰 %08lX: PGP 2.x 樣式的金鑰 ─ 已跳過\n" -#. I hope this warning doesn't confuse people. #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" @@ -2088,9 +2072,7 @@ msgstr "警告：沒有匯出任何東西\n" msgid "too many entries in pk cache - disabled\n" msgstr "pk 快取裡有太多項目 ─ 已禁用\n" -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2670 msgid "[User id not found]" msgstr "[找不到使用者 ID]" @@ -2318,7 +2300,6 @@ msgstr "沒有預設的私鑰鑰匙圈： %s\n" msgid "key %08lX: secret key imported\n" msgstr "金鑰 %08lX: 私鑰被匯入了\n" -#. we can't merge secret keys #: g10/import.c:870 #, c-format msgid "key %08lX: already in secret keyring\n" @@ -2549,8 +2530,6 @@ msgstr "" msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎？ (y/N) " -#. It's a local sig, and we want to make a -#. exportable sig. #: g10/keyedit.c:501 #, c-format msgid "" @@ -2902,7 +2881,6 @@ msgstr "deluid" msgid "delete user ID" msgstr "刪除一個使用者 ID" -#. delphoto is really deluid in disguise #: g10/keyedit.c:1018 msgid "delphoto" msgstr "delphoto" @@ -3200,8 +3178,6 @@ msgstr "這把金鑰可能被 %s 金鑰撤銷了 " msgid " (sensitive)" msgstr " （機密的）" -#. Note, we use the same format string as in other show -#. functions to make the translation job easier. #: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" @@ -3325,9 +3301,6 @@ msgstr "輸入指定撤銷者的使用者 ID ： " msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n" -#. This actually causes no harm (after all, a key that -#. designates itself as a revoker is the same as a -#. regular key), but it's easy enough to check. #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n" @@ -3419,7 +3392,6 @@ msgstr "妳確定妳仍然想要撤銷它嗎？ (y/N) msgid "Create a revocation certificate for this signature? (y/N) " msgstr "要為這份簽章建立一份撤銷憑證嗎？ (y/N) " -#. FIXME: detect duplicates here #: g10/keyedit.c:3181 msgid "You have signed these user IDs:\n" msgstr "妳已經簽署了這些使用者 ID： \n" @@ -3460,10 +3432,6 @@ msgstr "沒有私鑰\n" msgid "user ID \"%s\" is already revoked\n" msgstr "使用者 ID \"%s\" 已經被撤銷了。\n" -#. Okay, this is a problem. The user ID selfsig was -#. created in the future, so we need to warn the user and -#. set our revocation timestamp one second after that so -#. everything comes out clean. #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" @@ -3527,7 +3495,6 @@ msgstr " 主鑰指紋：" msgid " Subkey fingerprint:" msgstr " 子鑰指紋：" -#. use tty #: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr " 金鑰指紋 =" @@ -3537,8 +3504,6 @@ msgstr " 金鑰指紋 =" msgid "weird size for an encrypted session key (%d)\n" msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n" -#. There is no way to tell the difference here between a bad -#. passphrase and a cipher algorithm that we don't have. #: g10/mainproc.c:262 #, fuzzy, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" @@ -3650,7 +3615,6 @@ msgstr "原則： " msgid "signature verification suppressed\n" msgstr "簽章驗證已被抑制\n" -#. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "無法處理這些多重簽章\n" @@ -3660,10 +3624,6 @@ msgstr "無法處理這些多重簽章\n" msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "由 %.*s 建立的簽章，使用 %s 金鑰 ID %08lX\n" -#. According to my favorite copy editor, in English -#. grammar, you say "at" if the key is located on a web -#. page, but "from" if it is located on a keyserver. I'm -#. not going to even try to make two strings here :) #: g10/mainproc.c:1381 #, fuzzy msgid "Key available at: " @@ -3825,7 +3785,7 @@ msgstr "被變造的 GPG_AGENT_INFO 環境變數 msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent 協定版本 %d 未被支援\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "無法連接至 `%s' ： %s\n" @@ -3834,11 +3794,11 @@ msgstr "無法連接至 `%s' ： %s\n" msgid "communication problem with gpg-agent\n" msgstr "gpg-agent 的通訊問題\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "代理程式的問題 ─ 正在停用代理程式\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (主要金鑰 ID %08lX)" @@ -3870,16 +3830,16 @@ msgstr "密碼串太長\n" msgid "invalid response from agent\n" msgstr "代理程式傳回無效的回應\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "由使用者取消了\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "代理程式的問題：代理程式傳回 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3889,20 +3849,20 @@ msgstr "" "妳需要下列使用者的密碼串，纔能解開私鑰：\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u 位元 %s ID %08lX 的金鑰，建立於 %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "在批次模式中無法詢問密碼\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "請輸入密碼串： " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "請再輸入一次密碼串： " @@ -3968,41 +3928,41 @@ msgstr "請注意：私鑰 %08lX 在 %s 過期了\ msgid "NOTE: key has been revoked" msgstr "請注意：金鑰已經被撤銷了" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "金鑰 %08lX 正向 %s 要求中\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "無法從金鑰伺服器取得金鑰： %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "傳送到 `%s' 的時候發生錯誤： %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "成功地傳送到 `%s' (狀態=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "傳送到 `%s' 的時候失敗了：狀態=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "正在搜尋 \"%s\" 於 HKP 伺服器 %s 上\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "無法搜尋金鑰伺服器： %s\n" @@ -4408,9 +4368,6 @@ msgstr "沒有找到任何徹底信任的金鑰\n" msgid "public key of ultimately trusted key %08lX not found\n" msgstr "徹底信任金鑰 %08lX 的公鑰沒有被找到\n" -#. This should be valid=%d now, but I'm not changing it so I -#. don't break the translated strings in the stable branch. -#. Change it in devel. -dms #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" @@ -4456,7 +4413,6 @@ msgid "" "signatures!\n" msgstr "`%s' 已跳過：這是一把由 PGP 產生的 ElGamal 金鑰，用於簽章並不安全！\n" -#. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " @@ -4522,7 +4478,7 @@ msgstr "建立了弱金鑰 ─ 正在重試\n" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "無法避免對稱式編密法的弱金鑰；已經試了 %d 次了！\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA 要求使用 160 位元的雜湊演算法\n" @@ -4903,17 +4859,17 @@ msgstr "沒有可用的說明" msgid "No help available for `%s'" msgstr "`%s' 沒有可用的說明" -#: g10/keydb.c:185 +#: g10/keydb.c:156 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "建立鑰匙圈 `%s' 時發生錯誤： %s\n" -#: g10/keydb.c:192 +#: g10/keydb.c:163 #, c-format msgid "keyring `%s' created\n" msgstr "鑰匙圈 `%s' 已建立\n" -#: g10/keydb.c:582 +#: g10/keydb.c:639 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "重新建立鑰匙圈快取失敗： %s\n" @@ -5015,7 +4971,6 @@ msgstr "因為不安全的檔案權限選項，而禁用 msgid "this platform requires temp files when calling external programs\n" msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n" -#. If we get this far the exec failed. Clean up and return. #: g10/exec.c:432 #, c-format msgid "unable to execute %s \"%s\": %s\n" @@ -5093,7 +5048,6 @@ msgstr "已強迫使用 ASCII 封裝過的輸出。\ msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 失敗： %s\n" -#. and issue a usage notice #: g10/revoke.c:387 msgid "Revocation certificate created.\n" msgstr "已建立撤銷憑證。\n" @@ -5125,7 +5079,6 @@ msgstr "未知的保護演算法\n" msgid "NOTE: This key is not protected!\n" msgstr "注意：這把金鑰沒有被保護！\n" -#. and issue a usage notice #: g10/revoke.c:574 msgid "" "Revocation certificate created.\n" @@ -5205,7 +5158,6 @@ msgstr "錯誤：無效的指紋\n" msgid "error: no ownertrust value\n" msgstr "錯誤：沒有主觀信任值\n" -#. error #: g10/tdbdump.c:204 #, c-format msgid "error finding trust record: %s\n" diff -urpP gnupg-1.2.5/scripts/ChangeLog gnupg-1.2.6/scripts/ChangeLog --- gnupg-1.2.5/scripts/ChangeLog 2004-07-20 15:13:08.000000000 +0000 +++ gnupg-1.2.6/scripts/ChangeLog 2004-08-13 16:34:36.000000000 +0000 @@ -1,3 +1,11 @@ +2004-08-13 Werner Koch + + * config.sub, config.guess: Updated. + +2004-08-09 Werner Koch + + * autogen.sh: Run aclocal with -I m4. + 2004-07-20 Werner Koch * mk-w32-dist: Do not convert zh_CN. diff -urpP gnupg-1.2.5/scripts/autogen.sh gnupg-1.2.6/scripts/autogen.sh --- gnupg-1.2.5/scripts/autogen.sh 2003-08-26 07:07:09.000000000 +0000 +++ gnupg-1.2.6/scripts/autogen.sh 2004-08-09 18:59:05.000000000 +0000 @@ -250,7 +250,7 @@ if test "$DIE" = "yes"; then fi echo "Running aclocal..." -aclocal +aclocal -I m4 echo "Running autoheader..." autoheader echo "Running automake --gnu ..." diff -urpP gnupg-1.2.5/scripts/config.guess gnupg-1.2.6/scripts/config.guess --- gnupg-1.2.5/scripts/config.guess 2002-11-11 12:00:01.000000000 +0000 +++ gnupg-1.2.6/scripts/config.guess 2004-08-13 16:33:41.000000000 +0000 @@ -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 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2002-11-08' +timestamp='2004-07-19' # 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 @@ -53,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -98,14 +98,18 @@ trap 'exit 1' 1 2 15 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +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" ; } || + { 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 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do @@ -113,15 +117,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -178,21 +180,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # 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 ;; arc:OpenBSD:*:*) echo mipsel-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 ;; @@ -223,71 +245,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -310,6 +328,9 @@ EOF *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -327,6 +348,9 @@ EOF NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; @@ -399,6 +423,9 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -439,8 +466,7 @@ EOF EOF $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) @@ -449,7 +475,7 @@ EOF Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit 0 ;; Night_Hawk:Power_UNIX:*:*) @@ -524,8 +550,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -624,10 +649,20 @@ EOF } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; 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 + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -661,8 +696,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -720,21 +754,26 @@ EOF CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; 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 ;; + 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 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -745,19 +784,7 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -768,14 +795,17 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks exit 0 ;; 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 i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -787,17 +817,28 @@ EOF echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *: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 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -818,8 +859,26 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #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 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -855,6 +914,9 @@ EOF s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -912,9 +974,11 @@ EOF LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; @@ -932,6 +996,26 @@ EOF # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + 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 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; 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 @@ -966,9 +1050,6 @@ EOF echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -998,9 +1079,9 @@ EOF M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*: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) + 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` @@ -1017,9 +1098,6 @@ EOF mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1101,7 +1179,11 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1114,7 +1196,7 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1137,11 +1219,6 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - 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 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1160,12 +1237,19 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*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 esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1286,8 +1370,7 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff -urpP gnupg-1.2.5/scripts/config.rpath gnupg-1.2.6/scripts/config.rpath --- gnupg-1.2.5/scripts/config.rpath 2003-06-19 10:18:05.000000000 +0000 +++ gnupg-1.2.6/scripts/config.rpath 2004-08-09 15:28:48.000000000 +0000 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2002 Free Software Foundation, Inc. +# Copyright 1996-2003 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -34,43 +34,57 @@ # # The set of defined variables is at the end of this script. +# Known limitations: +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer +# than 256 bytes, otherwise the compiler driver will dump core. The only +# known workaround is to choose shorter directory names for the build +# directory and/or the installation directory. + # All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a -shlibext= +shrext=.so host="$1" host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. + wl= if test "$GCC" = yes; then wl='-Wl,' else case "$host_os" in - aix3* | aix4* | aix5*) + aix*) wl='-Wl,' ;; + mingw* | pw32* | os2*) + ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) wl='-Wl,' ;; + newsos6) + ;; linux*) - echo '__INTEL_COMPILER' > conftest.$ac_ext - if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null - then - : - else - # Intel icc - wl='-Qoption,ld,' - fi + case $CC in + icc|ecc) + wl='-Wl,' + ;; + ccc) + wl='-Wl,' + ;; + esac ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; + sco3.2v5*) + ;; solaris*) wl='-Wl,' ;; @@ -78,15 +92,17 @@ else wl='-Qoption ld ' ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - if test "x$host_vendor" = xsni; then - wl='-LD' - else - wl='-Wl,' - fi + wl='-Wl,' + ;; + sysv4*MP*) + ;; + uts4*) ;; esac fi +# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. + hardcode_libdir_flag_spec= hardcode_libdir_separator= hardcode_direct=no @@ -110,8 +126,10 @@ ld_shlibs=yes if test "$with_gnu_ld" = yes; then case "$host_os" in aix3* | aix4* | aix5*) - # On AIX, the GNU linker is very broken - ld_shlibs=no + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + fi ;; amigaos*) hardcode_libdir_flag_spec='-L$libdir' @@ -125,7 +143,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no ;; beos*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no @@ -135,11 +153,18 @@ if test "$with_gnu_ld" = yes; then # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + netbsd*) ;; solaris* | sysv5*) - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no @@ -149,7 +174,7 @@ if test "$with_gnu_ld" = yes; then hardcode_direct=yes ;; *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no @@ -157,6 +182,8 @@ if test "$with_gnu_ld" = yes; then ;; esac if test "$ld_shlibs" = yes; then + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' fi else @@ -209,13 +236,27 @@ else fi esac fi + # Begin _LT_AC_SYS_LIBPATH_AIX. + echo 'int main () { return 0; }' > conftest.c + ${CC} ${LDFLAGS} conftest.c -o conftest + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + fi + if test -z "$aix_libpath"; then + aix_libpath="/usr/lib:/lib" + fi + rm -f conftest.c conftest + # End _LT_AC_SYS_LIBPATH_AIX. if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" fi fi ;; @@ -225,6 +266,8 @@ else # see comment about different semantics on the GNU ld section ld_shlibs=no ;; + bsdi4*) + ;; cygwin* | mingw* | pw32*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -234,7 +277,12 @@ else libext=lib ;; darwin* | rhapsody*) - hardcode_direct=yes + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + hardcode_direct=no + fi + ;; + dgux*) + hardcode_libdir_flag_spec='-L$libdir' ;; freebsd1*) ld_shlibs=no @@ -251,14 +299,41 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; - hpux9* | hpux10* | hpux11*) + hpux9*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes ;; - irix5* | irix6*) + hpux10* | hpux11*) + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=no + ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; @@ -314,23 +389,20 @@ else hardcode_minus_L=yes ;; sysv4) - if test "x$host_vendor" = xsno; then - hardcode_direct=yes # is this really true??? - else - hardcode_direct=no # Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + hardcode_direct=yes # is this really true??? + ;; + siemens) + hardcode_direct=no + ;; + motorola) + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac ;; sysv4.3*) ;; - sysv5*) - hardcode_libdir_flag_spec= - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; sysv4*MP*) if test -d /usr/nec; then ld_shlibs=yes @@ -340,7 +412,13 @@ else hardcode_direct=yes hardcode_minus_L=no ;; - sysv5uw7* | unixware7*) + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + ;; + sysv5*) + hardcode_libdir_flag_spec= + ;; + uts4*) + hardcode_libdir_flag_spec='-L$libdir' ;; *) ld_shlibs=no @@ -349,134 +427,97 @@ else fi # Check dynamic linker characteristics +# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. libname_spec='lib$name' -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" case "$host_os" in aix3*) - shlibext=so ;; aix4* | aix5*) - shlibext=so ;; amigaos*) - shlibext=ixlibrary ;; beos*) - shlibext=so ;; bsdi4*) - shlibext=so - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ;; cygwin* | mingw* | pw32*) - case $GCC,$host_os in - yes,cygwin*) - shlibext=dll.a - ;; - yes,mingw*) - shlibext=dll - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - shlibext=dll - ;; - *) - shlibext=dll - ;; - esac + shrext=.dll ;; darwin* | rhapsody*) - shlibext=dylib + shrext=.dylib + ;; + dgux*) ;; freebsd1*) ;; freebsd*) - shlibext=so ;; gnu*) - shlibext=so ;; hpux9* | hpux10* | hpux11*) - shlibext=sl + case "$host_cpu" in + ia64*) + shrext=.so + ;; + hppa*64*) + shrext=.sl + ;; + *) + shrext=.sl + ;; + esac ;; - irix5* | irix6*) - shlibext=so + irix5* | irix6* | nonstopux*) case "$host_os" in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) case $LD in - *-32|*"-32 ") libsuff= shlibsuff= ;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 ;; + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; *) libsuff= shlibsuff= ;; esac ;; esac - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ;; - linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) + linux*oldld* | linux*aout* | linux*coff*) ;; - linux-gnu*) - shlibext=so + linux*) ;; netbsd*) - shlibext=so ;; newsos6) - shlibext=so + ;; + nto-qnx) ;; openbsd*) - shlibext=so ;; os2*) libname_spec='$name' - shlibext=dll + shrext=.dll ;; osf3* | osf4* | osf5*) - shlibext=so - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) - shlibext=so ;; solaris*) - shlibext=so ;; sunos4*) - shlibext=so ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - shlibext=so - case "$host_vendor" in - motorola) - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - uts4*) - shlibext=so - ;; - dgux*) - shlibext=so ;; sysv4*MP*) - if test -d /usr/nec; then - shlibext=so - fi + ;; + uts4*) ;; esac sed_quote_subst='s/\(["`$\\]\)/\\\1/g' escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" 1>&2 + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac done for file @@ -38,64 +47,65 @@ do done case $# in -0) exit 0 ;; + 0) exit 0 ;; esac case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; + '') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi + ;; + *) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi + ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi - pathcomp="$pathcomp/" - done + pathcomp="$pathcomp/" + done done exit $errstatus # Local Variables: # mode: shell-script -# sh-indentation: 3 +# sh-indentation: 2 # End: # mkinstalldirs ends here diff -urpP gnupg-1.2.5/tools/ChangeLog gnupg-1.2.6/tools/ChangeLog --- gnupg-1.2.5/tools/ChangeLog 2004-07-20 11:29:16.000000000 +0000 +++ gnupg-1.2.6/tools/ChangeLog 2004-08-09 16:35:54.000000000 +0000 @@ -1,3 +1,7 @@ +2004-08-09 Werner Koch + + * Makefile.am: Replaced INTLLIBS by LIBINTL. + 2004-06-17 David Shaw * ring-a-party: ElGamal -> Elgamal diff -urpP gnupg-1.2.5/tools/Makefile.am gnupg-1.2.6/tools/Makefile.am --- gnupg-1.2.5/tools/Makefile.am 2003-07-30 07:44:44.000000000 +0000 +++ gnupg-1.2.6/tools/Makefile.am 2004-08-09 16:35:57.000000000 +0000 @@ -25,9 +25,9 @@ needed_libs = ../cipher/libcipher.a ../m bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest -gpgsplit_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ -mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ -bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ -shmtest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ +gpgsplit_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ +mpicalc_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ +bftest_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ +shmtest_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ gpgsplit mpicalc bftest shmtest: $(needed_libs) diff -urpP gnupg-1.2.5/tools/Makefile.in gnupg-1.2.6/tools/Makefile.in --- gnupg-1.2.5/tools/Makefile.in 2004-07-26 12:26:27.000000000 +0000 +++ gnupg-1.2.6/tools/Makefile.in 2004-08-25 14:48:21.000000000 +0000 @@ -213,10 +213,10 @@ needed_libs = ../cipher/libcipher.a ../m bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest -gpgsplit_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ -mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ -bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ -shmtest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ +gpgsplit_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ +mpicalc_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ +bftest_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ +shmtest_LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ subdir = tools ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs diff -urpP gnupg-1.2.5/util/ChangeLog gnupg-1.2.6/util/ChangeLog --- gnupg-1.2.5/util/ChangeLog 2004-03-29 13:23:31.000000000 +0000 +++ gnupg-1.2.6/util/ChangeLog 2004-08-23 15:28:24.000000000 +0000 @@ -1,3 +1,27 @@ +2004-08-23 Werner Koch + + * dotlock.c (destroy_dotlock): Remove the handle from the list of + locks. + (release_dotlock): Don't act if we don't have any locks at all. + +2004-08-19 Werner Koch + + * dotlock.c (destroy_dotlock): Don't act on NULL filenames. + +2004-08-19 David Shaw + + * http.c (insert_escapes): Fix encoding problem for non-URI-safe + characters. Noted by Vladimir Novak. + +2004-08-11 Werner Koch + + * dotlock.c (destroy_dotlock): New. + (remove_lockfiles): Implement in terms of destroy_dotlock. + +2004-08-09 Werner Koch + + * Makefile.am (http-test): Replaced INTLLIBS by LIBINTL. + 2004-03-01 David Shaw * iobuf.c (block_filter): Properly handle a partial body stream @@ -1101,7 +1125,7 @@ Fri Feb 13 15:14:13 1998 Werner Koch ( - Copyright 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. + Copyright 1998,1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff -urpP gnupg-1.2.5/util/Makefile.am gnupg-1.2.6/util/Makefile.am --- gnupg-1.2.5/util/Makefile.am 2002-06-29 13:39:56.000000000 +0000 +++ gnupg-1.2.6/util/Makefile.am 2004-08-09 18:36:25.000000000 +0000 @@ -31,7 +31,7 @@ libutil_a_SOURCES = g10u.c logger.c file http-test: http.c gcc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) -g -Wall -DTEST \ - -o http-test http.c libutil.a ../mpi/libmpi.a @INTLLIBS@ + -o http-test http.c libutil.a ../mpi/libmpi.a @LIBINTL@ diff -urpP gnupg-1.2.5/util/Makefile.in gnupg-1.2.6/util/Makefile.in --- gnupg-1.2.5/util/Makefile.in 2004-07-26 12:26:18.000000000 +0000 +++ gnupg-1.2.6/util/Makefile.in 2004-08-25 14:48:21.000000000 +0000 @@ -487,7 +487,7 @@ uninstall-am: uninstall-info-am http-test: http.c gcc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) -g -Wall -DTEST \ - -o http-test http.c libutil.a ../mpi/libmpi.a @INTLLIBS@ + -o http-test http.c libutil.a ../mpi/libmpi.a @LIBINTL@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urpP gnupg-1.2.5/util/dotlock.c gnupg-1.2.6/util/dotlock.c --- gnupg-1.2.5/util/dotlock.c 2003-07-30 15:36:00.000000000 +0000 +++ gnupg-1.2.6/util/dotlock.c 2004-08-23 12:28:27.000000000 +0000 @@ -1,5 +1,5 @@ /* dotlock.c - dotfile locking - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -197,6 +197,45 @@ create_dotlock( const char *file_to_lock return h; } + +void +destroy_dotlock ( DOTLOCK h ) +{ +#if !defined (HAVE_DOSISH_SYSTEM) + if ( h ) + { + DOTLOCK hprev, htmp; + + /* First remove the handle from our global list of all locks. */ + for (hprev=NULL, htmp=all_lockfiles; htmp; hprev=htmp, htmp=htmp->next) + if (htmp == h) + { + if (hprev) + hprev->next = htmp->next; + else + all_lockfiles = htmp->next; + h->next = NULL; + break; + } + + /* Second destroy the lock. */ + if (!h->disable) + { + if (h->locked && h->lockname) + unlink (h->lockname); + if (h->tname) + unlink (h->tname); + m_free (h->tname); + m_free (h->lockname); + } + m_free(h); + + } +#endif +} + + + static int maybe_deadlock( DOTLOCK h ) { @@ -317,9 +356,15 @@ release_dotlock( DOTLOCK h ) #else int pid; - if( h->disable ) { + /* To avoid atexit race conditions we first check whether there + are any locks left. It might happen that another atexit + handler tries to release the lock while the atexit handler of + this module already ran and thus H is undefined. */ + if(!all_lockfiles) + return 0; + + if( h->disable ) return 0; - } if( !h->locked ) { log_debug("oops, `%s' is not locked\n", h->lockname ); @@ -407,14 +452,7 @@ remove_lockfiles() while( h ) { h2 = h->next; - if( !h->disable ) { - if( h->locked ) - unlink( h->lockname ); - unlink(h->tname); - m_free(h->tname); - m_free(h->lockname); - } - m_free(h); + destroy_dotlock (h); h = h2; } #endif diff -urpP gnupg-1.2.5/util/http.c gnupg-1.2.6/util/http.c --- gnupg-1.2.5/util/http.c 2003-12-23 17:33:34.000000000 +0000 +++ gnupg-1.2.6/util/http.c 2004-08-23 15:28:14.000000000 +0000 @@ -1,5 +1,5 @@ /* http.c - HTTP protocol handler - * Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc. + * Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -420,7 +420,7 @@ insert_escapes( byte *buffer, const byte } else { if( buffer ) { - sprintf( buffer, "%02X", *string ); + sprintf( buffer, "%%%02X", *string ); buffer += 3; } n += 3; @@ -430,9 +430,6 @@ insert_escapes( byte *buffer, const byte } - - - static URI_TUPLE parse_tuple( byte *string ) { -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFBLKuraLeriVdUjc0RAgJNAJ9GYdO1+08SeMisbQ4j69rTMEOzxQCgg6CA wUvj5RJnacfHRCabNejpbO0= =GDvG -----END PGP SIGNATURE-----