Preparing a test release
authorWerner Koch <wk@gnupg.org>
Fri, 15 Feb 2008 09:58:01 +0000 (09:58 +0000)
committerWerner Koch <wk@gnupg.org>
Fri, 15 Feb 2008 09:58:01 +0000 (09:58 +0000)
43 files changed:
ABOUT-NLS
ChangeLog
NEWS
configure.ac
doc/ChangeLog
gl/allocsa.h
gl/m4/allocsa.m4
gl/m4/gnulib-comp.m4
m4/ChangeLog
m4/gettext.m4
m4/iconv.m4
m4/lib-link.m4
m4/po.m4
po/ChangeLog
po/Makefile.in.in
po/be.po
po/ca.po
po/cs.po
po/da.po
po/de.po
po/el.po
po/eo.po
po/es.po
po/et.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nb.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sv.po
po/tr.po
po/zh_CN.po
po/zh_TW.po
scripts/config.rpath

index ec20977..83bc72e 100644 (file)
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -101,8 +101,11 @@ codes, stating which languages are allowed.
 
 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
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
 suppose that you speak German and live in Germany.  At the shell
 prompt, merely execute `setenv LANG de_DE' (in `csh'),
 `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
@@ -153,8 +156,7 @@ 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
 teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
+`http://translationproject.org/', in the "Teams" area.
 
    If you'd like to volunteer to _work_ at translating messages, you
 should become a member of the translating team for your own language.
@@ -168,8 +170,8 @@ message to `sv-request@li.org', having this message body:
 _actively_ in translations, or at solving translational difficulties,
 rather than merely lurking around.  If your team does not exist yet and
 you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
+get started, please write to `coordinator@translationproject.org' to
+reach the coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
 the terminology in use.  Proven linguistic skills are praised more than
@@ -179,67 +181,62 @@ programming skills, here.
 ======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of October
-2006.  The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of November
+2007.  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       af am ar az be bg bs ca cs cy da de el en en_GB eo
                         +----------------------------------------------------+
-     GNUnet             |                                  []                |
+     Compendium         |                      []       [] []        []      |
      a2ps               |             []                [] [] []     []      |
      aegis              |                                  ()                |
      ant-phone          |                                  ()                |
      anubis             |                                  []                |
      ap-utils           |                                                    |
      aspell             |                      [] []    [] []        []      |
-     bash               |                      []          []             [] |
-     batchelor          |                                  []                |
+     bash               |                                                 [] |
      bfd                |                                                    |
      bibshelf           |                                  []                |
-     binutils           |                               []                   |
+     binutils           |                                                    |
      bison              |                               [] []                |
-     bison-runtime      |                                                    |
+     bison-runtime      |                                  []                |
      bluez-pin          | []                      []       [] []          [] |
      cflow              |                               []                   |
-     clisp              |                                  []    []          |
+     clisp              |                               [] []    []          |
      console-tools      |                         []       []                |
-     coreutils          |                []    []          []                |
+     coreutils          |                []    [] []       []                |
      cpio               |                                                    |
      cpplib             |                      []       [] []                |
      cryptonit          |                                  []                |
-     darkstat           |                []             () []                |
-     dialog             |                      [] [] [] [] [] []             |
+     dialog             |                                                    |
      diffutils          |                      [] []    [] [] []          [] |
      doodle             |                                  []                |
      e2fsprogs          |                         []       []                |
      enscript           |                      []       [] []        []      |
-     error              |                      []       [] []        []      |
-     fetchmail          |                      []       [] () []             |
-     fileutils          |                               [] []                |
-     findutils          |                []    []       []                   |
+     fetchmail          |                      []       [] () []     []      |
+     findutils          |                []                                  |
+     findutils_stable   |                []    []       []                   |
      flex               |                      []       [] []                |
-     fslint             |                                  []                |
+     fslint             |                                                    |
      gas                |                                                    |
      gawk               |                      []       [] []                |
-     gbiff              |                                  []                |
      gcal               |                      []                            |
      gcc                |                                  []                |
      gettext-examples   | []                   []          [] []          [] |
      gettext-runtime    |             []       []       [] []             [] |
      gettext-tools      |                      []          []                |
-     gimp-print         |                         []    [] []        []      |
      gip                |                []                                  |
-     gliv               |                                  []                |
+     gliv               |                []                []                |
      glunarclock        |                []                                  |
      gmult              | []                               []                |
      gnubiff            |                                  ()                |
-     gnucash            |                                  () ()     []      |
-     gnucash-glossary   |                               [] ()                |
+     gnucash            |                      [] []       () ()     []      |
      gnuedu             |                                                    |
-     gnulib             | []          [] []    []       [] []                |
+     gnulib             |                []                                  |
+     gnunet             |                                                    |
      gnunet-gtk         |                                                    |
-     gnutls             |                                                    |
+     gnutls             |                                  []                |
      gpe-aerial         |                         []       []                |
      gpe-beam           |                         []       []                |
      gpe-calendar       |                                                    |
@@ -260,40 +257,43 @@ translation percentage of at least 50%.
      gpe-todo           |                                                    |
      gphoto2            |                         []    [] []        []      |
      gprof              |                               [] []                |
-     gpsdrive           |                                  ()    ()          |
+     gpsdrive           |                                                    |
      gramadoir          | []                               []                |
-     grep               | []          [] []    []          [] []             |
-     gretl              |                                                    |
+     grep               |                         []                      [] |
+     gretl              |                                  ()                |
      gsasl              |                                                    |
      gss                |                                                    |
-     gst-plugins        | []                   [] []    []                   |
-     gst-plugins-base   |                []    []       []                   |
-     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gst-plugins-bad    |                []             []                   |
+     gst-plugins-base   |                []             []                   |
+     gst-plugins-good   |                []    []       []                   |
+     gst-plugins-ugly   |                []             []                   |
      gstreamer          | []             []    [] []    [] []        []      |
      gtick              |                                  ()                |
-     gtkam              |                         []    [] []                |
+     gtkam              |             []          []    [] []                |
      gtkorphan          |                []                []                |
      gtkspell           |             []                   [] []          [] |
      gutenprint         |                               []                   |
      hello              |                []    []       [] []             [] |
-     id-utils           |                               [] []                |
-     impost             |                                                    |
-     indent             |                      []          []             [] |
-     iso_3166           |                                  []             [] |
+     herrie             |                                  []                |
+     hylafax            |                                                    |
+     idutils            |                               [] []                |
+     indent             |                      [] []       []             [] |
+     iso_15924          |                                                    |
+     iso_3166           |       []    [] [] [] [] [] [] [] [] []          [] |
      iso_3166_2         |                                                    |
-     iso_4217           |                                  []                |
-     iso_639            |                                  []             [] |
+     iso_4217           |                         []    [] []                |
+     iso_639            |                         []    [] []             [] |
      jpilot             |                         []                         |
      jtag               |                                                    |
      jwhois             |                                                    |
      kbd                |                         []    [] [] []             |
-     keytouch           |                                                    |
-     keytouch-editor    |                                                    |
-     keytouch-keyboa... |                                                    |
+     keytouch           |                      []          []                |
+     keytouch-editor    |                                  []                |
+     keytouch-keyboa... |                      []                            |
      latrine            |                                  ()                |
      ld                 |                               []                   |
      leafpad            |                []    [] []       [] []             |
-     libc               |                      [] []    [] [] []             |
+     libc               |                      [] []    [] []                |
      libexif            |                                  []                |
      libextractor       |                                  []                |
      libgpewidget       |                         []    [] []                |
@@ -302,76 +302,70 @@ translation percentage of at least 50%.
      libgphoto2_port    |                               [] []                |
      libgsasl           |                                                    |
      libiconv           |                                  []             [] |
-     libidn             |                               []                [] |
+     libidn             |                         []    []                [] |
      lifelines          |                               [] ()                |
      lilypond           |                                  []                |
      lingoteach         |                                                    |
+     lprng              |                                                    |
      lynx               |                      [] []    [] []                |
      m4                 |                         []    [] [] []             |
+     mailfromd          |                                                    |
      mailutils          |                      []                            |
      make               |                               [] []                |
-     man-db             |                      [] ()    [] []                |
+     man-db             |                      []       [] []                |
      minicom            |                         []    [] []                |
-     mysecretdiary      |                               [] []                |
      nano               |                []    []          []                |
-     nano_1_0           |                      [] ()    [] []                |
      opcodes            |                                  []                |
-     parted             |                                                    |
-     pilot-qof          |                                            []      |
+     parted             |                         []       []                |
+     pilot-qof          |                                                    |
+     popt               |                         []    [] []                |
      psmisc             |                []                                  |
      pwdutils           |                                                    |
-     python             |                                                    |
      qof                |                                                    |
      radius             |                      []                            |
      recode             |             []       []       [] [] []          [] |
-     rpm                |                         []    []                   |
+     rpm                |                               []                   |
      screem             |                                                    |
      scrollkeeper       |          [] []       [] [] [] [] []        []      |
      sed                |                      []          []             [] |
-     sh-utils           |                               [] []                |
-     shared-mime-info   |                []       []                 []   [] |
+     shared-mime-info   |                []    [] []    [] () []     []   [] |
      sharutils          |                []    [] []    [] [] []             |
      shishi             |                                                    |
-     silky              |                                                    |
      skencil            |                               [] ()                |
-     sketch             |                               [] ()                |
      solfege            |                                                    |
      soundtracker       |                               [] []                |
      sp                 |                                  []                |
-     stardict           |                         []                         |
      system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
-     tar                |                []                                  |
+     tar                |                []                []                |
      texinfo            |                               [] []             [] |
-     textutils          |                      []       [] []                |
      tin                |                                  ()        ()      |
-     tp-robot           |                                  []                |
-     tuxpaint           | []             []             [] []        []      |
+     tuxpaint           | []             []             [] []        []   [] |
      unicode-han-tra... |                                                    |
      unicode-transla... |                                                    |
      util-linux         |                      [] []    [] []                |
-     vorbis-tools       |             []          []    []           []      |
+     util-linux-ng      |                      [] []    [] []                |
+     vorbis-tools       |                         []                         |
      wastesedge         |                                  ()                |
      wdiff              |                      []       [] []        []      |
-     wget               |                      []          []                |
-     xchat              |             [] []    []          [] []     []      |
-     xkeyboard-config   |                                                    |
-     xpad               |                []             []                   |
+     wget               |                      [] []       []                |
+     xchat              |             [] []    [] []       [] []     []      |
+     xkeyboard-config   |                []                                  |
+     xpad               |                []             []           []      |
                         +----------------------------------------------------+
                           af am ar az be bg bs ca cs cy da de el en en_GB eo
-                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+                           6  0  2  1  8 26  2 40 48  2 56 88 15  1  15   18
 
                           es et eu fa fi fr  ga gl gu he hi hr hu id is it
                         +--------------------------------------------------+
-     GNUnet             |                                                  |
+     Compendium         | []          [] []  []                []          |
      a2ps               |    []       [] []                             () |
      aegis              |                                                  |
      ant-phone          |                []                                |
      anubis             |                []                                |
      ap-utils           |             [] []                                |
      aspell             |                []  []                         [] |
-     bash               | []             []                    []          |
-     batchelor          |                []  []                            |
-     bfd                | []                                               |
+     bash               | []                                               |
+     bfd                | []          []                                   |
      bibshelf           | []                 []                         [] |
      binutils           | []          [] []                                |
      bison              | [] []          []  []                   []    [] |
@@ -384,36 +378,32 @@ translation percentage of at least 50%.
      cpio               | []             []  []                            |
      cpplib             | []             []                                |
      cryptonit          |                []                                |
-     darkstat           | []             ()  []                [] []       |
-     dialog             | [] [] []    [] []  []                []       [] |
+     dialog             |       []           []                         [] |
      diffutils          | []          [] []  [] []    []       [] []    [] |
      doodle             |                    []                         [] |
      e2fsprogs          | []             []                             [] |
      enscript           |                []  []             []             |
-     error              | []          [] []  []                []          |
      fetchmail          | []                                               |
-     fileutils          | [] []          []  []                []       [] |
-     findutils          |    []          []  []                []          |
+     findutils          |    []              []                []          |
+     findutils_stable   |    []          []  []                []          |
      flex               | []             []  []                            |
-     fslint             |                []                                |
+     fslint             |                                                  |
      gas                | []             []                                |
-     gawk               | []             []  []       []                   |
-     gbiff              |                []                                |
+     gawk               | []             []  []       []                () |
      gcal               | []             []                                |
      gcc                | []                                               |
-     gettext-examples   | []             []  []                [] []    [] |
+     gettext-examples   | []          [] []  []                [] []    [] |
      gettext-runtime    | []          [] []  []                   []    [] |
-     gettext-tools      | []             []                             [] |
-     gimp-print         | []             []                                |
-     gip                | []    []       []                                |
+     gettext-tools      | []    []       []                             [] |
+     gip                | []    []       []  []                            |
      gliv               |                ()                                |
      glunarclock        |             []     []                []          |
      gmult              |       []       []                             [] |
      gnubiff            |                ()                             () |
      gnucash            | ()             ()                    ()          |
-     gnucash-glossary   | []                                            [] |
      gnuedu             | []                                               |
-     gnulib             | [] [] []    [] []  [] []             []          |
+     gnulib             | [] []              []                            |
+     gnunet             |                                                  |
      gnunet-gtk         |                                                  |
      gnutls             |                                                  |
      gpe-aerial         | []             []                                |
@@ -435,68 +425,71 @@ translation percentage of at least 50%.
      gpe-today          | []          [] []  []                            |
      gpe-todo           | []                                               |
      gphoto2            | []          [] []                    []       [] |
-     gprof              | []             []  []                   []       |
-     gpsdrive           | ()             ()                    []       () |
+     gprof              | []          [] []  []                   []       |
+     gpsdrive           |    []                                            |
      gramadoir          |                []  []                            |
-     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
-     gretl              | []             []                             [] |
+     grep               | []          []     []                            |
+     gretl              | []    []       []                             () |
      gsasl              |                    []                   []       |
-     gss                |                []                                |
-     gst-plugins        |                []                    []       [] |
-     gst-plugins-base   |                                      []       [] |
-     gst-plugins-good   |       []                             []       [] |
+     gss                |                []  []                            |
+     gst-plugins-bad    | []          []                       []       [] |
+     gst-plugins-base   | []          []                       []       [] |
+     gst-plugins-good   | []    []    []                       []       [] |
+     gst-plugins-ugly   | []          []                       []       [] |
      gstreamer          |             []                       []       [] |
-     gtick              |                    []                            |
+     gtick              |             []     []                         [] |
      gtkam              | []             []                    []       [] |
      gtkorphan          |                []                             [] |
-     gtkspell           | []    []    [] []  []                         [] |
+     gtkspell           | []    []    [] []  []                []       [] |
      gutenprint         |                                      []          |
      hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
-     id-utils           |                []  []                [] []    [] |
-     impost             |                []  []                            |
+     herrie             |                    []                            |
+     hylafax            |                                                  |
+     idutils            |                []  []                [] []    [] |
      indent             | [] [] []    [] []  [] []             [] []    [] |
-     iso_3166           |             [] []                    []          |
+     iso_15924          |                []                                |
+     iso_3166           | [] [] []    [] []     [] [] [] [] [] [] []    [] |
      iso_3166_2         |                []                                |
-     iso_4217           |    []       []        []             []          |
-     iso_639            |          [] [] []  []                []          |
+     iso_4217           | [] []       [] []                    []       [] |
+     iso_639            | []       [] [] []  []                []          |
      jpilot             | []             []                                |
      jtag               |                []                                |
      jwhois             | []             []                    [] []    [] |
      kbd                | []             []                                |
-     keytouch           |                    []                            |
+     keytouch           |                []  []                         [] |
      keytouch-editor    |                    []                            |
-     keytouch-keyboa... |                    []                            |
-     latrine            |                []  []                         [] |
-     ld                 | []             []                                |
+     keytouch-keyboa... |                    []                         [] |
+     latrine            |                    []                         [] |
+     ld                 | []          [] []  []                            |
      leafpad            | []             []  []       []       []       [] |
      libc               | []          [] []     []             []          |
      libexif            | []                                               |
      libextractor       |                    []                            |
      libgpewidget       | []             []  []                [] []       |
-     libgpg-error       |                                                  |
+     libgpg-error       |                []                                |
      libgphoto2         | []             []                             [] |
      libgphoto2_port    |                []                             [] |
      libgsasl           |                []  []                            |
-     libiconv           |    []              []                            |
+     libiconv           |    []       []     []                            |
      libidn             |                []                             [] |
      lifelines          |                ()                                |
-     lilypond           |                []                                |
+     lilypond           | []          [] []                                |
      lingoteach         |                []                       []    [] |
+     lprng              |                                                  |
      lynx               |    []                                []       [] |
      m4                 |                []  [] []                []       |
+     mailfromd          |                                                  |
      mailutils          | []             []                                |
      make               | []          [] []  [] []    []    []    []       |
-     man-db             | ()                                               |
+     man-db             |                                               [] |
      minicom            | []          [] []                    []          |
-     mysecretdiary      | []             []                       []       |
-     nano               | []    []       []  []                []       [] |
-     nano_1_0           | []             []     []                []    [] |
+     nano               | []    []       []  [] []             []       [] |
      opcodes            | []          [] []  []                            |
-     parted             | []             []                       []    [] |
+     parted             |                []                       []    [] |
      pilot-qof          |                                                  |
-     psmisc             |       []                             []       [] |
+     popt               |                []  [] []                   []    |
+     psmisc             |                                      []       [] |
      pwdutils           |                                                  |
-     python             |                                                  |
      qof                |                                         []       |
      radius             | []             []                                |
      recode             | []             []  [] []    []       [] []    [] |
@@ -504,565 +497,539 @@ translation percentage of at least 50%.
      screem             |                                                  |
      scrollkeeper       | []          []                       []          |
      sed                | [] []          []  []                []          |
-     sh-utils           | [] []       [] []  []                []       [] |
      shared-mime-info   | []    []    [] []                    []       [] |
      sharutils          | [] []       [] []  [] []             []       [] |
-     shishi             |                                                  |
-     silky              |                []                                |
+     shishi             |                []                                |
      skencil            | []             []                                |
-     sketch             | []             []                                |
      solfege            |                                               [] |
      soundtracker       | []             []                             [] |
      sp                 |                []                                |
-     stardict           |                                      []          |
-     system-tools-ba... | []    []    [] []                 [] [] []    [] |
-     tar                | [] []       [] []  []                []       [] |
-     texinfo            |                []           []                   |
-     textutils          | []             []  [] []             []          |
+     system-tools-ba... | []    []    [] []  []             [] [] []    [] |
+     tar                |    [] []    []     []                []          |
+     texinfo            |                []           []       []          |
      tin                |    []          ()                                |
-     tp-robot           |             [] []  []                []          |
      tuxpaint           |                    []                []          |
      unicode-han-tra... |                                                  |
      unicode-transla... |                []  []                            |
      util-linux         | [] []       [] []                    [] []    [] |
-     vorbis-tools       | []             []                                |
+     util-linux-ng      | [] []       [] []                    [] []    [] |
+     vorbis-tools       |                                                  |
      wastesedge         |                ()                                |
      wdiff              | [] []          []  [] []             [] []    [] |
      wget               |    []       [] []  []             [] [] []    [] |
-     xchat              | []    []    [] []        []    []    []       [] |
-     xkeyboard-config   |             [] []                    []       [] |
+     xchat              | []          [] []        []    []    []       [] |
+     xkeyboard-config   | []          [] []                    []          |
      xpad               | []                 []                []          |
                         +--------------------------------------------------+
                           es et eu fa fi fr  ga gl gu he hi hr hu id is it
-                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
+                          85 22 14  2 48 101 61 12  2  8  2  6 53 29  1 52
 
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
-                        +-------------------------------------------------+
-     GNUnet             |                                                 |
-     a2ps               |    ()                      []          []    () |
-     aegis              |                                        ()       |
-     ant-phone          |                                        []       |
-     anubis             |                            []    []    []       |
-     ap-utils           |                            []                   |
-     aspell             |                         []             []       |
-     bash               |                                        []       |
-     batchelor          |                            []          []       |
-     bfd                |                                                 |
-     bibshelf           |                            []                   |
-     binutils           |                                                 |
-     bison              |                            []    []    []       |
-     bison-runtime      |                            []    []    []       |
-     bluez-pin          |       []                   []          []       |
-     cflow              |                                                 |
-     clisp              |                                        []       |
-     console-tools      |                                                 |
-     coreutils          |                                        []       |
-     cpio               |                                                 |
-     cpplib             |                                        []       |
-     cryptonit          |                                        []       |
-     darkstat           |                            []          []       |
-     dialog             |                            []          []       |
-     diffutils          | []                         []          []       |
-     doodle             |                                                 |
-     e2fsprogs          |                                        []       |
-     enscript           |                                        []       |
-     error              |                                        []       |
-     fetchmail          | []                                     []       |
-     fileutils          | []          []                                  |
-     findutils          |                                        []       |
-     flex               |    []                                  []       |
-     fslint             |                            []          []       |
-     gas                |                                                 |
-     gawk               | []                                     []       |
-     gbiff              |                                        []       |
-     gcal               |                                                 |
-     gcc                |                                                 |
-     gettext-examples   | []                                     []       |
-     gettext-runtime    | [] []                                  []       |
-     gettext-tools      | [] []                                           |
-     gimp-print         | []                                     []       |
-     gip                |                            []          []       |
-     gliv               |                                        []       |
-     glunarclock        |                            []          []       |
-     gmult              | []                         []                   |
-     gnubiff            |                                                 |
-     gnucash            | ()                               ()             |
-     gnucash-glossary   |                                        []       |
-     gnuedu             |                                                 |
-     gnulib             | [] []                      []          []       |
-     gnunet-gtk         |                                                 |
-     gnutls             |                                                 |
-     gpe-aerial         |                                        []       |
-     gpe-beam           |                                        []       |
-     gpe-calendar       | []                                              |
-     gpe-clock          | [] []                                  []       |
-     gpe-conf           |    []                                  []       |
-     gpe-contacts       |    []                                           |
-     gpe-edit           | [] []                                  []       |
-     gpe-filemanager    | [] []                                           |
-     gpe-go             | [] []                                  []       |
-     gpe-login          | [] []                                  []       |
-     gpe-ownerinfo      | []                                     []       |
-     gpe-package        | [] []                                           |
-     gpe-sketchbook     |    []                                  []       |
-     gpe-su             | [] []                                  []       |
-     gpe-taskmanager    | [] [] []                               []       |
-     gpe-timesheet      |                                        []       |
-     gpe-today          | []                                     []       |
-     gpe-todo           | []                                              |
-     gphoto2            | []                                     []       |
-     gprof              |                                                 |
-     gpsdrive           | ()                                     ()    () |
-     gramadoir          |                                        ()       |
-     grep               | []       []                      []    []       |
-     gretl              |                                                 |
-     gsasl              |                                        []       |
-     gss                |                                                 |
-     gst-plugins        |                                        []       |
-     gst-plugins-base   |                                                 |
-     gst-plugins-good   |                                        []       |
-     gstreamer          |                                        []       |
-     gtick              |                                                 |
-     gtkam              | []                                              |
-     gtkorphan          |                                        []       |
-     gtkspell           |                         []             []       |
-     gutenprint         |                                                 |
-     hello              | [] []                      []    []    [] []    |
-     id-utils           |                                        []       |
-     impost             |                                                 |
-     indent             | []                                     []       |
-     iso_3166           |                                        []       |
-     iso_3166_2         |                                        []       |
-     iso_4217           | []                      []             []       |
-     iso_639            | []                                     []       |
-     jpilot             | ()                                     ()    () |
-     jtag               |                                                 |
-     jwhois             |                                        []       |
-     kbd                |                                        []       |
-     keytouch           |                                        []       |
-     keytouch-editor    |                                                 |
-     keytouch-keyboa... |                                                 |
-     latrine            |                                        []       |
-     ld                 |                                                 |
-     leafpad            | []             []                               |
-     libc               | [] []                            []    []    [] |
-     libexif            |                                                 |
-     libextractor       |                                                 |
-     libgpewidget       |                                        []       |
-     libgpg-error       |                                                 |
-     libgphoto2         | []                                              |
-     libgphoto2_port    | []                                              |
-     libgsasl           |                                        []       |
-     libiconv           |                                                 |
-     libidn             | []                                     []       |
-     lifelines          |                                        []       |
-     lilypond           |                                                 |
-     lingoteach         |                                        []       |
-     lynx               | []                                     []       |
-     m4                 | []                                     []       |
-     mailutils          |                                                 |
-     make               | [] []                                  []       |
-     man-db             | ()                                              |
-     minicom            | []                                              |
-     mysecretdiary      |                                        []       |
-     nano               |                            []    []    []       |
-     nano_1_0           |                            []    []       []    |
-     opcodes            |                                        []       |
-     parted             | []                                     []       |
-     pilot-qof          |                                                 |
-     psmisc             | []                               []    []       |
-     pwdutils           |                                                 |
-     python             |                                                 |
-     qof                |                                                 |
-     radius             |                                                 |
-     recode             |                                        []       |
-     rpm                | [] []                                           |
-     screem             | []                                              |
-     scrollkeeper       |                                  [] [] [] []    |
-     sed                | []                                     []       |
-     sh-utils           | []                               []             |
-     shared-mime-info   |    []          []                []    [] []    |
-     sharutils          | []                                     []       |
-     shishi             |                                                 |
-     silky              |                                        []       |
-     skencil            |                                                 |
-     sketch             |                                                 |
-     solfege            |                                                 |
-     soundtracker       |                                                 |
-     sp                 | ()                                              |
-     stardict           |                      []                []       |
-     system-tools-ba... | [] []          []                      []       |
-     tar                | []       []                            []       |
-     texinfo            | []                               []    []       |
-     textutils          | [] []                            []             |
-     tin                |                                                 |
-     tp-robot           |                                        []       |
-     tuxpaint           |                                           []    |
-     unicode-han-tra... |                                                 |
-     unicode-transla... |                                                 |
-     util-linux         | []                                     []       |
-     vorbis-tools       |                                        []       |
-     wastesedge         |                                        []       |
-     wdiff              |                            []    []             |
-     wget               | []                                     []       |
-     xchat              | [] []                []                []       |
-     xkeyboard-config   |                                        []       |
-     xpad               |    []                      []          []       |
-                        +-------------------------------------------------+
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
-                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                        +--------------------------------------------------+
+     Compendium         |                                           []     |
+     a2ps               |       ()                      []          []     |
+     aegis              |                                           ()     |
+     ant-phone          |                                           []     |
+     anubis             |                               []    []    []     |
+     ap-utils           |                               []                 |
+     aspell             |                            []             []     |
+     bash               |                                           []     |
+     bfd                |                                                  |
+     bibshelf           |                               []                 |
+     binutils           |                                                  |
+     bison              |                               []    []    []     |
+     bison-runtime      |                               []    []    []     |
+     bluez-pin          |          []                   []          []     |
+     cflow              |                                                  |
+     clisp              |                                           []     |
+     console-tools      |                                                  |
+     coreutils          |                                           []     |
+     cpio               |                                           []     |
+     cpplib             |                                           []     |
+     cryptonit          |                                           []     |
+     dialog             |                               []          []     |
+     diffutils          | []                            []          []     |
+     doodle             |                                                  |
+     e2fsprogs          |                                           []     |
+     enscript           |                                           []     |
+     fetchmail          | []                                        []     |
+     findutils          |                                           []     |
+     findutils_stable   |                                           []     |
+     flex               |       []                                  []     |
+     fslint             |                                                  |
+     gas                |                                                  |
+     gawk               | []                                        []     |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | []                            []          []     |
+     gettext-runtime    | []    []                                  []     |
+     gettext-tools      | []    []                                         |
+     gip                |                               []          []     |
+     gliv               |                                           []     |
+     glunarclock        |                               []          []     |
+     gmult              | []                            []          []     |
+     gnubiff            |                                                  |
+     gnucash            | ()                                  () ()        |
+     gnuedu             |                                                  |
+     gnulib             | []                                        []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                               []                 |
+     gpe-aerial         |                                           []     |
+     gpe-beam           |                                           []     |
+     gpe-calendar       | []                                               |
+     gpe-clock          | []    []                                  []     |
+     gpe-conf           | []    []                                  []     |
+     gpe-contacts       |       []                                         |
+     gpe-edit           | []    []                                  []     |
+     gpe-filemanager    | []    []                                         |
+     gpe-go             | []    []                                  []     |
+     gpe-login          | []    []                                  []     |
+     gpe-ownerinfo      | []                                        []     |
+     gpe-package        | []    []                                         |
+     gpe-sketchbook     |       []                                  []     |
+     gpe-su             | []    []                                  []     |
+     gpe-taskmanager    | []    [] []                               []     |
+     gpe-timesheet      |                                           []     |
+     gpe-today          | []                                        []     |
+     gpe-todo           | []                                               |
+     gphoto2            | []                                        []     |
+     gprof              |                               []                 |
+     gpsdrive           |                                           []     |
+     gramadoir          |                                           ()     |
+     grep               |             []                            []     |
+     gretl              |                                                  |
+     gsasl              |                                           []     |
+     gss                |                                                  |
+     gst-plugins-bad    |                                           []     |
+     gst-plugins-base   |                                           []     |
+     gst-plugins-good   |                                           []     |
+     gst-plugins-ugly   |                                           []     |
+     gstreamer          |                                           []     |
+     gtick              |                                           []     |
+     gtkam              | []                                        []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |                            []             []     |
+     gutenprint         |                                           []     |
+     hello              | [] [] []                      []    []    []  [] |
+     herrie             |                                           []     |
+     hylafax            |                                                  |
+     idutils            |                                           []     |
+     indent             | []                                        []     |
+     iso_15924          |                                           []     |
+     iso_3166           | []    [] []       []    []          []    []  [] |
+     iso_3166_2         |                                           []     |
+     iso_4217           | []                []                      []     |
+     iso_639            | []                []                      []  [] |
+     jpilot             | ()                                        ()     |
+     jtag               |                                                  |
+     jwhois             |                                           []     |
+     kbd                |                                           []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                                  |
+     latrine            |                                           []     |
+     ld                 |                                                  |
+     leafpad            | []                []                             |
+     libc               | []    []                                  []     |
+     libexif            |                                                  |
+     libextractor       |                                                  |
+     libgpewidget       |                                           []     |
+     libgpg-error       |                                                  |
+     libgphoto2         | []                                               |
+     libgphoto2_port    | []                                               |
+     libgsasl           |                                           []     |
+     libiconv           |                                           []     |
+     libidn             | []                                        []     |
+     lifelines          |                                           []     |
+     lilypond           |                                           []     |
+     lingoteach         |                                           []     |
+     lprng              |                                                  |
+     lynx               | []                                        []     |
+     m4                 | []                                        []     |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               | []    []                                  []     |
+     man-db             |                                                  |
+     minicom            | []                                               |
+     nano               |                               []    []    []     |
+     opcodes            |                                           []     |
+     parted             | []                                        []     |
+     pilot-qof          |                                                  |
+     popt               | []    []                                  []     |
+     psmisc             | []                                  []    []     |
+     pwdutils           |                                                  |
+     qof                |                                                  |
+     radius             |                                                  |
+     recode             |                                           []     |
+     rpm                | []    []                                         |
+     screem             | []                                               |
+     scrollkeeper       |                                     [] [] []  [] |
+     sed                | []                                        []     |
+     shared-mime-info   | []    []          []          []    []    []  [] |
+     sharutils          | []                                        []     |
+     shishi             |                                                  |
+     skencil            |                                                  |
+     solfege            |                                     ()        () |
+     soundtracker       |                                                  |
+     sp                 | ()                                               |
+     system-tools-ba... | []    []          []                      []     |
+     tar                | []          []                            []     |
+     texinfo            |                                     []    []     |
+     tin                |                                                  |
+     tuxpaint           |                                     ()    []  [] |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | []                                        []     |
+     util-linux-ng      | []                                        []     |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                           []     |
+     wdiff              |                               []    []           |
+     wget               | []                                        []     |
+     xchat              | []    []                []                []     |
+     xkeyboard-config   |    [] []                                  []     |
+     xpad               |       []                      []          []     |
+                        +--------------------------------------------------+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                          51  2 25  3  2  0  6  0  2  2 20  0 11  1 103  6
 
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                        +------------------------------------------------------+
-     GNUnet             |                                                      |
-     a2ps               |           ()     []      [] []       []    [] []     |
-     aegis              |                          () ()                       |
-     ant-phone          |                          []                   []     |
-     anubis             |           []             [] []                       |
-     ap-utils           |           ()                                         |
-     aspell             |                          [] []                       |
-     bash               |                  []      [] []                       |
-     batchelor          |                          []                   []     |
-     bfd                |                                                      |
-     bibshelf           |                                               []     |
-     binutils           |                             []                []     |
-     bison              |           []     []      [] []                []     |
-     bison-runtime      |           []             []          []       []     |
-     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
-     cflow              |           []                                         |
-     clisp              |                             []                       |
-     console-tools      |                             []                       |
-     coreutils          |           []                []       []       []     |
-     cpio               |           []                []                []     |
-     cpplib             |                                               []     |
-     cryptonit          |                  []                           []     |
-     darkstat           |           []     []      []       []       [] []     |
-     dialog             |           [] []  []   [] [] [] []          [] []     |
-     diffutils          |           []     []      [] []             [] []     |
-     doodle             |                                         []    []     |
-     e2fsprogs          |           []                                  []     |
-     enscript           |                  []      [] []       []       []     |
-     error              |                  []      []       []          []     |
-     fetchmail          |           []                []          []           |
-     fileutils          |           []             [] []       []       []     |
-     findutils          |           [] []          []       [] []       []     |
-     flex               |           []     []      [] []                []     |
-     fslint             |                  []      []                [] []     |
-     gas                |                                                      |
-     gawk               |           []     []      []                   []     |
-     gbiff              |                          []                          |
-     gcal               |                                               []     |
-     gcc                |                                               []     |
-     gettext-examples   |           [] []          [] []    [] []    [] []     |
-     gettext-runtime    |           [] []          [] []    [] []    [] []     |
-     gettext-tools      |           []             [] []    [] []    [] []     |
-     gimp-print         |                                   []          []     |
-     gip                |                       []          []       [] []     |
-     gliv               |                  []      []       []          []     |
-     glunarclock        |                  []      [] []    []       [] []     |
-     gmult              |                       [] []                [] []     |
-     gnubiff            |                          ()                          |
-     gnucash            |           ()                                  []     |
-     gnucash-glossary   |              []                   []          []     |
-     gnuedu             |                                                      |
-     gnulib             |           []             [] []       []       []     |
-     gnunet-gtk         |                                               []     |
-     gnutls             |           []                                  []     |
-     gpe-aerial         |              []  []      [] []       []    [] []     |
-     gpe-beam           |              []  []      [] []       []    [] []     |
-     gpe-calendar       |                             []                       |
-     gpe-clock          |              []  []      [] []    [] []    [] []     |
-     gpe-conf           |              []  []      [] []    [] []       []     |
-     gpe-contacts       |                          [] []       []    [] []     |
-     gpe-edit           |              []  []      [] []    [] []    [] []     |
-     gpe-filemanager    |                                      []       []     |
-     gpe-go             |                  []      [] []       []    [] []     |
-     gpe-login          |              []  []      [] []    [] []    [] []     |
-     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
-     gpe-package        |                                      []       []     |
-     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
-     gpe-su             |              []  []      [] []    [] []    [] []     |
-     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
-     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
-     gpe-today          |              []  []      [] []    [] []    [] []     |
-     gpe-todo           |                             []       []    [] []     |
-     gphoto2            |           []             []       []       [] []     |
-     gprof              |                  []      []                   []     |
-     gpsdrive           |        []                []                   []     |
-     gramadoir          |                                   []          []     |
-     grep               |           [] []  []      [] []       []    [] []     |
-     gretl              |           []                                         |
-     gsasl              |           []                               [] []     |
-     gss                |           []             []                   []     |
-     gst-plugins        |     []                                  [] [] []     |
-     gst-plugins-base   |                                               []     |
-     gst-plugins-good   |     []                                  [] [] []     |
-     gstreamer          |                                         [] [] []     |
-     gtick              |                             []                       |
-     gtkam              |           []     []         []                []     |
-     gtkorphan          |                                               []     |
-     gtkspell           |                  []   [] [] []    [] []    [] []     |
-     gutenprint         |                                               []     |
-     hello              |           []     []      [] []    [] []    [] []     |
-     id-utils           |                  []      [] []                []     |
-     impost             |                                               []     |
-     indent             |                  []      [] []    []       [] []     |
-     iso_3166           |              []                []    [] [] [] []     |
-     iso_3166_2         |                                                      |
-     iso_4217           |                                []    []    [] []     |
-     iso_639            |                                []    []    [] []     |
-     jpilot             |                                                      |
-     jtag               |                                   []                 |
-     jwhois             |           []     []      []                   []     |
-     kbd                |           []             []                   []     |
-     keytouch           |                                               []     |
-     keytouch-editor    |                                               []     |
-     keytouch-keyboa... |                                               []     |
-     latrine            |                          []                   []     |
-     ld                 |                                               []     |
-     leafpad            |           [] []             []    []          []  [] |
-     libc               |           []     []         []    []          []     |
-     libexif            |           []                                         |
-     libextractor       |                          []                   []     |
-     libgpewidget       |              []  []      []       [] []    [] []     |
-     libgpg-error       |           []             []                          |
-     libgphoto2         |           []                                         |
-     libgphoto2_port    |           []                []                []     |
-     libgsasl           |           []             []                [] []     |
-     libiconv           |                                      []    []        |
-     libidn             |           []                               [] ()     |
-     lifelines          |           []                                  []     |
-     lilypond           |                                                      |
-     lingoteach         |                  []                                  |
-     lynx               |                  []         []                []     |
-     m4                 |           []     []      [] []                []     |
-     mailutils          |           []             [] []                []     |
-     make               |           []     []         []                []     |
-     man-db             |                          []                   []     |
-     minicom            |           []     []      [] []                []     |
-     mysecretdiary      |                  []      [] []                []     |
-     nano               |                  []      []                   []     |
-     nano_1_0           |           []             [] []                []     |
-     opcodes            |                          []                   []     |
-     parted             |           []                                         |
-     pilot-qof          |                                               []     |
-     psmisc             |           []                                  []     |
-     pwdutils           |           []                                  []     |
-     python             |                                                      |
-     qof                |                  []                           []     |
-     radius             |           []                []                       |
-     recode             |           [] []  []      [] []       []       []     |
-     rpm                |           [] []             []                []     |
-     screem             |                                                      |
-     scrollkeeper       |           []             [] []    []    [] [] []     |
-     sed                |           [] []  []      [] []    [] []    [] []     |
-     sh-utils           |                             []       []    []        |
-     shared-mime-info   |              []  []                     [] [] []     |
-     sharutils          |           []                []             [] []     |
-     shishi             |           []                                         |
-     silky              |                                   []                 |
-     skencil            |              []  []                           []     |
-     sketch             |              []  []                           []     |
-     solfege            |                                               []     |
-     soundtracker       |                                   []          []     |
-     sp                 |                                                      |
-     stardict           |                             []    []          []     |
-     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
-     tar                |           []             [] []       []       []     |
-     texinfo            |           []             [] []                []     |
-     textutils          |                             []       []       []     |
-     tin                |                             ()                       |
-     tp-robot           |                             []                       |
-     tuxpaint           |              []                      [] [] [] []     |
-     unicode-han-tra... |                                                      |
-     unicode-transla... |                                                      |
-     util-linux         |                  []         []       []       []     |
-     vorbis-tools       |                          [] []                       |
-     wastesedge         |                                                      |
-     wdiff              |           []     []      [] []    []          []     |
-     wget               |              []             []    []          []     |
-     xchat              |        []                   []    [] [] [] [] []     |
-     xkeyboard-config   |                                      []       []     |
-     xpad               |                                   [] []       []     |
-                        +------------------------------------------------------+
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +--------------------------------------------------+
+     Compendium         |          []  []      []       []          []     |
+     a2ps               |       ()     []      [] []       []    [] []     |
+     aegis              |                      () ()                       |
+     ant-phone          |                      []                   []     |
+     anubis             |       []             [] []                       |
+     ap-utils           |       ()                                         |
+     aspell             |                      [] []    []                 |
+     bash               |       []                      []                 |
+     bfd                |                                                  |
+     bibshelf           |                                           []     |
+     binutils           |                         []    []                 |
+     bison              |       []     []      [] []                []     |
+     bison-runtime      |       []     []      []          []       []     |
+     bluez-pin          |       []     []   [] [] []    [] []    [] []     |
+     cflow              |       []                                         |
+     clisp              |                         []                       |
+     console-tools      |                         []                       |
+     coreutils          |       []                []       []       []     |
+     cpio               |       []                []                []     |
+     cpplib             |                                           []     |
+     cryptonit          |              []                           []     |
+     dialog             |                                           []     |
+     diffutils          |       []     []      [] []             [] []     |
+     doodle             |                                     []    []     |
+     e2fsprogs          |       []                                  []     |
+     enscript           |              []      [] []       []       []     |
+     fetchmail          |       []                []          []           |
+     findutils          |       [] []                               []     |
+     findutils_stable   |       [] []          []       [] []       []     |
+     flex               |       []     []      [] []                []     |
+     fslint             |                                           []     |
+     gas                |                                                  |
+     gawk               |       []     []      []                   []     |
+     gcal               |                                           []     |
+     gcc                |                                        [] []     |
+     gettext-examples   |       [] []          [] []    [] []    [] []     |
+     gettext-runtime    |       [] []          [] []    [] []    [] []     |
+     gettext-tools      |       []             [] []    [] []    [] []     |
+     gip                |                   []          []       [] []     |
+     gliv               |       []     []      [] []    []          []     |
+     glunarclock        |              []      [] []    []       [] []     |
+     gmult              |                   [] []                [] []     |
+     gnubiff            |                      ()                   []     |
+     gnucash            |       ()                                  []     |
+     gnuedu             |                                                  |
+     gnulib             |       []                         []       []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                           []     |
+     gnutls             |       []                                  []     |
+     gpe-aerial         |          []  []      [] []       []    [] []     |
+     gpe-beam           |          []  []      [] []       []    [] []     |
+     gpe-calendar       |                         []       []    [] []     |
+     gpe-clock          |          []  []      [] []    [] []    [] []     |
+     gpe-conf           |          []  []      [] []    [] []       []     |
+     gpe-contacts       |                      [] []       []    [] []     |
+     gpe-edit           |       [] []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                  []       []     |
+     gpe-go             |       []     []      [] []    [] []    [] []     |
+     gpe-login          |          []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |          []  []      [] []    [] []    [] []     |
+     gpe-package        |                                  []       []     |
+     gpe-sketchbook     |          []  []      [] []    [] []    [] []     |
+     gpe-su             |          []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |          []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |          []  []      [] []    [] []    [] []     |
+     gpe-today          |          []  []      [] []    [] []    [] []     |
+     gpe-todo           |                         []       []    [] []     |
+     gphoto2            |    [] []             []       []       [] []     |
+     gprof              |              []      []                   []     |
+     gpsdrive           |                         []                []     |
+     gramadoir          |                               []          []     |
+     grep               |       []                      [] []       []     |
+     gretl              |       [] []  []                                  |
+     gsasl              |       []                               [] []     |
+     gss                |       []             []       []          []     |
+     gst-plugins-bad    |       []     []                           []     |
+     gst-plugins-base   |       []                                  []     |
+     gst-plugins-good   |       []                                  []     |
+     gst-plugins-ugly   |       []     []                           []     |
+     gstreamer          |       []                            [] [] []     |
+     gtick              |                         []                       |
+     gtkam              |    [] []     []         []                []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |              []   [] [] []    [] []    [] []     |
+     gutenprint         |                                           []     |
+     hello              |       []     []      [] []    [] []    [] []     |
+     herrie             |       []                []                []     |
+     hylafax            |                                                  |
+     idutils            |       []     []      [] []                []     |
+     indent             |       []     []      [] []    []       [] []     |
+     iso_15924          |                                                  |
+     iso_3166           |    [] [] []  []      [] [] [] [] [] [] [] []  [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |       [] []             [] []    []    [] []     |
+     iso_639            |       []                [] [] [] []    [] []     |
+     jpilot             |                                                  |
+     jtag               |                               []                 |
+     jwhois             |       []     []      []                   []     |
+     kbd                |       []             []                   []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                           []     |
+     latrine            |                                                  |
+     ld                 |                                           []     |
+     leafpad            |       [] []             []    []          []  [] |
+     libc               |       []                []    []          []     |
+     libexif            |       []                      []                 |
+     libextractor       |                      []                   []     |
+     libgpewidget       |       [] []  []      []       [] []    [] []     |
+     libgpg-error       |       []             []                   []     |
+     libgphoto2         |       []                                         |
+     libgphoto2_port    |       []                []                []     |
+     libgsasl           |       []             []                [] []     |
+     libiconv           |                                  []    [] []     |
+     libidn             |       []                               [] ()     |
+     lifelines          |       []                                  []     |
+     lilypond           |                                                  |
+     lingoteach         |              []                                  |
+     lprng              |       []                                         |
+     lynx               |              []         []                []     |
+     m4                 |       []     []      [] []                []     |
+     mailfromd          |       []                                         |
+     mailutils          |       []                []                []     |
+     make               |       []     []         []                []     |
+     man-db             |       []             [] []                []     |
+     minicom            |       []     []      [] []                []     |
+     nano               |              []      [] []                []     |
+     opcodes            |                      []                   []     |
+     parted             |       []                                         |
+     pilot-qof          |                                                  |
+     popt               |       [] []             []                []     |
+     psmisc             |       []                                  []     |
+     pwdutils           |       []                                  []     |
+     qof                |              []                           []     |
+     radius             |       []                []                       |
+     recode             |       [] []  []      [] []       []       []     |
+     rpm                |       [] []             []                []     |
+     screem             |                                                  |
+     scrollkeeper       |       []             [] []    []    [] [] []     |
+     sed                |       [] []  []      [] []    [] []    [] []     |
+     shared-mime-info   |       [] []  []                     [] [] []     |
+     sharutils          |       []                []             [] []     |
+     shishi             |       []                                         |
+     skencil            |          []  []                           []     |
+     solfege            |              []                                  |
+     soundtracker       |                               []          []     |
+     sp                 |                                                  |
+     system-tools-ba... |    [] [] []  []      []             [] [] []  [] |
+     tar                |       []                []       []       []     |
+     texinfo            |       []             [] []                []     |
+     tin                |                         ()                       |
+     tuxpaint           |       [] []                      [] [] [] []     |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         |              []         []       []       []     |
+     util-linux-ng      |              []         []       []       []     |
+     vorbis-tools       |                         []                       |
+     wastesedge         |                                                  |
+     wdiff              |       []     []      [] []    [] []       []     |
+     wget               |          []             []    []          []     |
+     xchat              |    []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                               [] []       []     |
+     xpad               |                               [] []       []     |
+                        +--------------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0  5 77 31  53    4 58 72  3 45 46  9 45 122  3
 
                           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
                         +---------------------------------------------------+
-     GNUnet             |                    []                             |  2
+     Compendium         |          []        []         []          []      | 19
      a2ps               |          [] []     []                             | 19
-     aegis              |                                                   |  0
+     aegis              |                    []                             |  1
      ant-phone          |          []        []                             |  6
      anubis             |          [] []     []                             | 11
      ap-utils           |             ()     []                             |  4
-     aspell             |             []     []  []                         | 15
-     bash               |                    []                             | 11
-     batchelor          |          []        []                             |  9
-     bfd                |                                                   |  1
+     aspell             |             []     []  []                         | 16
+     bash               |          []                                       |  6
+     bfd                |                                                   |  2
      bibshelf           |                    []                             |  7
-     binutils           |          []        []                     []      |  9
-     bison              |          []        []                     []      | 19
-     bison-runtime      |                    []         []          []      | 15
+     binutils           |          [] []     []                     []      |  9
+     bison              |          [] []     []                     []      | 20
+     bison-runtime      |             []     []         []          []      | 18
      bluez-pin          |          [] []     []  []     []          []      | 28
      cflow              |             []     []                             |  5
-     clisp              |                                                   |  6
+     clisp              |                                                   |  9
      console-tools      |          []        []                             |  5
-     coreutils          |          []        []                             | 16
-     cpio               |          [] []     []                             |  9
-     cpplib             |          []        []         []          []      | 11
-     cryptonit          |                                                   |  5
-     darkstat           |                    []         ()          ()      | 15
-     dialog             |          [] []     []         []          []      | 30
-     diffutils          |          []        []         []          []      | 28
+     coreutils          |          [] []     []                             | 18
+     cpio               |          [] []     []         []                  | 11
+     cpplib             |          [] []     []         []          []      | 12
+     cryptonit          |                    []                             |  6
+     dialog             |                    []  []     []                  |  9
+     diffutils          |          [] []     []         []          []      | 29
      doodle             |                    []                             |  6
      e2fsprogs          |          []        []                             | 10
      enscript           |          [] []     []                             | 16
-     error              |          []        []         []          []      | 18
      fetchmail          |          []        []                             | 12
-     fileutils          |          []                   []          []      | 18
-     findutils          |          []        []                     []      | 17
+     findutils          |          [] []     []                             | 11
+     findutils_stable   |          [] []     []                     []      | 18
      flex               |          []        []                             | 15
-     fslint             |                    []                             |  9
+     fslint             |                    []                             |  2
      gas                |          []                                       |  3
-     gawk               |          []        []                             | 15
-     gbiff              |                    []                             |  5
+     gawk               |          []        []         []                  | 16
      gcal               |          []                                       |  5
-     gcc                |          []                   []          []      |  6
-     gettext-examples   |          [] []     []         []    []    []      | 27
+     gcc                |          []                   []          []      |  7
+     gettext-examples   |          [] []     []         []    []    []      | 29
      gettext-runtime    |          [] []     []         []    []    []      | 28
-     gettext-tools      |          [] []     []         []          []      | 19
-     gimp-print         |             []     []                             | 12
-     gip                |                    []                     []      | 12
-     gliv               |          []        []                             |  8
+     gettext-tools      |          [] []     []         []          []      | 20
+     gip                |                    []                     []      | 13
+     gliv               |          []        []                             | 11
      glunarclock        |                    []  []                 []      | 15
-     gmult              |          []        []         []          []      | 15
-     gnubiff            |                    []                             |  1
-     gnucash            |          ()                                       |  2
-     gnucash-glossary   |                    []                     []      |  9
+     gmult              |          []        []         []          []      | 16
+     gnubiff            |                    []                             |  2
+     gnucash            |          () []                                    |  5
      gnuedu             |                    []                             |  2
-     gnulib             |          [] []     []         []          []      | 28
-     gnunet-gtk         |                                                   |  1
-     gnutls             |                                                   |  2
+     gnulib             |                    []                             | 10
+     gnunet             |                                                   |  0
+     gnunet-gtk         |          []        []                             |  3
+     gnutls             |                                                   |  4
      gpe-aerial         |                    []         []                  | 14
      gpe-beam           |                    []         []                  | 14
-     gpe-calendar       |                    []                             |  3
+     gpe-calendar       |                    []  []                         |  7
      gpe-clock          |          []        []  []     []                  | 21
-     gpe-conf           |                    []         []                  | 14
+     gpe-conf           |                    []  []     []                  | 16
      gpe-contacts       |                    []         []                  | 10
-     gpe-edit           |          []        []  []                 []      | 20
-     gpe-filemanager    |                    []                             |  6
-     gpe-go             |          []        []                             | 15
+     gpe-edit           |          []        []  []     []          []      | 22
+     gpe-filemanager    |                    []  []                         |  7
+     gpe-go             |          []        []  []     []                  | 19
      gpe-login          |          []        []  []     []          []      | 21
      gpe-ownerinfo      |          []        []         []          []      | 21
      gpe-package        |                    []                             |  6
      gpe-sketchbook     |          []        []                             | 16
-     gpe-su             |          []        []         []                  | 20
-     gpe-taskmanager    |          []        []         []                  | 20
+     gpe-su             |          []        []  []     []                  | 21
+     gpe-taskmanager    |          []        []  []     []                  | 21
      gpe-timesheet      |          []        []         []          []      | 18
      gpe-today          |          []        []  []     []          []      | 21
-     gpe-todo           |                    []                             |  7
-     gphoto2            |             []     []         []          []      | 20
-     gprof              |          []        []                             | 11
-     gpsdrive           |                                                   |  4
+     gpe-todo           |                    []  []                         |  8
+     gphoto2            |             []     []         []          []      | 21
+     gprof              |          []        []                             | 13
+     gpsdrive           |                    []                             |  5
      gramadoir          |                    []                             |  7
-     grep               |          [] []     []                     []      | 34
-     gretl              |                                                   |  4
-     gsasl              |                    []         []                  |  8
-     gss                |                    []                             |  5
-     gst-plugins        |             []     []                     []      | 15
-     gst-plugins-base   |             []     []         []                  |  9
-     gst-plugins-good   |             []     []         []    []    []      | 20
-     gstreamer          |          [] []     []                             | 17
-     gtick              |                    []                             |  3
-     gtkam              |                    []                             | 13
+     grep               |                    []                             | 12
+     gretl              |                                                   |  6
+     gsasl              |                    []         []          []      |  9
+     gss                |                    []                             |  7
+     gst-plugins-bad    |             []     []         []                  | 13
+     gst-plugins-base   |             []     []                             | 11
+     gst-plugins-good   |             []     []         []    []    []      | 16
+     gst-plugins-ugly   |             []     []         []                  | 13
+     gstreamer          |          [] []     []                             | 18
+     gtick              |             []     []                             |  7
+     gtkam              |                    []                             | 16
      gtkorphan          |                    []                             |  7
-     gtkspell           |             []     []  []     []    []    []      | 26
-     gutenprint         |                                                   |  3
-     hello              |          [] []     []         []          []      | 37
-     id-utils           |          []        []                             | 14
-     impost             |                    []                             |  4
-     indent             |          []        []         []          []      | 25
-     iso_3166           |       [] []        []               []            | 16
-     iso_3166_2         |                                                   |  2
-     iso_4217           |          []        []                             | 14
-     iso_639            |                    []                             | 14
+     gtkspell           |             []     []  []     []    []    []      | 27
+     gutenprint         |                                                   |  4
+     hello              |          [] []     []         []          []      | 38
+     herrie             |          []        []                             |  8
+     hylafax            |                                                   |  0
+     idutils            |          []        []                             | 15
+     indent             |          [] []     []         []          []      | 28
+     iso_15924          |                    []         []                  |  4
+     iso_3166           |    [] [] [] []     []  []     []    []    []      | 54
+     iso_3166_2         |                    []         []                  |  4
+     iso_4217           |    []    []        []         []    []            | 24
+     iso_639            |             []     []  []     []    []            | 26
      jpilot             |          [] []     []         []                  |  7
      jtag               |                    []                             |  3
      jwhois             |          []        []                     []      | 13
-     kbd                |          []        []                             | 12
-     keytouch           |                    []                             |  4
-     keytouch-editor    |                                                   |  2
-     keytouch-keyboa... |                    []                             |  3
-     latrine            |          []        []                             |  8
-     ld                 |          []        []         []          []      |  8
-     leafpad            |          []        []         []          []      | 23
-     libc               |          []                   []          []      | 23
-     libexif            |                    []                             |  4
+     kbd                |          [] []     []                             | 13
+     keytouch           |                    []                             |  8
+     keytouch-editor    |                    []                             |  5
+     keytouch-keyboa... |                    []                             |  5
+     latrine            |          []        []                             |  5
+     ld                 |          []        []         []          []      | 10
+     leafpad            |          [] []     []         []          []      | 24
+     libc               |          []                   []          []      | 19
+     libexif            |                    []                             |  5
      libextractor       |                    []                             |  5
-     libgpewidget       |                    []  []     []                  | 19
-     libgpg-error       |                    []                             |  4
-     libgphoto2         |             []                                    |  8
+     libgpewidget       |                    []  []     []                  | 20
+     libgpg-error       |                    []                             |  6
+     libgphoto2         |             []     []                             |  9
      libgphoto2_port    |             []     []                     []      | 11
      libgsasl           |                    []                             |  8
-     libiconv           |                    []                             |  7
-     libidn             |                    []         []                  | 10
+     libiconv           |                    []  []                         | 11
+     libidn             |                    []         []                  | 11
      lifelines          |                                                   |  4
-     lilypond           |                                                   |  2
+     lilypond           |                    []                             |  6
      lingoteach         |                    []                             |  6
+     lprng              |                    []                             |  2
      lynx               |          [] []     []                             | 15
      m4                 |                    []         []          []      | 18
-     mailutils          |             []                                    |  8
+     mailfromd          |             []     []                             |  3
+     mailutils          |             []     []                             |  8
      make               |          []        []         []                  | 20
-     man-db             |                    []                             |  6
+     man-db             |                    []                             |  9
      minicom            |                    []                             | 14
-     mysecretdiary      |          []        []                             | 12
-     nano               |                    []                     []      | 17
-     nano_1_0           |          [] []     []                             | 18
+     nano               |                    []         []          []      | 20
      opcodes            |          []        []                             | 10
-     parted             |          [] []                            []      | 10
-     pilot-qof          |                    []                             |  3
-     psmisc             |                    []                             | 10
+     parted             |          [] []                            []      | 11
+     pilot-qof          |                    []                             |  1
+     popt               |          []        []         []          []      | 18
+     psmisc             |                    []         []                  | 10
      pwdutils           |                    []                             |  3
-     python             |                                                   |  0
      qof                |                    []                             |  4
-     radius             |             []                                    |  6
+     radius             |             []     []                             |  7
      recode             |          []        []         []                  | 25
-     rpm                |          [] []     []                     []      | 14
+     rpm                |          [] []     []                     []      | 13
      screem             |                    []                             |  2
      scrollkeeper       |          [] []     []                     []      | 26
-     sed                |          []        []                     []      | 22
-     sh-utils           |          []                                       | 15
-     shared-mime-info   |             []     []         []          []      | 24
+     sed                |          []        []         []          []      | 23
+     shared-mime-info   |             []     []         []                  | 29
      sharutils          |          []        []                     []      | 23
-     shishi             |                                                   |  1
-     silky              |                    []                             |  4
+     shishi             |                    []                             |  3
      skencil            |                    []                             |  7
-     sketch             |                                                   |  6
-     solfege            |                                                   |  2
+     solfege            |                    []                             |  3
      soundtracker       |          []        []                             |  9
      sp                 |          []                                       |  3
-     stardict           |             []     []         []          []      | 11
-     system-tools-ba... |    []    [] []     []     []  []          []      | 37
-     tar                |          [] []     []                     []      | 20
+     system-tools-ba... |    []    [] []     []     []  []          []      | 38
+     tar                |          [] []     []                             | 17
      texinfo            |          []        []         []                  | 15
-     textutils          |          []                   []          []      | 17
      tin                |                                                   |  1
-     tp-robot           |                    []         []          []      | 10
-     tuxpaint           |                    []  []                 []      | 16
+     tuxpaint           |                    []  []                 []      | 19
      unicode-han-tra... |                                                   |  0
      unicode-transla... |                                                   |  2
      util-linux         |          [] []     []                             | 20
-     vorbis-tools       |             []     []                             | 11
+     util-linux-ng      |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             |  4
      wastesedge         |                                                   |  1
-     wdiff              |          []        []                             | 22
-     wget               |          []        []                     []      | 19
+     wdiff              |          []        []                             | 23
+     wget               |          []        []                     []      | 20
      xchat              |             []     []         []          []      | 29
-     xkeyboard-config   |          [] []     []                     []      | 11
-     xpad               |                    []         []          []      | 14
+     xkeyboard-config   |          [] []     []                             | 14
+     xpad               |                    []         []          []      | 15
                         +---------------------------------------------------+
-       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
-      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  2028
+       76 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      163 domains          0  3  1 74 51  0  143 21  1  57     7    45    0  2036
 
    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
@@ -1075,10 +1042,10 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If October 2006 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
-matrix with full percentage details can be found at
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+   If November 2007 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://translationproject.org/extra/matrix.html'.
 
 1.6 Using `gettext' in new packages
 ===================================
@@ -1096,6 +1063,6 @@ 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
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
+`coordinator@translationproject.org' to make the `.pot' files available
+to the translation teams.
 
index 59de910..6e326bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-15  Werner Koch  <wk@g10code.com>
+
+       * gl/allocsa.h, gl/m4/allocsa.m4: Replace HAVE_LONG_LONG by
+       HAVE_LONG_LONG_INT.
+
+2008-02-15  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
+
 2007-12-20  Werner Koch  <wk@g10code.com>
 
        Released 2.0.8.
diff --git a/NEWS b/NEWS
index 96c0fd3..764edb3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ Noteworthy changes in version 2.0.9 (unreleased)
  * Gpgsm always tries to locate missing certificates from a running
    Dirmngr's cache.
 
+ * Minor bug fixes.
+
+ * Tweaks for Windows
+
 
 Noteworthy changes in version 2.0.8 (2007-12-20)
 ------------------------------------------------
index e666c1c..c630af5 100644 (file)
@@ -907,7 +907,7 @@ AM_ICONV
 #
 AC_MSG_NOTICE([checking for gettext])
 AM_PO_SUBDIRS
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT_VERSION([0.17])
 if test "$try_gettext" = yes; then
   AM_GNU_GETTEXT([external],[need-ngettext])
 
index a1d89a4..fdaab2a 100644 (file)
@@ -29,7 +29,6 @@
 
 2007-12-13  Werner Koch  <wk@g10code.com>
 
-
        * qualified.txt: Add 2 root certs from S-Trust for 2008-2012.
        * examples/trustlist.txt: Ditto.
        * com-certs.pem: Ditto.
index 4c2affe..0572d1b 100644 (file)
@@ -105,14 +105,14 @@ enum
    among all elementary types.  */
   sa_alignment_long = sa_alignof (long),
   sa_alignment_double = sa_alignof (double),
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
   sa_alignment_longlong = sa_alignof (long long),
 #endif
 #ifdef HAVE_LONG_DOUBLE
   sa_alignment_longdouble = sa_alignof (long double),
 #endif
   sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
                      | (sa_alignment_longlong - 1)
 #endif
 #ifdef HAVE_LONG_DOUBLE
index 474862f..9a778d5 100644 (file)
@@ -10,6 +10,6 @@ AC_DEFUN([gl_ALLOCSA],
   dnl @ALLOCA@ and @LTALLOCA@.
   AC_REQUIRE([gl_FUNC_ALLOCA])
   AC_REQUIRE([gl_EEMALLOC])
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])
 ])
index c23621b..beb7d15 100644 (file)
@@ -71,7 +71,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/allocsa.m4
   m4/eealloc.m4
   m4/longdouble.m4
-  m4/longlong.m4
   m4/mkdtemp.m4
   m4/setenv.m4
   m4/size_max.m4
index ddbd9cc..b58f231 100644 (file)
@@ -1,3 +1,10 @@
+2008-02-15  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * gettext.m4: Upgrade to gettext-0.17.
+       * iconv.m4: Upgrade to gettext-0.17.
+       * lib-link.m4: Upgrade to gettext-0.17.
+       * po.m4: Upgrade to gettext-0.17.
+
 2007-12-17  Werner Koch  <wk@g10code.com>
 
        * ldap.m4: Test for ldap_start_tls_sA.
index 91c345e..c9ae1f7 100644 (file)
@@ -1,5 +1,5 @@
-# gettext.m4 serial 59 (gettext-0.16.1)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# gettext.m4 serial 60 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -362,44 +362,6 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
 ])
 
 
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-
 dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
 m4_define([gt_NEEDS_INIT],
 [
index 654c415..66bc76f 100644 (file)
@@ -1,5 +1,5 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# iconv.m4 serial AM6 (gettext-0.17)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -21,6 +21,7 @@ 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).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
@@ -33,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+  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 <stdlib.h>
@@ -56,7 +57,85 @@ AC_DEFUN([AM_ICONV_LINK],
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1,
+      [Define if you have the iconv() function and it works.])
   fi
   if test "$am_cv_lib_iconv" = yes; then
     AC_MSG_CHECKING([how to link with libiconv])
index f95b7ba..e3d26fc 100644 (file)
@@ -1,17 +1,19 @@
-# lib-link.m4 serial 9 (gettext-0.16)
-dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
+# lib-link.m4 serial 13 (gettext-0.17)
+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.54)
 
 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.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
@@ -24,13 +26,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
   ])
   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
   LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
   INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
   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
@@ -46,6 +51,8 @@ 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.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
@@ -82,17 +89,23 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
     CPPFLAGS="$ac_save_CPPFLAGS"
     LIB[]NAME=
     LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
   fi
   AC_SUBST([HAVE_LIB]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
   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.
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
   dnl Tell automake >= 1.10 to complain if config.rpath is missing.
@@ -109,12 +122,14 @@ AC_DEFUN([AC_LIB_RPATH],
     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"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_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],
@@ -124,20 +139,24 @@ AC_DEFUN([AC_LIB_RPATH],
 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.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
   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],
+  AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+[  --with-lib]N_A_M_E[-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib]N_A_M_E[-prefix     don't search for lib$1 in includedir and libdir],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -158,6 +177,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
+  LIB[]NAME[]_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -197,27 +217,53 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" \
-               && { test -f "$additional_libdir/lib$name.$shlibext" \
-                    || { test "$shlibext" = dll \
-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
-              found_dir="$additional_libdir"
-              if test -f "$additional_libdir/lib$name.$shlibext"; then
-                found_so="$additional_libdir/lib$name.$shlibext"
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
               else
-                found_so="$additional_libdir/lib$name.dll.a"
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
               fi
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
               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
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
               fi
             fi
           fi
@@ -227,26 +273,44 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" \
-                     && { test -f "$dir/lib$name.$shlibext" \
-                          || { test "$shlibext" = dll \
-                               && test -f "$dir/lib$name.dll.a"; }; }; then
-                    found_dir="$dir"
-                    if test -f "$dir/lib$name.$shlibext"; then
-                      found_so="$dir/lib$name.$shlibext"
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
                     else
-                      found_so="$dir/lib$name.dll.a"
-                    fi
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
                     fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_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
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
                     fi
                   fi
                   ;;
@@ -282,12 +346,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
                 dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
+                if test "$acl_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
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_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"
@@ -318,13 +382,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     if test -z "$haveit"; then
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_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 We cannot use $acl_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.
@@ -351,6 +415,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIB[]NAME[]_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -512,18 +577,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_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"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
       acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
     else
@@ -531,7 +596,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
       for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
       done
@@ -580,7 +645,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   $1=
   if test "$enable_rpath" != no; then
-    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
       dnl Use an explicit option to hardcode directories into the resulting
       dnl binary.
       rpathdirs=
@@ -614,16 +679,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
           done
         else
           dnl The linker is used for linking directly.
-          if test -n "$hardcode_libdir_separator"; then
+          if test -n "$acl_hardcode_libdir_separator"; then
             dnl Weird platform: only the last -rpath option counts, the user
             dnl must pass all path elements in one option.
             alldirs=
             for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
             done
             acl_save_libdir="$libdir"
             libdir="$alldirs"
-            eval flag=\"$hardcode_libdir_flag_spec\"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
             libdir="$acl_save_libdir"
             $1="$flag"
           else
@@ -631,7 +696,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
             for dir in $rpathdirs; do
               acl_save_libdir="$libdir"
               libdir="$dir"
-              eval flag=\"$hardcode_libdir_flag_spec\"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
               libdir="$acl_save_libdir"
               $1="${$1}${$1:+ }$flag"
             done
index 00133ef..0734762 100644 (file)
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 13 (gettext-0.15)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# po.m4 serial 15 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -27,6 +27,10 @@ AC_DEFUN([AM_PO_SUBDIRS],
   AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
+
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
 
@@ -84,6 +88,10 @@ changequote([,])dnl
   test -n "$localedir" || localedir='${datadir}/locale'
   AC_SUBST([localedir])
 
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
   AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
@@ -426,3 +434,16 @@ EOF
   fi
   mv "$ac_file.tmp" "$ac_file"
 ])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
index 606adcc..d7a56bc 100644 (file)
@@ -1,3 +1,15 @@
+2008-02-15  Werner Koch  <wk@g10code.com>
+
+       * de.po: Translate 3 new strings.
+
+2008-02-15  Jedi Lin  <Jedi@Jedi.org>  (wk)
+
+       * zh_TW.po: Update.
+
+2008-02-15  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * Makefile.in.in: Upgrade to gettext-0.17.
+
 2008-01-22  Werner Koch  <wk@g10code.com>
 
        * de.po: Small typo fixes.  Reported by Ludwig Reiter.
index 5022b8b..fecf500 100644 (file)
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # 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
@@ -8,7 +8,8 @@
 # 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.16
+# Origin: gettext-0.17
+GETTEXT_MACRO_VERSION = 0.17
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -95,11 +96,18 @@ CATALOGS = @CATALOGS@
        mv t-$@ $@
 
 
-all: all-@USE_NLS@
+all: check-macro-version all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+       @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+         || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+              exit 1; \
+            }
+
 # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
 # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
 # we don't want to bother translators with empty POT files). We assume that
@@ -130,16 +138,34 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # 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
+       if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+         package_gnu='GNU '; \
+       else \
+         package_gnu=''; \
+       fi; \
        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
        else \
          msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
        fi; \
-       $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-         --files-from=$(srcdir)/POTFILES.in \
-         --copyright-holder='$(COPYRIGHT_HOLDER)' \
-         --msgid-bugs-address="$$msgid_bugs_address"
+       case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+         '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --files-from=$(srcdir)/POTFILES.in \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+         *) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+             --files-from=$(srcdir)/POTFILES.in \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --package-name="$${package_gnu}@PACKAGE@" \
+             --package-version='@VERSION@' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+       esac
        test ! -f $(DOMAIN).po || { \
          if test -f $(srcdir)/$(DOMAIN).pot; then \
            sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
index 8802ff3..d95b504 100644 (file)
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -6502,7 +6502,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 1a7651e..82bd462 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -6213,8 +6213,8 @@ msgstr "es descarta: la clau secreta ja és present\n"
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
-"signatures!\n"
+"es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
+"signatures!\n"
 
 #: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
@@ -6399,8 +6399,8 @@ msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 #: g10/tdbio.c:1506
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
-"fix-trustdb».\n"
+"la base de dades de confiança està corrompuda; per favor, executeu «gpg --fix-"
+"trustdb».\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -6977,7 +6977,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
@@ -8428,8 +8428,7 @@ msgstr ""
 #~ "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"
+#~ "teniu accés a la clau secreta.  Contesteu «sí» per a donar a aquesta clau\n"
 #~ "confiança absoluta\n"
 
 # "clau no confiable"? jm
@@ -8551,8 +8550,7 @@ msgstr ""
 #~ "«1» significa que creieu que la clau és de la persona que diu que és la\n"
 #~ "    propietària, però no heu pogut, o no heu verificat la clau de cap "
 #~ "manera.\n"
-#~ "    Açò és útil per a la verificació d'un «rol», quan signeu la clau "
-#~ "d'un\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, "
@@ -8746,8 +8744,7 @@ msgstr ""
 #, fuzzy
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr ""
-#~ "la extensió de xifrat «%s» no s'ha carregat per tindre permissos "
-#~ "insegurs\n"
+#~ "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
index 28f9454..09cb75c 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -6671,7 +6671,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný radix64 znak %02X byl pøeskoèen\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 1cb00f2..e5f20b7 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -6655,7 +6655,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 3baf8e1..e0c98e2 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
-"PO-Revision-Date: 2008-01-22 12:46+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
+"PO-Revision-Date: 2008-02-15 10:36+0100\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -6741,10 +6741,10 @@ msgstr "Handhabungsroutine für den fd %d beendet\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
-msgstr ""
+msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
 
 #: sm/call-dirmngr.c:209
 #, c-format
@@ -6815,19 +6815,18 @@ msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
 
 #: sm/certchain.c:541
-#, fuzzy
 msgid "looking up issuer from the Dirmngr cache\n"
-msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
+msgstr "Der Herausgeber wird im Cache des Dirmngr gesucht\n"
 
 #: sm/certchain.c:565
-#, fuzzy, c-format
+#, c-format
 msgid "number of matching certificates: %d\n"
-msgstr "Fehler beim Importieren des Zertifikats: %s\n"
+msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
 
 #: sm/certchain.c:567
-#, fuzzy, c-format
+#, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n"
+msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
 
 #: sm/certchain.c:735 sm/certchain.c:1153 sm/certchain.c:1760 sm/decrypt.c:259
 #: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
index 04f8d8c..750daa3 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -6849,7 +6849,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ìç Ýãêõñïò radix64 ÷áñáêôÞñáò %02x ðáñÜâëåøç\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 00b0966..275cfcf 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -6803,7 +6803,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
index 699da77..b2da53b 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator: Jaime Suárez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -6709,7 +6709,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inválido radix64 %02X omitido\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
index 19dc2cd..890d1a6 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -6770,7 +6770,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 64161f2..a31d54c 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -6836,7 +6836,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 83a7045..0a4c94d 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Gaël Quéri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -6857,7 +6857,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractère %02X invalide en radix64 ignoré\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 8180777..68a4787 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -6844,7 +6844,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "carácter radix64 non válido %02x omitido\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "erro ao pór '%s' na base de datos de confianza: %s\n"
index 8fd0fa8..75f8539 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -6802,7 +6802,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index c1a5bcb..2f9cfcf 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -6796,7 +6796,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 6b339c4..cde0e30 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -6840,7 +6840,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 1bd6935..e5984c4 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -6613,7 +6613,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵¸ú¤Ê64¿Êʸ»ú%02X¤ò¤È¤Ð¤·¤Þ¤·¤¿\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index a943f5e..4aba7b0 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1985,16 +1985,15 @@ msgstr "ADVARSEL: utrygge rettigheter p
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
-"ADVARSEL: utrygt eierskap på katalogene på nivåene over hjemmekatalogen «%"
-"s»\n"
+"ADVARSEL: utrygt eierskap på katalogene på nivåene over hjemmekatalogen «%s»\n"
 
 #: g10/gpg.c:1335
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
-"ADVARSEL: utrygt eierskap på katalogene på nivåene over konfigurasjonsfilen "
-"«%s»\n"
+"ADVARSEL: utrygt eierskap på katalogene på nivåene over konfigurasjonsfilen «%"
+"s»\n"
 
 #: g10/gpg.c:1338
 #, c-format
@@ -2006,8 +2005,8 @@ msgstr ""
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
-"ADVARSEL: utrygge rettigheter på katalogene på nivåene over hjemmekatalogen "
-"«%s»\n"
+"ADVARSEL: utrygge rettigheter på katalogene på nivåene over hjemmekatalogen «%"
+"s»\n"
 
 #: g10/gpg.c:1347
 #, c-format
@@ -6550,7 +6549,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 80ac6b7..e025d1e 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -6685,7 +6685,7 @@ msgstr "obs
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew³a¶ciwy znak formatu radix64 %02x zosta³ pominiêty\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 690efe4..4462c4f 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -6810,7 +6810,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index afb1b8b..dd5b34d 100644 (file)
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -6817,7 +6817,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inválido %02x ignorado\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
index fef7c52..2dc5659 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -6697,7 +6697,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X sãrit\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 1b5d325..2be61ad 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -6595,7 +6595,7 @@ msgstr "обработчик fd %d остановлен\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 1db90a0..780b012 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -6818,7 +6818,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný znak vo formáte radix64 %02x bol preskoèený\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 91c22ab..aa759a7 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2007-11-12 16:08+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -6768,7 +6768,7 @@ msgstr "hanterare för fd %d avslutad\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index a8b9a97..3990a9d 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -6687,7 +6687,7 @@ msgstr "fd %d için eylemci sonlandı\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 81f6a36..3dedca9 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -6534,7 +6534,7 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: sm/call-agent.c:136
+#: sm/call-agent.c:138
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
index 5938d6e..3660d48 100644 (file)
@@ -1,46 +1,48 @@
 # Traditional Chinese(zh-tw) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# Jedi <Jedi@Jedi.org>, 2003, 2004, 2005.
-# 
-# Special thanks to "Autrijus Tang <autrijus@autrijus.org>".
-# 
+# Jedi Lin <Jedi@Jedi.org>, 2003, 2004, 2005, 2006, 2007, 2008.
+#
+# Special thanks to "Audrey Tang <audreyt@audreyt.org>".
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.2\n"
+"Project-Id-Version: gnupg 2.0.8\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-02-14 17:27+0100\n"
-"PO-Revision-Date: 2005-07-29 09:49+0800\n"
-"Last-Translator: Jedi <Jedi@Jedi.org>\n"
+"POT-Creation-Date: 2008-02-15 10:28+0100\n"
+"PO-Revision-Date: 2008-01-31 23:09+0800\n"
+"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Basepath: gnupg-2.0.8/\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: TAIWAN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: agent/call-pinentry.c:223
-#, fuzzy, c-format
+#, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "å­\98æ\94¾æ\8c\87ç´\8b失敗: %s\n"
+msgstr "å\80\8b人è­\98å\88¥ç¢¼é \85ç\9b®é\8e\96å®\9aç\8d²å\8f\96失敗: %s\n"
 
 #: agent/call-pinentry.c:592
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
-msgstr ""
+msgstr "請輸入你的 PIN 以便在此階段作業中解開密鑰"
 
 #: agent/call-pinentry.c:595
-#, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
+msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
 #: agent/call-pinentry.c:630
-#, fuzzy
 msgid "Quality:"
-msgstr "有效性: %s"
+msgstr "品質: %s"
 
 #. TRANSLATORS: This string is a tooltip, shown by pinentry
 #. when hovering over the quality bar.  Please use an
@@ -51,50 +53,46 @@ msgstr "有效性: %s"
 #: agent/call-pinentry.c:653
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
+"輸入在上面的文字的品質.\n"
+"關於此規範的細節, 請洽你的系統管理者."
 
 #: agent/call-pinentry.c:695
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
-msgstr ""
+msgstr "設定錯誤 %s (第 %d 次嘗試, 最多 %d 次)"
 
 #: agent/call-pinentry.c:715 agent/call-pinentry.c:727
-#, fuzzy
 msgid "PIN too long"
-msgstr "太長"
+msgstr "PIN 太長"
 
 #: agent/call-pinentry.c:716
-#, fuzzy
 msgid "Passphrase too long"
-msgstr "å\88\97太長"
+msgstr "å¯\86èª\9e太長"
 
 #: agent/call-pinentry.c:724
-#, fuzzy
 msgid "Invalid characters in PIN"
-msgstr "姓名含有無效的字符\n"
+msgstr "PIN 含有無效的字符"
 
 #: agent/call-pinentry.c:729
 msgid "PIN too short"
-msgstr ""
+msgstr "PIN 太短"
 
 #: agent/call-pinentry.c:741
-#, fuzzy
 msgid "Bad PIN"
-msgstr "損壞的 MPI"
+msgstr "不良的 PIN"
 
 #: agent/call-pinentry.c:742
-#, fuzzy
 msgid "Bad Passphrase"
-msgstr "錯誤的密語"
+msgstr "不良的密語"
 
 #: agent/call-pinentry.c:778
-#, fuzzy
 msgid "Passphrase"
-msgstr "錯誤的密語"
+msgstr "密語"
 
 #: agent/command-ssh.c:529
-#, fuzzy, c-format
+#, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "保護摘要 %d 未被支援\n"
+msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
 #: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1057 g10/keygen.c:3155
 #: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
@@ -116,102 +114,97 @@ msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
 #: agent/command-ssh.c:1615 agent/command-ssh.c:1633
-#, fuzzy, c-format
+#, c-format
 msgid "error getting serial number of card: %s\n"
-msgstr "å\8f\96å¾\97æ\96°ç\9a\84å\80\8b人è­\98å\88¥ç¢¼ (PIN) 時出錯: %s\n"
+msgstr "å\8f\96å¾\97æ­¤å\8d¡ç\89\87åº\8fè\99\9f時出錯: %s\n"
 
 #: agent/command-ssh.c:1619
 #, c-format
 msgid "detected card with S/N: %s\n"
-msgstr ""
+msgstr "偵測到卡片, 其序號為: %s\n"
 
 #: agent/command-ssh.c:1624
-#, fuzzy, c-format
+#, c-format
 msgid "error getting default authentication keyID of card: %s\n"
-msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
+msgstr "取得此卡片的預設認證金鑰 ID 時出錯: %s\n"
 
 #: agent/command-ssh.c:1644
-#, fuzzy, c-format
+#, c-format
 msgid "no suitable card key found: %s\n"
-msgstr "æ\89¾ä¸\8då\88°å\8f¯å¯«ç\9a\84ç§\81é\91°é\91°å\8c\99å\9c\88: %s\n"
+msgstr "æ\89¾ä¸\8då\88°å\90\88é\81©ç\9a\84å\8d¡ç\89\87é\87\91é\91°: %s\n"
 
 #: agent/command-ssh.c:1694
-#, fuzzy, c-format
+#, c-format
 msgid "shadowing the key failed: %s\n"
-msgstr "讀取公鑰時失敗: %s\n"
+msgstr "遮蔽金鑰時失敗: %s\n"
 
 #: agent/command-ssh.c:1709
-#, fuzzy, c-format
+#, c-format
 msgid "error writing key: %s\n"
-msgstr "寫å\88°é\91°å\8c\99å\9c\88 `%s' æ\99\82ç\99¼ç\94\9fé\8c¯èª¤: %s\n"
+msgstr "寫å\85¥é\87\91é\91°æ\99\82å\87ºé\8c¯: %s\n"
 
 #: agent/command-ssh.c:2014
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
+msgstr "請輸入此 ssh 金鑰的密語%0A  %c"
 
 #: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
 #: agent/protect-tool.c:1197
-#, fuzzy
 msgid "Please re-enter this passphrase"
-msgstr "更改密語"
+msgstr "請再次輸入密語"
 
 #: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
-msgstr ""
+msgstr "請輸入密語以保護收到的私鑰%%0A   %s%%0A於 gpg-agent 的金鑰存放處"
 
 #: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
 #: agent/protect-tool.c:1203 tools/symcryptrun.c:434
 msgid "does not match - try again"
-msgstr ""
+msgstr "前後不一致 - 請再試一次"
 
 #: agent/command-ssh.c:2885
-#, fuzzy, c-format
+#, c-format
 msgid "failed to create stream from socket: %s\n"
-msgstr "%s: 建立雜湊表失敗: %s\n"
+msgstr "從 socket 建立串流失敗: %s\n"
 
 #: agent/divert-scd.c:217
-#, fuzzy
 msgid "Admin PIN"
-msgstr "|A|Admin PIN"
+msgstr "管理者 PIN"
 
 #: agent/divert-scd.c:275
-#, fuzzy
 msgid "Repeat this PIN"
-msgstr "請再次輸入個人識別碼 (PIN): "
+msgstr "請再次輸入 PIN"
 
 #: agent/divert-scd.c:278
 msgid "PIN not correctly repeated; try again"
-msgstr "å\80\8b人è­\98å\88¥ç¢¼ (PIN) å\86\8d次輸å\85¥æ\99\82æ²\92æ\9c\89正確é\87\8dè¤\87; 請再試一次"
+msgstr "å\89\8då¾\8cå\85©æ¬¡è¼¸å\85¥ç\9a\84 PIN ä¸\8dä¸\80è\87´; 請再試一次"
 
 #: agent/divert-scd.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
-msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+msgstr "請輸入 PIN%s%s%s 以解開卡片"
 
 #: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
 #: sm/import.c:525 sm/import.c:550
-#, fuzzy, c-format
+#, c-format
 msgid "error creating temporary file: %s\n"
-msgstr "建立密語的時候發生錯誤: %s\n"
+msgstr "建立暫存檔時出錯: %s\n"
 
 #: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
-#, fuzzy, c-format
+#, c-format
 msgid "error writing to temporary file: %s\n"
-msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
+msgstr "寫入暫存檔時出錯: %s\n"
 
 #: agent/genkey.c:151 agent/genkey.c:157
-#, fuzzy
 msgid "Enter new passphrase"
-msgstr "請輸入密語\n"
+msgstr "請輸入新密語"
 
 #: agent/genkey.c:165
-#, fuzzy
 msgid "Take this one anyway"
-msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
+msgstr "無論如何還是要用這個"
 
 #: agent/genkey.c:191
 #, c-format
@@ -221,8 +214,7 @@ msgid ""
 msgid_plural ""
 "Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
 "at least %u characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "警告: 你輸入了不安全的密語.%%0A密語至少得要有 %u 個字符長."
 
 #: agent/genkey.c:212
 #, c-format
@@ -233,7 +225,7 @@ msgid_plural ""
 "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
 "contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
-msgstr[1] ""
+"警告: 你輸入了不安全的密語.%%0A密語至少得要含有 %u 個數字或特別字符."
 
 #: agent/genkey.c:235
 #, c-format
@@ -241,12 +233,14 @@ msgid ""
 "Warning: You have entered an insecure passphrase.%%0AA passphrase may not be "
 "a known term or match%%0Acertain pattern."
 msgstr ""
+"警告: 你輸入了不安全的密語.%%0A密語不得含有已知的詞彙, 亦不得與確知的樣式吻"
+"合."
 
 #: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
-msgstr ""
+msgstr "你還沒有輸入密語!%0A空密語是不行的."
 
 #: agent/genkey.c:253
 #, c-format
@@ -254,41 +248,38 @@ msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
+"你還沒有輸入密語 - 通常這可不是個好主意!%0A請確認你不想要對你的金鑰做任何保"
+"護."
 
 #: agent/genkey.c:262
 msgid "Yes, protection is not needed"
-msgstr ""
+msgstr "是, 不需要任何保護"
 
 #: agent/genkey.c:306
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
-msgstr ""
-"妳需要一個密語來保護妳的私鑰.\n"
-"\n"
+msgstr "請輸入密語至%0A以保護你的新金鑰"
 
 #: agent/genkey.c:429
-#, fuzzy
 msgid "Please enter the new passphrase"
-msgstr "更改密語"
+msgstr "請輸入新的密語"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
-#, fuzzy
 msgid ""
 "@Options:\n"
 " "
 msgstr ""
-"@\n"
-"選項:\n"
+"@選項:\n"
 " "
 
 #: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
-msgstr ""
+msgstr "以伺服器模式執行 (前景)"
 
 #: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
-msgstr ""
+msgstr "以服務模式執行 (背景)"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
@@ -303,110 +294,105 @@ msgstr "盡量安靜些"
 
 #: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
-msgstr ""
+msgstr "sh 樣式的指令輸出"
 
 #: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
-msgstr ""
+msgstr "csh 樣式的指令輸出"
 
 #: agent/gpg-agent.c:125 tools/symcryptrun.c:167
-#, fuzzy
 msgid "|FILE|read options from FILE"
-msgstr "從 `%s' 讀取選項\n"
+msgstr "|檔案|從「檔案」中讀取選項"
 
 #: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
-msgstr ""
+msgstr "不要從 console 分離"
 
 #: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
-msgstr ""
+msgstr "不要奪取鍵盤及滑鼠"
 
 #: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
-#, fuzzy
 msgid "use a log file for the server"
-msgstr "在某個金鑰伺服器上搜尋金鑰"
+msgstr "為伺服器使用日誌檔"
 
 #: agent/gpg-agent.c:134
-#, fuzzy
 msgid "use a standard location for the socket"
-msgstr "設å®\9aæ\89\80é\81¸ä½¿ç\94¨è\80\85 ID ç\9a\84å\81\8f好æ¸\85å\96®"
+msgstr "ç\82º socket ä½¿ç\94¨æ¨\99æº\96ç\9a\84ä½\8dç½®"
 
 #: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr ""
+msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 
 #: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
-msgstr ""
+msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
 #: agent/gpg-agent.c:141
-#, fuzzy
 msgid "do not use the SCdaemon"
-msgstr "更新信任資料庫"
+msgstr "不要使用 SCdaemon"
 
 #: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
-msgstr ""
+msgstr "忽略變更 TTY 的要求"
 
 #: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
-msgstr ""
+msgstr "忽略變更 X display 的要求"
 
 #: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
-msgstr ""
+msgstr "|N|讓快取住的 PIN 在 N 秒後到期"
 
 #: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
-msgstr ""
+msgstr "簽署時不要使用 PIN 快取"
 
 #: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
-msgstr ""
+msgstr "允許用戶端將金鑰標記為 \"已信任\""
 
 #: agent/gpg-agent.c:172
-#, fuzzy
 msgid "allow presetting passphrase"
-msgstr "建ç«\8bå¯\86èª\9eç\9a\84æ\99\82å\80\99ç\99¼ç\94\9fé\8c¯èª¤: %s\n"
+msgstr "å\85\81許é \90å\85\88設å®\9aå¯\86èª\9e"
 
 #: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
-msgstr ""
+msgstr "啟用 ssh-agent 模擬"
 
 #: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
-msgstr ""
+msgstr "|檔案|將環境設定也寫至「檔案」"
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
-#, fuzzy
 msgid "Please report bugs to <"
-msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
+msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <"
 
 #: agent/gpg-agent.c:286
-#, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
-msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
 
 #: agent/gpg-agent.c:288
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
+"語法: gpg-agent [選項] [指令 [引數]]\n"
+"GnuPG 私鑰管理\n"
 
 #: agent/gpg-agent.c:323 g10/gpg.c:964 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
-msgstr ""
+msgstr "給定的除錯等級 `%s' 無效\n"
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
 #: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
-msgstr ""
+msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
 #: agent/gpg-agent.c:621 g10/gpg.c:2057 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
@@ -422,13 +408,13 @@ msgstr "選項檔 `%s': %s\n"
 #: agent/gpg-agent.c:634 g10/gpg.c:2068 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "從 `%s' 讀取選項\n"
+msgstr "從 `%s' 讀取選項\n"
 
 #: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "建立 `%s' 時發生錯誤: %s\n"
+msgstr "建立 `%s' 時出錯: %s\n"
 
 #: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
 #: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
@@ -439,97 +425,94 @@ msgstr "無法建立目錄 `%s': %s\n"
 
 #: agent/gpg-agent.c:1312 scd/scdaemon.c:937
 msgid "name of socket too long\n"
-msgstr ""
+msgstr "socket 名稱太長\n"
 
 #: agent/gpg-agent.c:1337 scd/scdaemon.c:960
-#, fuzzy, c-format
+#, c-format
 msgid "can't create socket: %s\n"
-msgstr "無法建立 `%s': %s\n"
+msgstr "無法建立 socket: %s\n"
 
 #: agent/gpg-agent.c:1346
 #, c-format
 msgid "socket name `%s' is too long\n"
-msgstr ""
+msgstr "socket 名稱 `%s' 太長\n"
 
 #: agent/gpg-agent.c:1366
-#, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
-msgstr "gpg-agent 在此階段無法使用\n"
+msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
 #: agent/gpg-agent.c:1377 scd/scdaemon.c:980
-#, fuzzy
 msgid "error getting nonce for the socket\n"
-msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+msgstr "為 socket 取得 nonce 時出錯\n"
 
 #: agent/gpg-agent.c:1382 scd/scdaemon.c:983
-#, fuzzy, c-format
+#, c-format
 msgid "error binding socket to `%s': %s\n"
-msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
+msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
 #: agent/gpg-agent.c:1394 scd/scdaemon.c:992
-#, fuzzy, c-format
+#, c-format
 msgid "listen() failed: %s\n"
-msgstr "更新失敗: %s\n"
+msgstr "listen() 失敗: %s\n"
 
 #: agent/gpg-agent.c:1400 scd/scdaemon.c:999
-#, fuzzy, c-format
+#, c-format
 msgid "listening on socket `%s'\n"
-msgstr "æ­£å\9c¨å°\87ç§\81é\91°å¯«è\87³ `%s'\n"
+msgstr "æ­£å\9c¨å\80\99è\81½ socket `%s'\n"
 
 #: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
-msgstr "目錄 `%s' 已建立\n"
+msgstr "`%s' 目錄已建立\n"
 
 #: agent/gpg-agent.c:1481
-#, fuzzy, c-format
+#, c-format
 msgid "stat() failed for `%s': %s\n"
-msgstr "fstat(%d) 失敗於 %s: %s\n"
+msgstr "stat() 失敗於 `%s': %s\n"
 
 #: agent/gpg-agent.c:1485
-#, fuzzy, c-format
+#, c-format
 msgid "can't use `%s' as home directory\n"
-msgstr "無法建立目錄 `%s': %s\n"
+msgstr "無法使用 `%s' 做為家目錄\n"
 
 #: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
-#, fuzzy, c-format
+#, c-format
 msgid "error reading nonce on fd %d: %s\n"
-msgstr "讀取 `%s' 時發生錯誤: %s\n"
+msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
 #: agent/gpg-agent.c:1624
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
-msgstr ""
+msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
 #: agent/gpg-agent.c:1629
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
-msgstr ""
+msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
 #: agent/gpg-agent.c:1649
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
-msgstr ""
+msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
 #: agent/gpg-agent.c:1654
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
-msgstr ""
+msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
 #: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
-#, fuzzy, c-format
+#, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
-msgstr "更新私鑰失敗: %s\n"
+msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
 #: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s stopped\n"
-msgstr "%s: 已跳過: %s\n"
+msgstr "%s %s 已停止\n"
 
 #: agent/gpg-agent.c:1907
-#, fuzzy
 msgid "no gpg-agent running in this session\n"
-msgstr "gpg-agent 在此階段無法使用\n"
+msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
 #: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
@@ -543,103 +526,102 @@ msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
 #: agent/preset-passphrase.c:98
-#, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
 
 #: agent/preset-passphrase.c:101
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
+"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
+"密碼快取維護\n"
 
 #: agent/protect-tool.c:149
-#, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
-msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+msgstr "用法: gpg-protect-tool [選項] (或用 -h 求助)\n"
 
 #: agent/protect-tool.c:151
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
+"語法: gpg-protect-tool [選項] [引數]\n"
+"私鑰維護工具\n"
 
 #: agent/protect-tool.c:1188
-#, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
+msgstr "請輸入密語來取消 PKCS#12 物件的保護."
 
 #: agent/protect-tool.c:1191
-#, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
+msgstr "請輸入密語來保護新的 PKCS#12 物件."
 
 #: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
-msgstr ""
+msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
 #: agent/protect-tool.c:1199
-#, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
+msgstr ""
+"請輸入完成這項操作所需的\n"
+"密語或 PIN."
 
 #: agent/protect-tool.c:1204 tools/symcryptrun.c:435
-#, fuzzy
 msgid "Passphrase:"
-msgstr "錯誤的密語"
+msgstr "密語:"
 
 #: agent/protect-tool.c:1212 tools/symcryptrun.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "error while asking for the passphrase: %s\n"
-msgstr "建立密語的時候發生錯誤: %s\n"
+msgstr "詢問密語時出錯: %s\n"
 
 #: agent/protect-tool.c:1215 tools/symcryptrun.c:446
-#, fuzzy
 msgid "cancelled\n"
-msgstr "已取消"
+msgstr "已取消\n"
 
 #: agent/trustlist.c:132 agent/trustlist.c:322
-#, fuzzy, c-format
+#, c-format
 msgid "error opening `%s': %s\n"
-msgstr "在 `%s' 中出錯: %s\n"
+msgstr "開啟 `%s' 時出錯: %s\n"
 
 #: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "file `%s', line %d: %s\n"
-msgstr "選項檔 `%s': %s\n"
+msgstr "檔案 `%s', 第 %d 列: %s\n"
 
 #: agent/trustlist.c:167 agent/trustlist.c:175
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
-msgstr ""
+msgstr "命令 \"%s\" 忽略於 `%s', 第 %d 列\n"
 
 #: agent/trustlist.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "system trustlist `%s' not available\n"
-msgstr "私鑰部分無法取用\n"
+msgstr "沒有系統信任清單 `%s' 可用\n"
 
 #: agent/trustlist.c:216
-#, fuzzy, c-format
+#, c-format
 msgid "bad fingerprint in `%s', line %d\n"
-msgstr "讀取 `%s' 錯誤: %s\n"
+msgstr "不良的指紋於 `%s', 第 %d 列\n"
 
 #: agent/trustlist.c:242 agent/trustlist.c:249
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
-msgstr ""
+msgstr "無效的金鑰旗標於 `%s', 第 %d 列\n"
 
 #: agent/trustlist.c:283 common/helpfile.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "error reading `%s', line %d: %s\n"
-msgstr "讀取 `%s' 時發生錯誤: %s\n"
+msgstr "讀取 `%s' 時出錯, 第 %d 列: %s\n"
 
 #: agent/trustlist.c:384 agent/trustlist.c:431
 msgid "error reading list of trusted root certificates\n"
-msgstr ""
+msgstr "讀取已信任根憑證清單時出錯\n"
 
 #. TRANSLATORS: This prompt is shown by the Pinentry
 #. and has one special property: A "%%0A" is used by
@@ -655,14 +637,14 @@ msgstr ""
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
 "fingerprint:%%0A  %s"
-msgstr ""
+msgstr "請驗證憑證與此完全相同:%%0A  \"%s\"%%0A其指紋為:%%0A  %s"
 
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
 #: agent/trustlist.c:551
 msgid "Correct"
-msgstr ""
+msgstr "正確"
 
 #. TRANSLATORS: This prompt is shown by the Pinentry
 #. and has one special property: A "%%0A" is used by
@@ -677,88 +659,85 @@ msgstr ""
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
-msgstr ""
+msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
 #: agent/trustlist.c:583
-#, fuzzy
 msgid "Yes"
-msgstr "yes"
+msgstr "Yes"
 
 #: agent/trustlist.c:583
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: agent/findkey.c:158
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
-msgstr ""
+msgstr "請注意: 密語從未變更過.%0A請現在就變更."
 
 #: agent/findkey.c:174
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
-msgstr ""
+msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s.  請現在就變更."
 
 #: agent/findkey.c:188 agent/findkey.c:195
-#, fuzzy
 msgid "Change passphrase"
 msgstr "更改密語"
 
 #: agent/findkey.c:196
 msgid "I'll change it later"
-msgstr ""
+msgstr "我稍後再變更"
 
 #: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1338
 #: tools/gpgconf-comp.c:1661
-#, fuzzy, c-format
+#, c-format
 msgid "error creating a pipe: %s\n"
-msgstr "建立密語的時候發生錯誤: %s\n"
+msgstr "建立管道時出錯: %s\n"
 
 #: common/exechelp.c:443 common/exechelp.c:500
-#, fuzzy, c-format
+#, c-format
 msgid "can't fdopen pipe for reading: %s\n"
-msgstr "無法開啟被簽署過的資料 `%s'\n"
+msgstr "無法將管道打開流以讀取: %s\n"
 
 #: common/exechelp.c:479 common/exechelp.c:607 common/exechelp.c:842
-#, fuzzy, c-format
+#, c-format
 msgid "error forking process: %s\n"
-msgstr "è®\80å\8f\96 `%s' æ\99\82ç\99¼ç\94\9fé\8c¯èª¤: %s\n"
+msgstr "è¡\8dç\94\9få\9f·è¡\8cç¨\8båº\8fæ\99\82å\87ºé\8c¯: %s\n"
 
 #: common/exechelp.c:653 common/exechelp.c:706
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+msgstr "等候 %d 處理程序終止時失敗: %s\n"
 
 #: common/exechelp.c:661
-#, fuzzy, c-format
+#, c-format
 msgid "error getting exit code of process %d: %s\n"
-msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
+msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
 
 #: common/exechelp.c:667 common/exechelp.c:717
-#, fuzzy, c-format
+#, c-format
 msgid "error running `%s': exit status %d\n"
-msgstr "讀取 `%s' 時發生錯誤: %s\n"
+msgstr "執行 `%s' 時出錯: 結束狀態 %d\n"
 
 #: common/exechelp.c:712
 #, c-format
 msgid "error running `%s': probably not installed\n"
-msgstr ""
+msgstr "執行 `%s' 時出錯: 可能尚未安裝\n"
 
 #: common/exechelp.c:725
-#, fuzzy, c-format
+#, c-format
 msgid "error running `%s': terminated\n"
-msgstr "讀取 `%s' 時發生錯誤: %s\n"
+msgstr "執行 `%s' 時出錯: 已終止\n"
 
 #: common/http.c:1625
-#, fuzzy, c-format
+#, c-format
 msgid "error creating socket: %s\n"
-msgstr "建立 `%s' 時發生錯誤: %s\n"
+msgstr "建立 socket 時出錯: %s\n"
 
 #: common/http.c:1669
-#, fuzzy
 msgid "host not found"
-msgstr "[找不到使用者 ID]"
+msgstr "找不到主機"
 
 #: common/simple-pwquery.c:315
 msgid "gpg-agent is not available in this session\n"
@@ -771,21 +750,19 @@ msgstr "無法連接至 `%s': %s\n"
 
 #: common/simple-pwquery.c:384
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "與 gpg-agent 的溝通問題\n"
 
 #: common/simple-pwquery.c:394
 msgid "problem setting the gpg-agent options\n"
-msgstr ""
+msgstr "設定 gpg-agent 選項時發生問題\n"
 
 #: common/simple-pwquery.c:557 common/simple-pwquery.c:653
-#, fuzzy
 msgid "canceled by user\n"
-msgstr "由使用者取消\n"
+msgstr "由使用者取消\n"
 
 #: common/simple-pwquery.c:572 common/simple-pwquery.c:659
-#, fuzzy
 msgid "problem with the agent\n"
-msgstr "代理程式的問題 - 正在停用代理程式\n"
+msgstr "代理程式的問題\n"
 
 #: common/sysutils.c:105
 #, c-format
@@ -793,14 +770,14 @@ msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
 #: common/sysutils.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
+msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 
 #: common/sysutils.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
+msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:31 common/yesno.c:68
@@ -850,151 +827,134 @@ msgstr "cC"
 #: common/miscellaneous.c:71
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
-msgstr ""
+msgstr "在安全記憶體配置 %lu 位元組時超出核心"
 
 #: common/miscellaneous.c:74
 #, c-format
 msgid "out of core while allocating %lu bytes"
-msgstr ""
+msgstr "配置 %lu 位元組時超出核心"
 
 #: common/asshelp.c:242
 msgid "no running gpg-agent - starting one\n"
-msgstr ""
+msgstr "沒有執行中的 gpg-agent - 正在啟動一份\n"
 
 #: common/asshelp.c:347
 msgid "can't connect to the agent - trying fall back\n"
-msgstr ""
+msgstr "無法連線至代理程式 - 正試著退回\n"
 
 #: common/audit.c:682
-#, fuzzy
 msgid "Certificate chain available"
-msgstr "æ\90\8då£\9eç\9a\84æ\86\91è­\89"
+msgstr "æ\9c\89å\8f¯ç\94¨ç\9a\84æ\86\91è­\89é\8f\88"
 
 #: common/audit.c:689
-#, fuzzy
 msgid "root certificate missing"
-msgstr "æ\90\8då£\9eç\9a\84æ\86\91è­\89"
+msgstr "æ ¹æ\86\91è­\89é\81ºå¤±"
 
 #: common/audit.c:715
 msgid "Data encryption succeeded"
-msgstr ""
+msgstr "資料已加密成功"
 
 #: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
-#, fuzzy
 msgid "Data available"
-msgstr "列出所有可用的資料"
+msgstr "有可用的資料"
 
 #: common/audit.c:723
-#, fuzzy
 msgid "Session key created"
-msgstr "%s: 鑰匙圈已建立\n"
+msgstr "階段金鑰已建立"
 
 #: common/audit.c:728
-#, fuzzy, c-format
+#, c-format
 msgid "algorithm: %s"
-msgstr "æ\9c\89æ\95\88æ\80§: %s"
+msgstr "æ¼\94ç®\97æ³\95: %s"
 
 #: common/audit.c:730 common/audit.c:732
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported algorithm: %s"
-msgstr ""
-"\n"
-"已被支援的演算法:\n"
+msgstr "未支援的演算法: %s"
 
 #: common/audit.c:734
-#, fuzzy
 msgid "seems to be not encrypted"
-msgstr "未被加密"
+msgstr "看起來未加密"
 
 #: common/audit.c:740
-#, fuzzy
 msgid "Number of recipients"
-msgstr "目前的收件者:\n"
+msgstr "收件者數量"
 
 #: common/audit.c:748
 #, c-format
 msgid "Recipient %d"
-msgstr ""
+msgstr "收件者 %d"
 
 #: common/audit.c:776
 msgid "Data signing succeeded"
-msgstr ""
+msgstr "資料已簽署成功"
 
 #: common/audit.c:796
 msgid "Data decryption succeeded"
-msgstr ""
+msgstr "資料已解密成功"
 
 #: common/audit.c:821
-#, fuzzy
 msgid "Data verification succeeded"
-msgstr "簽章驗證已被抑制\n"
+msgstr "資料驗證成功"
 
 #: common/audit.c:830
-#, fuzzy
 msgid "Signature available"
-msgstr "由 %s 建立的簽章\n"
+msgstr "有可用的簽章"
 
 #: common/audit.c:835
-#, fuzzy
 msgid "Parsing signature succeeded"
-msgstr "å®\8c好ç\9a\84簽章ä¾\86è\87ªæ\96¼ \"%s\""
+msgstr "å\89\96æ\9e\90簽章æ\88\90å\8a\9f"
 
 #: common/audit.c:840
-#, fuzzy, c-format
+#, c-format
 msgid "Bad hash algorithm: %s"
-msgstr "無效的 `%s' 雜湊演算法\n"
+msgstr "不良的雜湊演算法: %s"
 
 #: common/audit.c:855
-#, fuzzy, c-format
+#, c-format
 msgid "Signature %d"
-msgstr "ç\94± %s å»ºç«\8bç\9a\84簽章\n"
+msgstr "簽章 %d"
 
 #: common/audit.c:871
-#, fuzzy
 msgid "Certificate chain valid"
-msgstr "這把金鑰已經過期了!"
+msgstr "憑證鏈有效"
 
 #: common/audit.c:882
-#, fuzzy
 msgid "Root certificate trustworthy"
-msgstr "æ\90\8då£\9eç\9a\84æ\86\91è­\89"
+msgstr "æ ¹æ\86\91è­\89å\8f¯ä¿¡è³´"
 
 #: common/audit.c:892
-#, fuzzy
 msgid "CRL/OCSP check of certificates"
-msgstr "損壞的憑證"
+msgstr "CRL/OCSP 憑證檢查"
 
 #: common/audit.c:909
-#, fuzzy
 msgid "Included certificates"
-msgstr "損壞的憑證"
+msgstr "包含在內的憑證"
 
 #: common/audit.c:968
 msgid "No audit log entries."
-msgstr ""
+msgstr "沒有稽核日誌項目."
 
 #: common/audit.c:1017
-#, fuzzy
 msgid "Unknown operation"
-msgstr "未知的版本"
+msgstr "未知的操作"
 
 #: common/audit.c:1035
 msgid "Gpg-Agent usable"
-msgstr ""
+msgstr "Gpg-Agent 可以使用"
 
 #: common/audit.c:1045
 msgid "Dirmngr usable"
-msgstr ""
+msgstr "Dirmngr 可以使用"
 
 #: common/audit.c:1081
-#, fuzzy, c-format
+#, c-format
 msgid "No help available for `%s'."
-msgstr "`%s' 沒有可用的說明"
+msgstr "`%s' 沒有可用的說明."
 
 #: common/helpfile.c:80
-#, fuzzy
 msgid "ignoring garbage line"
-msgstr "結尾列有問題\n"
+msgstr "忽略垃圾列"
 
 #: g10/armor.c:379
 #, c-format
@@ -1014,9 +974,8 @@ msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
 #: g10/armor.c:455
-#, fuzzy
 msgid "unknown armor header: "
-msgstr "封裝檔頭: "
+msgstr "未知的封裝檔頭: "
 
 #: g10/armor.c:508
 msgid "nested clear text signatures\n"
@@ -1033,7 +992,7 @@ msgstr "無效的破折號逸出列: "
 #: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "無效的 64 進位字符 %02x 被跳過了\n"
+msgstr "無效的 64 進位字符 %02x 已跳過\n"
 
 #: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
@@ -1119,7 +1078,7 @@ msgstr "無法在批次模式中這樣做\n"
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
 #: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
-msgstr "要選哪一個? "
+msgstr "要選哪一個? "
 
 #: g10/card-util.c:220 g10/card-util.c:270
 msgid "[not set]"
@@ -1147,11 +1106,11 @@ msgstr "強迫使用"
 
 #: g10/card-util.c:523
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "錯誤: 目前祇允許使用單純的 ASCII 字.\n"
+msgstr "錯誤: 目前祇允許使用單純的 ASCII 字.\n"
 
 #: g10/card-util.c:525
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr "錯誤: 不能使用 \"<\" 字.\n"
+msgstr "錯誤: 不能使用 \"<\" 字.\n"
 
 #: g10/card-util.c:527
 msgid "Error: Double spaces are not allowed.\n"
@@ -1163,12 +1122,12 @@ msgstr "卡片持有者的姓氏: "
 
 #: g10/card-util.c:546
 msgid "Cardholder's given name: "
-msgstr "卡片持有者的教名: "
+msgstr "卡片持有者的名字: "
 
 #: g10/card-util.c:564
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字).\n"
+msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字).\n"
 
 #: g10/card-util.c:585
 msgid "URL to retrieve public key: "
@@ -1177,21 +1136,21 @@ msgstr "取回公鑰的 URL: "
 #: g10/card-util.c:593
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr "錯誤: URL 太長 (上限是 %d 個字).\n"
+msgstr "錯誤: URL 太長 (上限是 %d 個字).\n"
 
 #: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "讀取 `%s' 時發生錯誤: %s\n"
+msgstr "讀取 `%s' 時出錯: %s\n"
 
 #: g10/card-util.c:699
 msgid "Login data (account name): "
-msgstr " 登入資料 (帳號名稱): "
+msgstr "登入資料 (帳號名稱): "
 
 #: g10/card-util.c:709
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr "錯誤: 登入資料太長 (上限是 %d 個字).\n"
+msgstr "錯誤: 登入資料太長 (上限是 %d 個字).\n"
 
 #: g10/card-util.c:768
 msgid "Private DO data: "
@@ -1200,7 +1159,7 @@ msgstr "私人的 DO 資料: "
 #: g10/card-util.c:778
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字).\n"
+msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字).\n"
 
 #: g10/card-util.c:798
 msgid "Language preferences: "
@@ -1208,15 +1167,15 @@ msgstr "介面語言偏好設定: "
 
 #: g10/card-util.c:806
 msgid "Error: invalid length of preference string.\n"
-msgstr "錯誤: 偏好設定字串的長度無效\n"
+msgstr "錯誤: 無效的偏好設定字串長度\n"
 
 #: g10/card-util.c:815
 msgid "Error: invalid characters in preference string.\n"
-msgstr "錯誤: 偏好設定字串中含有無效的字\n"
+msgstr "錯誤: 偏好設定字串中含有無效的字\n"
 
 #: g10/card-util.c:836
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)ale, (F)emale 或留空): "
+msgstr "性別 ((M)男性, (F)女性或留空): "
 
 #: g10/card-util.c:850
 msgid "Error: invalid response.\n"
@@ -1228,7 +1187,7 @@ msgstr "憑證中心 (CA) 指紋: "
 
 #: g10/card-util.c:894
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "錯誤: 指紋格式化無效.\n"
+msgstr "錯誤: 無效的格式化指紋.\n"
 
 #: g10/card-util.c:942
 #, c-format
@@ -1242,7 +1201,7 @@ msgstr "這不是 OpenPGP 卡片"
 #: g10/card-util.c:952
 #, c-format
 msgid "error getting current key info: %s\n"
-msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
+msgstr "取得現用金鑰資訊時出錯: %s\n"
 
 #: g10/card-util.c:1036
 msgid "Replace existing key? (y/N) "
@@ -1263,13 +1222,13 @@ msgid ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "You should change them using the command --change-pin\n"
 msgstr ""
-"請注意個人識別碼 (PIN) 的出廠設定值為\n"
-"   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
-"應該用 --change-pin 指令來加以變更\n"
+"請注意 PIN 的出廠設定值為\n"
+"   PIN = `%s'     管理者 PIN = `%s'\n"
+"應該用 --change-pin 指令來加以變更\n"
 
 #: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
-msgstr "請選擇要產生的金鑰種類:\n"
+msgstr "請選擇要產生的金鑰種類:\n"
 
 #: g10/card-util.c:1122 g10/card-util.c:1199
 msgid "   (1) Signature key\n"
@@ -1302,7 +1261,7 @@ msgstr "私鑰部分無法取用\n"
 
 #: g10/card-util.c:1241
 msgid "secret key already stored on a card\n"
-msgstr "私鑰已經存放卡片上了\n"
+msgstr "私鑰已經存放卡片上了\n"
 
 #: g10/card-util.c:1309 g10/keyedit.c:1362
 msgid "quit this menu"
@@ -1326,7 +1285,7 @@ msgstr "變更卡片持有人的名字"
 
 #: g10/card-util.c:1318
 msgid "change URL to retrieve key"
-msgstr "變更取回金鑰的 URL"
+msgstr "變更取回金鑰的 URL"
 
 #: g10/card-util.c:1319
 msgid "fetch the key specified in the card URL"
@@ -1334,7 +1293,7 @@ msgstr "從卡片 URL 取回指定的金鑰"
 
 #: g10/card-util.c:1320
 msgid "change the login name"
-msgstr "è®\8aæ\9b´ç\99»å\85¥å§\93å\90\8d"
+msgstr "è®\8aæ\9b´ç\99»å\85¥å\90\8d稱"
 
 #: g10/card-util.c:1321
 msgid "change the language preferences"
@@ -1346,11 +1305,11 @@ msgstr "變更卡片持有者的性別"
 
 #: g10/card-util.c:1323
 msgid "change a CA fingerprint"
-msgstr "變更某個憑證中心 (CA) 指紋"
+msgstr "變更某個憑證中心 (CA) 指紋"
 
 #: g10/card-util.c:1324
 msgid "toggle the signature force PIN flag"
-msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
+msgstr "切換簽章是否強制使用 PIN 的旗標"
 
 #: g10/card-util.c:1325
 msgid "generate new keys"
@@ -1358,11 +1317,11 @@ msgstr "產生新的金鑰"
 
 #: g10/card-util.c:1326
 msgid "menu to change or unblock the PIN"
-msgstr "變更或解凍個人識別碼 (PIN) 的選單"
+msgstr "變更或解凍 PIN 的選單"
 
 #: g10/card-util.c:1327
 msgid "verify the PIN and list all data"
-msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
+msgstr "驗證 PIN 並列出所有的資料"
 
 #: g10/card-util.c:1447 g10/keyedit.c:1634
 msgid "Command> "
@@ -1386,7 +1345,7 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 
 #: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
-msgstr "--output 在這個令中沒有作用\n"
+msgstr "--output 在這個令中沒有作用\n"
 
 #: g10/decrypt.c:166 g10/gpg.c:3926 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
@@ -1397,17 +1356,17 @@ msgstr "無法開啟 `%s'\n"
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "金鑰 \"%s\" 找不到: %s\n"
+msgstr "找不到金鑰 \"%s\": %s\n"
 
 #: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "讀取金鑰區塊時發生錯誤: %s\n"
+msgstr "讀取金鑰區塊時出錯: %s\n"
 
 #: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(除非用指紋指定了金鑰)\n"
+msgstr "(除非用指紋指定了金鑰)\n"
 
 #: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
@@ -1424,11 +1383,11 @@ msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 #: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "刪除金鑰區塊時失敗: %s\n"
+msgstr "刪除金鑰區塊時失敗: %s\n"
 
 #: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
-msgstr "主觀信任資訊已經被清除\n"
+msgstr "主觀信任資訊已清除\n"
 
 #: g10/delkey.c:204
 #, c-format
@@ -1442,16 +1401,16 @@ msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 #: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "建立密語的時候發生錯誤: %s\n"
+msgstr "建立密語時出錯: %s\n"
 
 #: g10/encode.c:232
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
+msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
 #: g10/encode.c:246
 #, c-format
 msgid "using cipher %s\n"
-msgstr "正在使用編密法 %s\n"
+msgstr "正在使用 %s 編密法\n"
 
 #: g10/encode.c:256 g10/encode.c:577
 #, c-format
@@ -1461,11 +1420,11 @@ msgstr "`%s' 已經被壓縮了\n"
 #: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "警告: `%s' 是個空檔案\n"
+msgstr "警告: `%s' 是個空檔案\n"
 
 #: g10/encode.c:485
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "在 --pgp2 模式中, 祇能以 2048 位元以下的 RSA 金鑰加密\n"
+msgstr "在 --pgp2 模式中, 祇能以 2048 位元以下的 RSA 金鑰加密\n"
 
 #: g10/encode.c:510
 #, c-format
@@ -1475,20 +1434,20 @@ msgstr "正在從 `%s' 讀取中\n"
 #: g10/encode.c:541
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
+msgstr "正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
 #: g10/encode.c:559
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
+msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
 #: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
-msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
+msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
 #: g10/encode.c:751
 #, c-format
@@ -1498,35 +1457,35 @@ msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 #: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
-msgstr "不能夠將 %s 用於 %s 模式中\n"
+msgstr "不能夠將 %s 用於 %s 模式中\n"
 
 #: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s 已加密給: \"%s\"\n"
+msgstr "%s/%s 已加密給: \"%s\"\n"
 
 #: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s å\8a å¯\86é\81\8e的資料\n"
+msgstr "%s å·²å\8a å¯\86的資料\n"
 
 #: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "以未知的演算法 %d 加密過\n"
+msgstr "以 %d 未知演算法所加密\n"
 
 #: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
+msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
-msgstr "è\99\95ç\90\86å\8a å¯\86ç\9a\84封包有問題\n"
+msgstr "è\99\95ç\90\86å·²å\8a å¯\86封包有問題\n"
 
 #: g10/exec.c:49
 msgid "no remote program execution supported\n"
-msgstr "沒有支援的遠端程式執行\n"
+msgstr "沒有支援的遠端程式執行\n"
 
 #: g10/exec.c:313
 msgid ""
@@ -1576,64 +1535,60 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
 #: g10/export.c:61
-#, fuzzy
 msgid "export signatures that are marked as local-only"
-msgstr "這份簽章會被標記成不可撤銷.\n"
+msgstr "匯出標記為僅限本機使用的簽章"
 
 #: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
-msgstr ""
+msgstr "匯出署名使用者 ID (通常是照片 ID)"
 
 #: g10/export.c:65
-#, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
-msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
+msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
 
 #: g10/export.c:67
-#, fuzzy
 msgid "remove the passphrase from exported subkeys"
-msgstr "撤銷金鑰或所選的次鑰"
+msgstr "從匯出所得的子鑰中移除密語"
 
 #: g10/export.c:69
-#, fuzzy
 msgid "remove unusable parts from key during export"
-msgstr "å¾\9eé\87\91é\91°ä¸­æ¸\85除無法使用的部分"
+msgstr "å\8c¯å\87ºæ\99\82å¾\9eé\87\91é\91°ä¸­ç§»除無法使用的部分"
 
 #: g10/export.c:71
 msgid "remove as much as possible from key during export"
-msgstr ""
+msgstr "匯出時盡可能地從金鑰中移除"
 
 #: g10/export.c:73
 msgid "export keys in an S-expression based format"
-msgstr ""
+msgstr "匯出金鑰成以 S-expression 為基礎的格式"
 
 #: g10/export.c:338
 msgid "exporting secret keys not allowed\n"
-msgstr "未被允許匯出私鑰\n"
+msgstr "允許匯出私鑰\n"
 
 #: g10/export.c:367
 #, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "金鑰 %s: 未保護 - 已跳過\n"
+msgstr "金鑰 %s: 未保護 - 已跳過\n"
 
 #: g10/export.c:375
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
+msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
 
 #: g10/export.c:386
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
+msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
 
 #: g10/export.c:537
 msgid "about to export an unprotected subkey\n"
-msgstr ""
+msgstr "正要匯出未受保護的子鑰\n"
 
 #: g10/export.c:560
-#, fuzzy, c-format
+#, c-format
 msgid "failed to unprotect the subkey: %s\n"
-msgstr "存放金鑰失敗: %s\n"
+msgstr "解除子鑰保護失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
 #: g10/export.c:584
@@ -1657,7 +1612,7 @@ msgstr "[找不到使用者 ID]"
 #: g10/getkey.c:1002
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
+msgstr "已自動取回 `%s' (經由 %s )\n"
 
 #: g10/getkey.c:1834
 #, c-format
@@ -1672,7 +1627,7 @@ msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 #: g10/getkey.c:2622
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
-msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
+msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
 #: g10/getkey.c:2669
 #, c-format
@@ -1689,15 +1644,15 @@ msgstr ""
 
 #: g10/gpg.c:369
 msgid "|[file]|make a signature"
-msgstr "|[檔案]|建立一份簽章"
+msgstr "|[檔案]|建立簽章"
 
 #: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
-msgstr "|[檔案]|建立一份明文簽章"
+msgstr "|[檔案]|建立明文簽章"
 
 #: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
-msgstr "建立一份分離式簽章"
+msgstr "建立分離式簽章"
 
 #: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
@@ -1713,7 +1668,7 @@ msgstr "資料解密 (預設)"
 
 #: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
-msgstr "驗證某份簽章"
+msgstr "驗證簽章"
 
 #: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
@@ -1737,31 +1692,31 @@ msgstr "列出私鑰"
 
 #: g10/gpg.c:386
 msgid "generate a new key pair"
-msgstr "產生一份新的金鑰對"
+msgstr "產生新的金鑰對"
 
 #: g10/gpg.c:387
 msgid "remove keys from the public keyring"
-msgstr "從公鑰鑰匙圈裡移金鑰"
+msgstr "從公鑰鑰匙圈裡移金鑰"
 
 #: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
-msgstr "從私鑰鑰匙圈裡移金鑰"
+msgstr "從私鑰鑰匙圈裡移金鑰"
 
 #: g10/gpg.c:390
 msgid "sign a key"
-msgstr "簽署某把金鑰"
+msgstr "簽署金鑰"
 
 #: g10/gpg.c:391
 msgid "sign a key locally"
-msgstr "僅在本地簽署某把金鑰"
+msgstr "僅在本機簽署金鑰"
 
 #: g10/gpg.c:392
 msgid "sign or edit a key"
-msgstr "簽署或編輯某把金鑰"
+msgstr "簽署或編輯金鑰"
 
 #: g10/gpg.c:393
 msgid "generate a revocation certificate"
-msgstr "產生一份撤銷憑證"
+msgstr "產生撤銷憑證"
 
 #: g10/gpg.c:395
 msgid "export keys"
@@ -1769,19 +1724,19 @@ msgstr "匯出金鑰"
 
 #: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
-msgstr "把金鑰匯出至某個金鑰伺服器上"
+msgstr "把金鑰匯出至金鑰伺服器"
 
 #: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
-msgstr "從某個金鑰伺服器上匯入金鑰"
+msgstr "從金鑰伺服器匯入金鑰"
 
 #: g10/gpg.c:399
 msgid "search for keys on a key server"
-msgstr "在某個金鑰伺服器上搜尋金鑰"
+msgstr "在金鑰伺服器上搜尋金鑰"
 
 #: g10/gpg.c:401
 msgid "update all keys from a keyserver"
-msgstr "從某個金鑰伺服器上更新所有的金鑰"
+msgstr "從金鑰伺服器更新所有的金鑰"
 
 #: g10/gpg.c:405
 msgid "import/merge keys"
@@ -1797,7 +1752,7 @@ msgstr "變更卡片上的資料"
 
 #: g10/gpg.c:410
 msgid "change a card's PIN"
-msgstr "變更某張卡片的個人識別碼 (PIN)"
+msgstr "變更卡片的 PIN"
 
 #: g10/gpg.c:419
 msgid "update the trust database"
@@ -1809,7 +1764,7 @@ msgstr "|演算法 [檔案]|印出訊息摘要"
 
 #: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
-msgstr ""
+msgstr "以伺服器模式執行"
 
 #: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
@@ -1832,7 +1787,7 @@ msgstr "|名字|以「名字」作為加密對象"
 
 #: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
-msgstr "使用這個使用者 ID 來簽署或解密"
+msgstr "這個使用者 ID 來簽署或解密"
 
 #: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
@@ -1843,9 +1798,8 @@ msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
 #: g10/gpg.c:466 sm/gpgsm.c:342
-#, fuzzy
 msgid "|FILE|write output to FILE"
-msgstr "從 `%s' 讀取選項\n"
+msgstr "|檔案|將輸出寫入至「檔案」"
 
 #: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
@@ -1893,7 +1847,8 @@ msgstr ""
 
 #: g10/gpg.c:753 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
+msgstr ""
+"請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
 
 #: g10/gpg.c:770
 msgid "Usage: gpg [options] [files] (-h for help)"
@@ -1915,7 +1870,7 @@ msgid ""
 "Supported algorithms:\n"
 msgstr ""
 "\n"
-"已支援的演算法:\n"
+"已支援的演算法:\n"
 
 #: g10/gpg.c:787
 msgid "Pubkey: "
@@ -1935,7 +1890,7 @@ msgstr "壓縮: "
 
 #: g10/gpg.c:815 sm/gpgsm.c:605
 msgid "Used libraries:"
-msgstr ""
+msgstr "已使用的函示庫:"
 
 #: g10/gpg.c:923
 msgid "usage: gpg [options] "
@@ -2019,61 +1974,57 @@ msgstr "未知的組態項目 `%s'\n"
 
 #: g10/gpg.c:1624
 msgid "display photo IDs during key listings"
-msgstr ""
+msgstr "列出金鑰時顯示照片 ID"
 
 #: g10/gpg.c:1626
 msgid "show policy URLs during signature listings"
-msgstr ""
+msgstr "列出簽章時顯示原則 URL"
 
 #: g10/gpg.c:1628
-#, fuzzy
 msgid "show all notations during signature listings"
-msgstr "å\9c¨ç§\81é\91°å\9c\88裡æ²\92æ\9c\89ä¸\80è\87´ç\9a\84簽章\n"
+msgstr "å\88\97å\87ºç°½ç« æ\99\82顯示æ\89\80æ\9c\89ç\9a\84註è¨\98"
 
 #: g10/gpg.c:1630
 msgid "show IETF standard notations during signature listings"
-msgstr ""
+msgstr "列出簽章時顯示 IETF 標準註記"
 
 #: g10/gpg.c:1634
 msgid "show user-supplied notations during signature listings"
-msgstr ""
+msgstr "列出簽章時顯示使用者提供的註記"
 
 #: g10/gpg.c:1636
-#, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
-msgstr "給定的偏好金鑰伺服器 URL 無效\n"
+msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
 #: g10/gpg.c:1638
 msgid "show user ID validity during key listings"
-msgstr ""
+msgstr "列出金鑰時顯示使用者 ID 有效性"
 
 #: g10/gpg.c:1640
 msgid "show revoked and expired user IDs in key listings"
-msgstr ""
+msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
 #: g10/gpg.c:1642
 msgid "show revoked and expired subkeys in key listings"
-msgstr ""
+msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
 #: g10/gpg.c:1644
-#, fuzzy
 msgid "show the keyring name in key listings"
-msgstr "在私鑰清單和公鑰清單間切換"
+msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
 #: g10/gpg.c:1646
-#, fuzzy
 msgid "show expiration dates during signature listings"
-msgstr "å\9c¨ç§\81é\91°å\9c\88裡æ²\92æ\9c\89ä¸\80è\87´ç\9a\84簽章\n"
+msgstr "å\88\97å\87ºç°½ç« æ\99\82顯示æ\9c\89æ\95\88æ\9c\9fé\99\90"
 
 #: g10/gpg.c:1805
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
+msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
 #: g10/gpg.c:1896
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
-msgstr ""
+msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
 
 #: g10/gpg.c:2275 g10/gpg.c:2950 g10/gpg.c:2962
 #, c-format