[Gpa-commits] r777 - in trunk: . po src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu May 24 15:15:55 CEST 2007


Author: werner
Date: 2007-05-24 15:15:53 +0200 (Thu, 24 May 2007)
New Revision: 777

Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/NEWS
   trunk/autogen.sh
   trunk/configure.ac
   trunk/po/ChangeLog
   trunk/po/cs.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ja.po
   trunk/po/nl.po
   trunk/po/pl.po
   trunk/po/pt_BR.po
   trunk/po/ru.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/po/zh_TW.Big5.po
   trunk/src/ChangeLog
   trunk/src/Makefile.am
Log:
Preparing for the 0.7.6 release.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/ChangeLog	2007-05-24 13:15:53 UTC (rev 777)
@@ -1,3 +1,7 @@
+2007-05-24  Werner Koch  <wk at g10code.com>
+
+	Released 0.7.6.
+
 2007-04-25  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (AM_GNU_GETTEXT): Require ngettext.

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/INSTALL	2007-05-24 13:15:53 UTC (rev 777)
@@ -1,27 +1,43 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
 
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
 
 The simplest way to compile this package is:
 
@@ -54,20 +70,22 @@
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
 
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -75,28 +93,28 @@
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
 
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -107,7 +125,7 @@
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -122,48 +140,86 @@
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
      CPU-COMPANY-SYSTEM
 
-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
 
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
 
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 
-Operation Controls
+Defining Variables
 ==================
 
-   `configure' recognizes the following options to control how it
-operates.
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
 
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
+     ./configure CC=/usr/local2/bin/gcc
 
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
 `--help'
+`-h'
      Print a summary of the options to `configure', and exit.
 
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
 `--quiet'
 `--silent'
 `-q'
@@ -175,8 +231,6 @@
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
 
-`configure' also accepts some other, not widely useful, options.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/NEWS	2007-05-24 13:15:53 UTC (rev 777)
@@ -1,11 +1,13 @@
-Noteworthy changes in version 0.7.6 (unreleased)
+Noteworthy changes in version 0.7.6 (2007-05-24)
 ------------------------------------------------
 
  * Czech translation by Zdenek Hatas.
 
  * Russian translation by Maxim Britov.
 
+ * Files may now be dropped onto the file manager window.
 
+
 Noteworthy changes in version 0.7.5 (2007-02-26)
 ------------------------------------------------
 

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/autogen.sh	2007-05-24 13:15:53 UTC (rev 777)
@@ -4,12 +4,33 @@
 # Use --build-w32 to prepare the cross compiling build for Windoze
 #
 
-PGM=GPA
-autoconf_vers=2.52
-automake_vers=1.6
-aclocal_vers=1.6
-libtool_vers=1.4
+configure_ac="configure.ac"
 
+cvtver () {
+  awk 'NR==1 {split($NF,A,".");X=1000000*A[1]+1000*A[2]+A[3];print X;exit 0}'
+}
+
+check_version () {
+    if [ `("$1" --version || echo "0") | cvtver` -ge "$2" ]; then
+       return 0
+    fi
+    echo "**Error**: "\`$1\'" not installed or too old." >&2
+    echo '           Version '$3' or newer is required.' >&2
+    [ -n "$4" ] && echo '           Note that this is part of '\`$4\''.' >&2
+    DIE="yes"
+    return 1
+}
+
+# Allow to override the default tool names
+AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
+AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
+
+AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
+ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
+
+GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
+MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
+
 DIE=no
 FORCE=
 if test "$1" == "--force"; then
@@ -18,6 +39,8 @@
 fi
 
 
+# ***** W32 build script *******
+# Used to cross-compile for Windows.
 if test "$1" = "--build-w32"; then
     tmp=`dirname $0`
     tsdir=`cd "$tmp"; pwd`
@@ -29,35 +52,28 @@
     build=`$tsdir/config.guess`
 
     [ -z "$w32root" ] && w32root="$HOME/w32root"
-    export w32root
     echo "Using $w32root as standard install directory" >&2
     
-    # See whether we have the Debian cross compiler package or the
-    # old mingw32/cpd system
-    if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then
-       host=i586-mingw32msvc
-       crossbindir=/usr/$host/bin
-       conf_CC="CC=${host}-gcc"
-    else
-       host=i386--mingw32
-       if ! mingw32 --version >/dev/null; then
-          echo "We need at least version 0.3 of MingW32/CPD" >&2
-          exit 1
-       fi
-       crossbindir=`mingw32 --install-dir`/bin
-       # Old autoconf version required us to setup the environment
-       # with the proper tool names.
-       CC=`mingw32 --get-path gcc`
-       CPP=`mingw32 --get-path cpp`
-       AR=`mingw32 --get-path ar`
-       RANLIB=`mingw32 --get-path ranlib`
-       export CC CPP AR RANLIB 
-       conf_CC=""
+    # Locate the cross compiler
+    crossbindir=
+    for host in i586-mingw32msvc i386-mingw32msvc mingw32; do
+        if ${host}-gcc --version >/dev/null 2>&1 ; then
+            crossbindir=/usr/${host}/bin
+            conf_CC="CC=${host}-gcc"
+            break;
+        fi
+    done
+    if [ -z "$crossbindir" ]; then
+        echo "Cross compiler kit not installed" >&2
+        echo "Under Debian GNU/Linux, you may install it using" >&2
+        echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2 
+        echo "Stop." >&2
+        exit 1
     fi
    
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep "$host" >/dev/null; then
-            echo "Pease run a 'make distclean' first" >&2
+            echo "Please run a 'make distclean' first" >&2
             exit 1
         fi
     fi
@@ -70,96 +86,68 @@
             --with-lib-prefix=${w32root} \
             --with-libiconv-prefix=${w32root} \
             PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig"
-    exit $?
+    rc=$?
+    exit $rc
 fi
+# ***** end W32 build script *******
 
 
+# Grep the required versions from configure.ac
+autoconf_vers=`sed -n '/^AC_PREREQ(/ { 
+s/^.*(\(.*\))/\1/p
+q
+}' ${configure_ac}`
+autoconf_vers_num=`echo "$autoconf_vers" | cvtver`
 
-if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
-    if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
-			       exit 1; exit 0; }');
-    then
-       echo "**Error**: "\`autoconf\'" is too old."
-       echo '           (version ' $autoconf_vers ' or newer is required)'
-       DIE="yes"
-    fi
-else
-    echo
-    echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM."
-    echo '           (version ' $autoconf_vers ' or newer is required)'
-    DIE="yes"
-fi
+automake_vers=`sed -n '/^min_automake_version=/ { 
+s/^.*="\(.*\)"/\1/p
+q
+}' ${configure_ac}`
+automake_vers_num=`echo "$automake_vers" | cvtver`
 
-if (automake --version) < /dev/null > /dev/null 2>&1 ; then
-  if (automake --version | awk 'NR==1 { if( $4 >= '$automake_vers') \
-			     exit 1; exit 0; }');
-     then
-     echo "**Error**: "\`automake\'" is too old."
-     echo '           (version ' $automake_vers ' or newer is required)'
-     DIE="yes"
-  fi
-  if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-    if (aclocal --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \
-						exit 1; exit 0; }' );
-    then
-      echo "**Error**: "\`aclocal\'" is too old."
-      echo '           (version ' $aclocal_vers ' or newer is required)'
-      DIE="yes"
-    fi
-  else
-    echo
-    echo "**Error**: Missing "\`aclocal\'".  The version of "\`automake\'
-    echo "           installed doesn't appear recent enough."
-    DIE="yes"
-  fi
-else
-    echo
-    echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
-    echo '           (version ' $automake_vers ' or newer is required)'
-    DIE="yes"
-fi
+gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { 
+s/^.*(\(.*\))/\1/p
+q
+}' ${configure_ac}`
+gettext_vers_num=`echo "$gettext_vers" | cvtver`
 
 
-if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"."); \
-    X=10000*A[1]+100*A[2]+A[3]; echo X; if( X >= 1201 ) exit 1; exit 0}')
-    then
-    echo "**Error**: You must have "\`gettext\'" installed to compile $PGM."
-    echo '           (version 0.12.1 or newer is required; get'
-    echo '            ftp://alpha.gnu.org/gnu/gettext-0.12.1.tar.gz'
-    echo '            or install the latest Debian package)'
-    DIE="yes"
+if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ]
+then
+  echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2
+  exit 1
 fi
 
 
-#if (libtool --version) < /dev/null > /dev/null 2>&1 ; then
-#    if (libtool --version | awk 'NR==1 { if( $4 >= '$libtool_vers') \
-#			       exit 1; exit 0; }');
-#    then
-#       echo "**Error**: "\`libtool\'" is too old."
-#       echo '           (version ' $libtool_vers ' or newer is required)'
-#       DIE="yes"
-#    fi
-#else
-#    echo
-#    echo "**Error**: You must have "\`libtool\'" installed to compile $PGM."
-#    echo '           (version ' $libtool_vers ' or newer is required)'
-#    DIE="yes"
-#fi
+if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
+    check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
+fi
+if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
+  check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
+fi
+if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
+  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+fi
 
-
 if test "$DIE" = "yes"; then
+    cat <<EOF
+
+Note that you may use alternative versions of the tools by setting 
+the corresponding environment variables; see README.CVS for details.
+                   
+EOF
     exit 1
 fi
 
-echo "Running autopoint"
-autopoint
-echo "Running aclocal..."
-aclocal -I m4
+
+echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
+$ACLOCAL -I m4  $ACLOCAL_FLAGS
 echo "Running autoheader..."
-autoheader
-echo "Running automake --add-missing --gnu ..."
-automake --add-missing --gnu
+$AUTOHEADER
+echo "Running automake --gnu ..."
+$AUTOMAKE --gnu;
 echo "Running autoconf${FORCE} ..."
-autoconf${FORCE}
+$AUTOCONF${FORCE}
 
+
 echo "You may now run \"./configure --enable-maintainer-mode\" and then \"make\"."

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/configure.ac	2007-05-24 13:15:53 UTC (rev 777)
@@ -30,7 +30,7 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh --force" right before creating a distribution.
 m4_define(my_version, [0.7.6])
-m4_define(my_issvn, yes)
+m4_define(my_issvn, no)
 
 m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
           ||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/ChangeLog	2007-05-24 13:15:53 UTC (rev 777)
@@ -1,3 +1,7 @@
+2007-05-24  Werner Koch  <wk at g10code.com>
+
+	* cs.po: Add Plural-Forms header.
+
 2007-04-25  Werner Koch  <wk at g10code.com>
 
 	* ru.po: New.  By Maxim Britov.

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/cs.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
-"PO-Revision-Date: 2007-02-11 15:17+0100\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
+"PO-Revision-Date: 2007-05-24 15:04+0200\n"
 "Last-Translator: Zdeněk Hataš <zdenek.hatas at gmail.com>\n"
 "Language-Team: czech <cs at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,8 @@
 "X-Generator: KBabel 1.0.2\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:294 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
@@ -59,191 +61,191 @@
 msgid "_expire on:"
 msgstr "_vyprší:"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "Otevřít soubor"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "Soubor je již otevřený"
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/Soubor/_Otevřít"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 msgid "/File/C_lear"
 msgstr "/Soubor/Vymazat"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/Soubor/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/Soubor/Podep_sat"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 msgid "/File/_Verify"
 msgstr "/Soubor/O_věřit"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/Soubor/Å _ifrovat"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/Soubor/_Dešifrovat"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/Soubor/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/Soubor/_Zavřít"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/Soubor/U_končit"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "/_Upravit"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/Upravit/Vybrat vše"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/Upravit/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/Upravit/Na_stavení"
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/_Okna"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/Okna/_Správce souborů"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/Okna/Správce _klíčů"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 msgid "/File/Sign"
 msgstr "/Soubor/Podepsat"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 msgid "/File/Verify"
 msgstr "/Soubor/Ověřit"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 msgid "/File/Encrypt"
 msgstr "/Soubor/Å ifrovat"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 msgid "/File/Decrypt"
 msgstr "/Soubor/Dešifrovat"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "Otevřít soubor"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "otevřít soubor"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "Close all files"
 msgstr "Vymazat všechny soubory"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "close files"
 msgstr "Uzavřít soubory"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "Podepsat"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "Podepsat vybraný soubor"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "podepsat soubor"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "Ověřit"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 msgid "Check signatures of selected file"
 msgstr "Zkontrolovat podpis vybraného souboru"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 msgid "verify file"
 msgstr "ověřit soubor"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "Zašifrovat"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "Zašifrovat vybraný soubor"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "zašifrovat soubor"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 msgid "Decrypt"
 msgstr "Dešifrovat"
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "Dešifrovat vybraný soubor"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "dešifrovat soubor"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "Otevřít dialog Nastavení"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "nastavení"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "Co je GNU Privacy Assistant"
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "nápověda"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "Soubor"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Správce souborů"
 
@@ -449,7 +451,7 @@
 msgstr "Zneplatněný klíč"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -622,12 +624,12 @@
 msgid "Can authenticate"
 msgstr "Smí autentizovat"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 msgid "Revoked"
 msgstr "Zneplatněn"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 msgid "Expired"
 msgstr "Vypršela platnost"
 
@@ -639,7 +641,7 @@
 msgid "Unsigned"
 msgstr "Nepodepsaný"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Platný"
 
@@ -767,7 +769,7 @@
 msgstr "RSA (jen podpis)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 msgid "Unknown"
 msgstr "Neznámá"
 
@@ -807,53 +809,53 @@
 msgid "Enter Passphrase"
 msgstr "Zadat heslo"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr "[Žádný]"
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Neznámé ID uživatele]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Špatný"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr "Obecný"
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr "Přibližný"
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr "Pozitivní"
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Tento klíč smí být použit pro certifikaci, podpis a šifrování."
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Tento klíč smí být použit pro certifikaci a podpis, ne však pro šifrování."
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 msgid "The key can be used for certification and encryption."
 msgstr "Tento klíč smí být použit pro certifikaci a šifrování."
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 msgid "The key can be used only for certification."
 msgstr "Tento klíč smí být použit pouze pro certifikaci."
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -861,15 +863,15 @@
 "Tento klíč smí být použit pouze pro šifrování a podpis, ne však pro "
 "certifikaci."
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 msgid "The key can be used only for signing."
 msgstr "Tento klíč smí být použit pouze pro podpis."
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 msgid "The key can be used only for encryption."
 msgstr "Tento klíč smí být použit pouze pro šifrování."
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr "Tento klíč je nepoužitelný."
 
@@ -890,7 +892,7 @@
 msgstr "Program vám přináší:"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
+msgid "GPA is Free Software under the"
 msgstr "GPA je otevřený program šířený"
 
 #: src/helpmenu.c:284
@@ -901,35 +903,39 @@
 msgid "For news see:"
 msgstr "Novinky na:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gpg4win.org"
+
+#: src/helpmenu.c:295
 msgid "http://www.gnupg.org"
-msgstr "http://www.gnupp.de"
+msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
-msgstr "GNU general public license"
+#: src/helpmenu.c:378
+msgid "GNU General Public License"
+msgstr "pod GNU General Public License."
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "_GNU general public license"
+#: src/helpmenu.c:405
+msgid "_GNU General Public License"
+msgstr "pod _GNU General Public License."
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "Zobrazit test nápovědy\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/_Nápověda"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 msgid "/Help/_Contents"
 msgstr "/Nápověda/_Obsah"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/Nápověda/_Licence"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/Nápověda/O _programu"
 
@@ -1446,11 +1452,12 @@
 msgstr "Žádný klíč nevybrán"
 
 #: src/keyring.c:1313
-#, fuzzy, c-format
+#, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d klíčů vybráno"
 msgstr[1] "%d klíčů vybráno"
+msgstr[2] "%d klíčů vybráno"
 
 #: src/keyring.c:1345
 msgid "All signatures"
@@ -1805,6 +1812,12 @@
 msgid "Signatures:"
 msgstr "Podpisy:"
 
+#~ msgid "GNU general public license"
+#~ msgstr "GNU general public license"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "_GNU general public license"
+
 #~ msgid ">.\n"
 #~ msgstr ">.\n"
 

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/de.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
-"PO-Revision-Date: 2007-04-25 15:09+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
+"PO-Revision-Date: 2007-05-16 12:46+0200\n"
 "Last-Translator: Steffen Michalek <steffen at michalek.de>\n"
 "Language-Team: deutsch <de at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,191 +59,191 @@
 msgid "_expire on:"
 msgstr "_ungültig ab:"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "Die Datei ist bereits geöffnet."
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/Datei/_Öffnen"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 msgid "/File/C_lear"
 msgstr "/Datei/_Leeren"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/Datei/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/Datei/_Signieren"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 msgid "/File/_Verify"
 msgstr "/Datei/Über_prüfen"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/Datei/_Verschlüsseln"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/Datei/_Entschlüsseln"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/Datei/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/Datei/_Fenster schließen"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/Datei/_Beenden"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/Bearbeiten/Alle A_uswählen"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/Bearbeiten/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/Bearbeiten/_Einstellungen"
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/_Fenster"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/Fenster/_Dateiverwaltung"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/Fenster/_Schlüsselverwaltung"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 msgid "/File/Sign"
 msgstr "/Datei/_Signieren"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 msgid "/File/Verify"
 msgstr "/Datei/Über_prüfen"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 msgid "/File/Encrypt"
 msgstr "/Datei/_Verschlüsseln"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 msgid "/File/Decrypt"
 msgstr "/Datei/_Entschlüsseln"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "Datei öffnen"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "Datei öffnen"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "Close all files"
 msgstr "Alle Dateien schließen"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "close files"
 msgstr "Dateien schließen"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "Signieren"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "Gewählte Datei signieren"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "Datei signieren"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "Prüfen"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 msgid "Check signatures of selected file"
 msgstr "Signatur der ausgewählten Datei prüfen"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 msgid "verify file"
 msgstr "Datei prüfen"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "Gewählte Datei verschlüsseln"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "Datei verschlüsseln"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 msgid "Decrypt"
 msgstr "Entschlüsseln"
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "Gewählte Datei entschlüsseln"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "Datei entschlüsseln"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "Öffne den Dialog für die Einstellungen"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "Einstellungen"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "Wie funktioniert der GNU Privacy Assistant?"
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "Hilfe"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "Datei"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Dateiverwaltung"
 
@@ -450,7 +450,7 @@
 msgstr "Zurückgezogener Schlüssel"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -625,12 +625,12 @@
 msgid "Can authenticate"
 msgstr "Zum Autentifizieren verwendbar"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 msgid "Revoked"
 msgstr "Widerrufen"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 msgid "Expired"
 msgstr "Abgelaufen"
 
@@ -642,7 +642,7 @@
 msgid "Unsigned"
 msgstr "Nicht beglaubigt"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Gültig"
 
@@ -768,7 +768,7 @@
 msgstr "RSA (nur signieren)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 msgid "Unknown"
 msgstr "unbekannt"
 
@@ -808,58 +808,58 @@
 msgid "Enter Passphrase"
 msgstr "Passwortsatz eingeben"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr "[Keine]"
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Unbekannte Benutzerkennung]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Ungültig"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr "Generisch"
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr "Beiläufig"
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr "Positiv"
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "Der Schlüssel kann zur Zertifizierung, zum Signieren und zur Verschlüsselung "
 "verwendet werden."
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Der Schlüssel kann zur Zertifizierung und zum Signieren verwendet werden, "
 "nicht aber zur Verschlüsselung."
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 msgid "The key can be used for certification and encryption."
 msgstr ""
 "Der Schlüssel kann zur Zertifizierung und zur Verschlüsselung verwendet "
 "werden."
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 msgid "The key can be used only for certification."
 msgstr "Der Schlüssel ist ausschließlich zum Zertifizieren verwendbar."
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -867,15 +867,15 @@
 "Der Schlüssel ist nur zum Signieren und Verschlüsseln verwendbar, nicht aber "
 "zum Zertifizieren."
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 msgid "The key can be used only for signing."
 msgstr "Der Schlüssel ist ausschließlich zum Signieren verwendbar."
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 msgid "The key can be used only for encryption."
 msgstr "Der Schlüssel ist ausschließlich zum Verschlüsseln verwendbar."
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr "Dieser Schlüssel ist nicht verwendbar."
 
@@ -896,8 +896,8 @@
 msgstr "Ermöglicht durch die Arbeit von:"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
-msgstr "GPA ist freie Software unter der"
+msgid "GPA is Free Software under the"
+msgstr "GPA ist Freie Software unter der"
 
 #: src/helpmenu.c:284
 msgid "GNU General Public License."
@@ -907,35 +907,39 @@
 msgid "For news see:"
 msgstr "Aktuelle Informationen finden Sie unter:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gpg4win.de"
+
+#: src/helpmenu.c:295
 msgid "http://www.gnupg.org"
-msgstr "http://www.gnupp.de"
+msgstr "http://www.gnupg.de"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
-msgstr "GNU general public license"
+#: src/helpmenu.c:378
+msgid "GNU General Public License"
+msgstr "GNU General Public License."
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "_GNU general public license"
+#: src/helpmenu.c:405
+msgid "_GNU General Public License"
+msgstr "_GNU General Public License."
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "Hilfe anzeigen\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 msgid "/Help/_Contents"
 msgstr "/Hilfe/_Inhalt"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/Hilfe/_Lizenz"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/Hilfe/_Über GPA"
 
@@ -1825,6 +1829,12 @@
 msgid "Signatures:"
 msgstr "Signaturen (Beglaubigungen)"
 
+#~ msgid "GNU general public license"
+#~ msgstr "GNU general public license"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "_GNU general public license"
+
 #~ msgid ">.\n"
 #~ msgstr ">.\n"
 

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/es.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
 "PO-Revision-Date: 2003-10-18 13:35+0200\n"
 "Last-Translator: Miguel Coca <mcoca at gnu.org>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -58,191 +58,191 @@
 msgid "_expire on:"
 msgstr "_caduca el:"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "Abrir Archivo"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "El archivo ya está abierto."
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/_Archivo"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/Archivo/_Abrir"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 msgid "/File/C_lear"
 msgstr "/Archivo/Li_mpiar"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/Archivo/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/Archivo/_Firmar"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 msgid "/File/_Verify"
 msgstr "/Archivo/_Verificar"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/Archivo/_Cifrar"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/Archivo/_Descifrar"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/Archivo/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/Archivo/C_errar"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/Archivo/_Salir"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/Editar/Seleccionar _Todo"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/Editar/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/Editar/Pr_eferencias..."
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/_Ventanas"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/Ventanas/Gestor de _Archivos"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/Ventanas/_Editor del anillo"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 msgid "/File/Sign"
 msgstr "/Archivo/Firmar"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 msgid "/File/Verify"
 msgstr "/Archivo/Verificar"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 msgid "/File/Encrypt"
 msgstr "/Archivo/Cifrar"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 msgid "/File/Decrypt"
 msgstr "/Archivo/Descifrar"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "abrir archivo"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "Close all files"
 msgstr "Cerrar todos los archivos"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "close files"
 msgstr "cerrar archivos"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "Firmar"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "Firmar archivo seleccionado"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "firmar archivo"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "Verificar"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 msgid "Check signatures of selected file"
 msgstr "Comprobar las firmas en el archivo seleccionado"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 msgid "verify file"
 msgstr "verificar archivo"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "Cifrar el archivo seleccionado"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "cifrar archivo"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 msgid "Decrypt"
 msgstr "Descifrar"
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "Descifrar el archivo seleccionado"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "descifrar archivo"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "Abrir la ventana de Preferencias"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "preferencias"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "Comprendiendo el GNU Privacy Assistant"
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "ayuda"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "Archivo"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gestor de Archivos"
 
@@ -449,7 +449,7 @@
 msgstr "Clave Revocada"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -619,12 +619,12 @@
 msgid "Can authenticate"
 msgstr "Puede autenticar"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 msgid "Revoked"
 msgstr "Revocada"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 msgid "Expired"
 msgstr "Caducada"
 
@@ -636,7 +636,7 @@
 msgid "Unsigned"
 msgstr "Sin firmar"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Válida"
 
@@ -762,7 +762,7 @@
 msgstr "RSA (solo firma)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 msgid "Unknown"
 msgstr "Desconocida"
 
@@ -802,53 +802,53 @@
 msgid "Enter Passphrase"
 msgstr "Introduzca Contraseña"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Usuario desconocido]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Incorrecta"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr "Genérica"
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr "Casual"
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr "Positiva"
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Esta clave puede utilizarse para certificación, firma y cifrado."
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Esta clave puede utilizarse para certificación y firma, pero no para cifrado."
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 msgid "The key can be used for certification and encryption."
 msgstr "Esta clave puede utilizarse para certificación y cifrado."
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 msgid "The key can be used only for certification."
 msgstr "Esta clave puede utilizarse solo para certificación."
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -856,15 +856,15 @@
 "Esta clave puede utilizarse solo para firma y cifrado, pero no para\n"
 "certificación."
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 msgid "The key can be used only for signing."
 msgstr "Esta clave puede utilizarse tan solo para firma."
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 msgid "The key can be used only for encryption."
 msgstr "Esta clave puede utilizarse tan solo para cifrado."
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr "Esta clave no vale para nada."
 
@@ -885,7 +885,8 @@
 msgstr "De mano de:"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
+#, fuzzy
+msgid "GPA is Free Software under the"
 msgstr "GPA es software libre bajo la"
 
 #: src/helpmenu.c:284
@@ -896,35 +897,42 @@
 msgid "For news see:"
 msgstr "Noticias en:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
+#, fuzzy
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gnupg.org"
+
+#: src/helpmenu.c:295
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
-msgstr "GNU general public license"
+#: src/helpmenu.c:378
+#, fuzzy
+msgid "GNU General Public License"
+msgstr "GNU General Public License,"
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "_GNU general public license"
+#: src/helpmenu.c:405
+#, fuzzy
+msgid "_GNU General Public License"
+msgstr "GNU General Public License,"
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "Mostrar Text de Ayuda\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/A_yuda"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 msgid "/Help/_Contents"
 msgstr "/Ayuda/_Contenidos"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/Ayuda/_Licencia"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/Ayuda/Acerca de..."
 
@@ -1803,6 +1811,12 @@
 msgid "Signatures:"
 msgstr "Firmas:"
 
+#~ msgid "GNU general public license"
+#~ msgstr "GNU general public license"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "_GNU general public license"
+
 #~ msgid ">.\n"
 #~ msgstr ">.\n"
 

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/fr.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
 "PO-Revision-Date: 2003-01-01 21:11+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <fr at li.org>\n"
@@ -61,202 +61,202 @@
 msgid "_expire on:"
 msgstr "_expire le"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "Ouvrir fichier"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "Le fichier est déjà ouvert"
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/Fichier/_Ouvrir"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 #, fuzzy
 msgid "/File/C_lear"
 msgstr "/Fichier/_Fermer"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/Fichier/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/Fichier/_Signer"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 #, fuzzy
 msgid "/File/_Verify"
 msgstr "/Fichier/_Déchiffrer"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/Fichier/_Chiffrer"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/Fichier/_Déchiffrer"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/Fichier/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/Fichier/_Fermer"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/Fichier/_Quitter"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "/_Edition"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/Edition/Sélectionner _Tout"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/Edition/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/Edition/Pr_éférences..."
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/_Fenêtres"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/Fenêtres/_Gestionnaire de fichier"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/Fenêtres/_Editeur de trousseau"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 #, fuzzy
 msgid "/File/Sign"
 msgstr "/Fichier/_Signer"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 #, fuzzy
 msgid "/File/Verify"
 msgstr "/Fichier/_Déchiffrer"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 #, fuzzy
 msgid "/File/Encrypt"
 msgstr "/Fichier/_Chiffrer"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 #, fuzzy
 msgid "/File/Decrypt"
 msgstr "/Fichier/_Déchiffrer"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "ouvrir fichier"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 #, fuzzy
 msgid "Close all files"
 msgstr "Ouvrir un fichier"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 #, fuzzy
 msgid "close files"
 msgstr "ouvrir fichier"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "Signer"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "Signer le fichier sélectionné"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "signer fichier"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "Vérifier"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 #, fuzzy
 msgid "Check signatures of selected file"
 msgstr "Signer le fichier sélectionné"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 #, fuzzy
 msgid "verify file"
 msgstr "vérifier fichier"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "Chiffrer le fichier sélectionné"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "chiffrer fichier"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 #, fuzzy
 msgid "Decrypt"
 msgstr "_Déchiffrer"
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "Déchiffrer le fichier sélectionné"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "déchiffrer fichier"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "Ouvrir la fenêtre des Préférences"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "préférences"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "Aide"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "Comprendre GNU Privacy Assistant"
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "aide"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "Fichier"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gestionnaire de fichier"
 
@@ -476,7 +476,7 @@
 msgstr "Clef révoquée"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -656,13 +656,13 @@
 msgid "Can authenticate"
 msgstr ""
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 #, fuzzy
 msgid "Revoked"
 msgstr "Retirer"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 #, fuzzy
 msgid "Expired"
 msgstr "_expire le"
@@ -677,7 +677,7 @@
 msgid "Unsigned"
 msgstr "signé"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 #, fuzzy
 msgid "Valid"
 msgstr "valide"
@@ -801,7 +801,7 @@
 msgstr "DSA (signature seulement)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 #, fuzzy
 msgid "Unknown"
 msgstr "inconnu"
@@ -844,70 +844,70 @@
 msgid "Enter Passphrase"
 msgstr "Entrer mot de passe"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[ID d'utilisateur inconnue]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Mauvais"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr ""
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr ""
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr ""
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr ""
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 #, fuzzy
 msgid "The key can be used for certification and encryption."
 msgstr "Aucun fichier sélectionné pour le chiffrement"
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 #, fuzzy
 msgid "The key can be used only for certification."
 msgstr "Aucun fichier sélectionné pour le chiffrement"
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 #, fuzzy
 msgid "The key can be used only for signing."
 msgstr "Aucune clef sélectionnée pour signer."
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 #, fuzzy
 msgid "The key can be used only for encryption."
 msgstr "Aucun fichier sélectionné pour le chiffrement"
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr ""
 
@@ -929,7 +929,8 @@
 msgstr "vous est fourni par"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
+#, fuzzy
+msgid "GPA is Free Software under the"
 msgstr "GPA est un logiciel libre sous la"
 
 #: src/helpmenu.c:284
@@ -941,37 +942,44 @@
 msgid "For news see:"
 msgstr "Pour des nouvelles, voir:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
 #, fuzzy
+msgid "http://www.gpg4win.org"
+msgstr "Voir http://www.gnupg.org pour des nouvelles"
+
+#: src/helpmenu.c:295
+#, fuzzy
 msgid "http://www.gnupg.org"
 msgstr "Voir http://www.gnupg.org pour des nouvelles"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
+#: src/helpmenu.c:378
+#, fuzzy
+msgid "GNU General Public License"
 msgstr "GNU general public license"
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "_GNU general public license"
+#: src/helpmenu.c:405
+#, fuzzy
+msgid "_GNU General Public License"
+msgstr "GNU general public license"
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "Montrer le texte d'aide\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 #, fuzzy
 msgid "/Help/_Contents"
 msgstr "/Aide/_Licence"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/Aide/_Licence"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/Aide/_A propos"
 
@@ -1918,6 +1926,12 @@
 msgid "Signatures:"
 msgstr "Signatures"
 
+#~ msgid "GNU general public license"
+#~ msgstr "GNU general public license"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "_GNU general public license"
+
 #~ msgid ">.\n"
 #~ msgstr ">.\n"
 

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/ja.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1-cvs\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
 "PO-Revision-Date: 2003-11-03 17:11+0100\n"
 "Last-Translator: TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>\n"
 "Language-Team: Japanese <gnupg-i18n at gnupg.org>\n"
@@ -58,191 +58,191 @@
 msgid "_expire on:"
 msgstr "Í­¸ú´ü¸Â¤Î»ØÄê (_E):"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "¥Õ¥¡¥¤¥ë¤Ï³«¤«¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/¥Õ¥¡¥¤¥ë (_F)"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/³«¤¯ (_O)"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 msgid "/File/C_lear"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/¥¯¥ê¥¢ (_L)"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/½ð̾¤¹¤ë (_S)"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 msgid "/File/_Verify"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/¸¡¾Ú (_V)"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/°Å¹æ²½ (_E)"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/Éü¹æ²½ (_D)"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/ÊĤ¸¤ë (_C)"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/½ªÎ» (_Q)"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "/ÊÔ½¸ (_E)"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/ÊÔ½¸ (E)/¤¹¤Ù¤ÆÁªÂò (_A)"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/ÊÔ½¸ (E)/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/ÊÔ½¸ (E)/ÀßÄê (_E)"
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/¥¦¥£¥ó¥É¥¦ (_W)"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¸°Â«¥¨¥Ç¥£¥¿ (_K)"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 msgid "/File/Sign"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/½ð̾¤¹¤ë (S)"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 msgid "/File/Verify"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/¸¡¾Ú (V)"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 msgid "/File/Encrypt"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/°Å¹æ²½ (E)"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 msgid "/File/Decrypt"
 msgstr "/¥Õ¥¡¥¤¥ë (F)/Éü¹æ²½ (D)"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "¥Õ¥¡¥¤¥ë³«¤¯"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "Close all files"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÊĤ¸¤ë"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "close files"
 msgstr "¥Õ¥¡¥¤¥ëÊĤ¸¤ë"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "½ð̾¤¹¤ë"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë½ð̾"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "¸¡¾Ú"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 msgid "Check signatures of selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¥Á¥§¥Ã¥¯"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 msgid "verify file"
 msgstr "¥Õ¥¡¥¤¥ë¸¡¾Ú"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "°Å¹æ²½"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 msgid "Decrypt"
 msgstr "Éü¹æ²½"
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤òÉü¹æ²½¤¹¤ë"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "¥Õ¥¡¥¤¥ëÉü¹æ²½"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "ÀßÄê¥À¥¤¥¢¥í¥°¤ò³«¤¯"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "ÀßÄê"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "GNU Privacy Assistant ¤Ë¤Ä¤¤¤ÆÍý²ò¤¹¤ë"
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "¥Ø¥ë¥×"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
 
@@ -448,7 +448,7 @@
 msgstr "ÇË´þºÑ¤ß¤Î¸°"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -617,12 +617,12 @@
 msgid "Can authenticate"
 msgstr "ǧ¾Ú²Äǽ"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 msgid "Revoked"
 msgstr "ÇË´þºÑ¤ß"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 msgid "Expired"
 msgstr "´ü¸ÂÀÚ¤ì"
 
@@ -634,7 +634,7 @@
 msgid "Unsigned"
 msgstr "½ð̾¤Ê¤·"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Í­¸ú"
 
@@ -760,7 +760,7 @@
 msgstr "RSA (½ð̾¤Î¤ß)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 msgid "Unknown"
 msgstr "̤³Îǧ"
 
@@ -800,66 +800,66 @@
 msgid "Enter Passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[̤³Îǧ¥æ¡¼¥¶ ID]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "ÉÔÀµ"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr "°ìÈÌ"
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr "¸Ä¿Í"
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr "¥«¥¸¥å¥¢¥ë"
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr "¥Ý¥¸¥Æ¥£¥ô"
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr "¾ÚÌÀ¡¢½ð̾¡¢°Å¹æ²½¤Ë»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "¾ÚÌÀ¤ª¤è¤Ó½ð̾¤Ë»È¤¨¤Þ¤¹¤¬¡¢°Å¹æ²½¤Ë¤Ï»È¤¨¤Ê¤¤¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 msgid "The key can be used for certification and encryption."
 msgstr "¾ÚÌÀ¤È°Å¹æ²½¤Ë»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 msgid "The key can be used only for certification."
 msgstr "¾ÚÌÀ¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "½ð̾¤ª¤è¤Ó°Å¹æ²½¤Ë»È¤¨¤Þ¤¹¤¬¡¢¾ÚÌÀ¤Ë¤Ï»È¤¨¤Ê¤¤¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 msgid "The key can be used only for signing."
 msgstr "½ð̾¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 msgid "The key can be used only for encryption."
 msgstr "°Å¹æ²½¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr "¤³¤Î¸°¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
@@ -880,7 +880,8 @@
 msgstr "Äó¶¡¼Ô:"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
+#, fuzzy
+msgid "GPA is Free Software under the"
 msgstr "GPA is free software under the"
 
 #: src/helpmenu.c:284
@@ -891,35 +892,42 @@
 msgid "For news see:"
 msgstr "ºÇ¿·¾ðÊó¤Ï¤³¤Á¤é:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
+#, fuzzy
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gnupg.org"
+
+#: src/helpmenu.c:295
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
-msgstr "GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ (GPL)"
+#: src/helpmenu.c:378
+#, fuzzy
+msgid "GNU General Public License"
+msgstr "GNU General Public License."
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "_GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ (GPL)"
+#: src/helpmenu.c:405
+#, fuzzy
+msgid "_GNU General Public License"
+msgstr "GNU General Public License."
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "¥Ø¥ë¥×¤ò¸«¤ë\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/¥Ø¥ë¥× (_H)"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 msgid "/Help/_Contents"
 msgstr "/¥Ø¥ë¥× (H)/ÆâÍÆ (_C)"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/¥Ø¥ë¥× (H)/¥é¥¤¥»¥ó¥¹ (_L)"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/¥Ø¥ë¥× (H)/GPA ¤Ë¤Ä¤¤¤Æ (_A)"
 
@@ -1785,6 +1793,12 @@
 msgid "Signatures:"
 msgstr "½ð̾:"
 
+#~ msgid "GNU general public license"
+#~ msgstr "GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ (GPL)"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "_GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ (GPL)"
+
 #~ msgid ">.\n"
 #~ msgstr "> ¤ËÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/nl.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.5.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
 "PO-Revision-Date: 2003-10-19 14:29+0200\n"
 "Last-Translator: Michael Anckaert <michael.anckaert at pi.be>\n"
 "Language-Team: DUTCH <nl at li.org>\n"
@@ -55,191 +55,191 @@
 msgid "_expire on:"
 msgstr "v_ervalt op"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "Open bestand"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "Het bestand is reeds geopend."
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/Bestand/_Openen"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 msgid "/File/C_lear"
 msgstr "/Bestand/_Leeg maken"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/Bestand/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/Bestand/_Ondertekenen"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 msgid "/File/_Verify"
 msgstr "/Bestand/_Ontsleutelen"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/Bestand/_Versleutelen"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/Bestand/_Ontsleutelen"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/Bestand/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/Bestand/_Sluiten"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/Bestand/_Stoppen"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "Bewerk"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/Bewerk/Selecteer _Alles"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/Bestand/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/Bewerk/Voork_euren..."
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/_Vensters"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/Vensters/_Bestandsbeheerder"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/Vensters/_Keyring Editor"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 msgid "/File/Sign"
 msgstr "/Bestand/_Ondertekenen"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 msgid "/File/Verify"
 msgstr "/Bestand/verifieren"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 msgid "/File/Encrypt"
 msgstr "/Bestand/_Versleutelen"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 msgid "/File/Decrypt"
 msgstr "/Bestand/_Ontsleutelen"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "Bestand openen"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "open bestand"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "Close all files"
 msgstr "Alle bestanden sluiten"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "close files"
 msgstr "sluit bestand"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "Onderteken het geselecteerde bestand"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "onderteken bestand"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "Verifieer"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 msgid "Check signatures of selected file"
 msgstr "Controleer ondertekeningen van het geselecteerde bestand"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 msgid "verify file"
 msgstr "verifieer bestand"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "Versleutel"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "Versleutel het geselecteerde bestand"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "versleutel bestand"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 msgid "Decrypt"
 msgstr " Ontsleutel "
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "Ontsleutel het geselecteerde bestand"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "ontsleutel bestand"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "Open de voorkeuren dialoog"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "voorkeuren"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "Help"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "De GNU Privacy Assistent verstaan"
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "help"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "Bestand"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Bestands beheerder"
 
@@ -445,7 +445,7 @@
 msgstr "Teruggetrokken sleutel"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -616,12 +616,12 @@
 msgid "Can authenticate"
 msgstr "Kan geauthenticeerd worden"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 msgid "Revoked"
 msgstr "Terugtrekken"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 msgid "Expired"
 msgstr "Vervallen"
 
@@ -633,7 +633,7 @@
 msgid "Unsigned"
 msgstr "Niet ondertekend"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Geldig"
 
@@ -758,7 +758,7 @@
 msgstr "DSA (alleen ondertekenen)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -798,56 +798,56 @@
 msgid "Enter Passphrase"
 msgstr "Wachtwoord ingeven"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Onbekende gebruiker ID]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Slecht"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr "Algemeen"
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr "Persoonlijk"
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr "Gewoon"
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr "Positief"
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "De sleutel kan gebruikt worden voor certificatie, onderteken en "
 "versleuteling."
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "De sleutel kan gebruikt worden voor certificatie en ondertekenen, maar niet "
 "voor versleuteling."
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 msgid "The key can be used for certification and encryption."
 msgstr "De sleutel kan gebruikt worden voor certificatie en versleuteling."
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 msgid "The key can be used only for certification."
 msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -855,15 +855,15 @@
 "De sleutel kan enkel gebruikt worden voor ondertekenen en encryptie, maar "
 "niet voor certificatie."
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 msgid "The key can be used only for signing."
 msgstr "De sleutel kan alleen gebruikt worden voor ondertekenen."
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 msgid "The key can be used only for encryption."
 msgstr "De sleutel kan alleen gebruikt worden voor versleuteling."
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr "Deze sleutel is waardeloos."
 
@@ -884,7 +884,8 @@
 msgstr "U gebracht door:"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
+#, fuzzy
+msgid "GPA is Free Software under the"
 msgstr "GPA is vrije software onder de"
 
 #: src/helpmenu.c:284
@@ -895,35 +896,42 @@
 msgid "For news see:"
 msgstr "Voor nieuws zie:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
+#, fuzzy
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gnupg.org"
+
+#: src/helpmenu.c:295
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
-msgstr "GNU general public licentie"
+#: src/helpmenu.c:378
+#, fuzzy
+msgid "GNU General Public License"
+msgstr "GNU General Public Licentie."
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "_GNU general public licentie"
+#: src/helpmenu.c:405
+#, fuzzy
+msgid "_GNU General Public License"
+msgstr "GNU General Public Licentie."
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "Toon help text\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 msgid "/Help/_Contents"
 msgstr "/Help/_Licentie"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/Help/_Licentie"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/Help/_Over GPA"
 
@@ -1799,6 +1807,12 @@
 msgid "Signatures:"
 msgstr "Ondertekeningen:"
 
+#~ msgid "GNU general public license"
+#~ msgstr "GNU general public licentie"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "_GNU general public licentie"
+
 #~ msgid ">.\n"
 #~ msgstr ">.\n"
 

Modified: trunk/po/pl.po
===================================================================
--- trunk/po/pl.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/pl.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
 "PO-Revision-Date: 2004-08-22 02:23+0200\n"
 "Last-Translator: Emilian Nowak <emil5 at go2.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -58,191 +58,191 @@
 msgid "_expire on:"
 msgstr "_wygasa dnia:"
 
-#: src/fileman.c:235
+#: src/fileman.c:345
 msgid "Open File"
 msgstr "Otwórz plik"
 
-#: src/fileman.c:240 src/fileman.c:745
+#: src/fileman.c:350 src/fileman.c:899
 msgid "The file is already open."
 msgstr "Ten plik jest już otwarty"
 
-#: src/fileman.c:466 src/keyring.c:844
+#: src/fileman.c:467 src/keyring.c:844
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/fileman.c:467
+#: src/fileman.c:468
 msgid "/File/_Open"
 msgstr "/Plik/_Otwórz"
 
-#: src/fileman.c:468
+#: src/fileman.c:469
 msgid "/File/C_lear"
 msgstr "/Plik/Wy_czyść"
 
-#: src/fileman.c:469
+#: src/fileman.c:470
 msgid "/File/sep1"
 msgstr "/Plik/sep1"
 
-#: src/fileman.c:470
+#: src/fileman.c:471
 msgid "/File/_Sign"
 msgstr "/Plik/_Podpisz"
 
-#: src/fileman.c:471
+#: src/fileman.c:472
 msgid "/File/_Verify"
 msgstr "/Plik/_Weryfikuj"
 
-#: src/fileman.c:472
+#: src/fileman.c:473
 msgid "/File/_Encrypt"
 msgstr "/Plik/_Zaszyfruj"
 
-#: src/fileman.c:473
+#: src/fileman.c:474
 msgid "/File/_Decrypt"
 msgstr "/Plik/O_dszyfruj"
 
-#: src/fileman.c:474
+#: src/fileman.c:475
 msgid "/File/sep2"
 msgstr "/Plik/sep2"
 
-#: src/fileman.c:475 src/keyring.c:845
+#: src/fileman.c:476 src/keyring.c:845
 msgid "/File/_Close"
 msgstr "/Plik/Z_amknij"
 
-#: src/fileman.c:476 src/keyring.c:847
+#: src/fileman.c:477 src/keyring.c:847
 msgid "/File/_Quit"
 msgstr "/Plik/Za_kończ"
 
-#: src/fileman.c:479 src/keyring.c:850
+#: src/fileman.c:480 src/keyring.c:850
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/fileman.c:480 src/keyring.c:856
+#: src/fileman.c:481 src/keyring.c:856
 msgid "/Edit/Select _All"
 msgstr "/Edycja/Wybierz _wszystko"
 
-#: src/fileman.c:481 src/keyring.c:857
+#: src/fileman.c:482 src/keyring.c:857
 msgid "/Edit/sep2"
 msgstr "/Edycja/sep2"
 
-#: src/fileman.c:482 src/keyring.c:858
+#: src/fileman.c:483 src/keyring.c:858
 msgid "/Edit/Pr_eferences..."
 msgstr "/Edycja/_Ustawienia..."
 
-#: src/fileman.c:486 src/keyring.c:885
+#: src/fileman.c:487 src/keyring.c:885
 msgid "/_Windows"
 msgstr "/_Okna"
 
-#: src/fileman.c:487 src/keyring.c:886
+#: src/fileman.c:488 src/keyring.c:886
 msgid "/Windows/_Filemanager"
 msgstr "/Okna/Menadżer _plików"
 
-#: src/fileman.c:488 src/keyring.c:887
+#: src/fileman.c:489 src/keyring.c:887
 msgid "/Windows/_Keyring Editor"
 msgstr "/Okna/Edytor zbioru _kluczy"
 
-#: src/fileman.c:507
+#: src/fileman.c:508
 msgid "/File/Sign"
 msgstr "/Plik/Podpisz"
 
-#: src/fileman.c:514
+#: src/fileman.c:513
 msgid "/File/Verify"
 msgstr "/Plik/Weryfikuj"
 
-#: src/fileman.c:521
+#: src/fileman.c:518
 msgid "/File/Encrypt"
 msgstr "/Plik/Zaszyfruj"
 
-#: src/fileman.c:528
+#: src/fileman.c:523
 msgid "/File/Decrypt"
 msgstr "/Plik/Odszyfruj"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: src/fileman.c:549
+#: src/fileman.c:594
 msgid "open file"
 msgstr "otwórz plik"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "Close all files"
 msgstr "Zamyka wszystkie pliki"
 
-#: src/fileman.c:553
+#: src/fileman.c:598
 msgid "close files"
 msgstr "zamknij pliki"
 
-#: src/fileman.c:559 src/keyring.c:1567
+#: src/fileman.c:604 src/keyring.c:1567
 msgid "Sign"
 msgstr "Podpisz"
 
-#: src/fileman.c:560
+#: src/fileman.c:605
 msgid "Sign the selected file"
 msgstr "Podpisuje wybrany pliki"
 
-#: src/fileman.c:560
+#: src/fileman.c:606
 msgid "sign file"
 msgstr "podpisz plik"
 
-#: src/fileman.c:569
+#: src/fileman.c:615
 msgid "Verify"
 msgstr "Weryfikuj"
 
-#: src/fileman.c:570
+#: src/fileman.c:616
 msgid "Check signatures of selected file"
 msgstr "Sprawdza podpis wybranego pliku"
 
-#: src/fileman.c:571
+#: src/fileman.c:617
 msgid "verify file"
 msgstr "weryfikuj plik"
 
-#: src/fileman.c:579
+#: src/fileman.c:626
 msgid "Encrypt"
 msgstr "Zaszyfruj"
 
-#: src/fileman.c:580
+#: src/fileman.c:627
 msgid "Encrypt the selected file"
 msgstr "Szyfruje wybrany plik"
 
-#: src/fileman.c:581
+#: src/fileman.c:628
 msgid "encrypt file"
 msgstr "zaszyfruj plik"
 
-#: src/fileman.c:589
+#: src/fileman.c:637
 msgid "Decrypt"
 msgstr "Odszyfruj"
 
-#: src/fileman.c:590
+#: src/fileman.c:638
 msgid "Decrypt the selected file"
 msgstr "Deszyfruje wybrany plik"
 
-#: src/fileman.c:591
+#: src/fileman.c:639
 msgid "decrypt file"
 msgstr "odszyfruj plik"
 
-#: src/fileman.c:605 src/keyring.c:1632
+#: src/fileman.c:654 src/keyring.c:1632
 msgid "Open the Preferences dialog"
 msgstr "Otwiera okno dialogowe z ustawieniami"
 
-#: src/fileman.c:606 src/keyring.c:1633
+#: src/fileman.c:655 src/keyring.c:1633
 msgid "preferences"
 msgstr "ustawienia"
 
-#: src/fileman.c:614 src/keyring.c:1656
+#: src/fileman.c:663 src/keyring.c:1656
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/fileman.c:615 src/keyring.c:1657
+#: src/fileman.c:664 src/keyring.c:1657
 msgid "Understanding the GNU Privacy Assistant"
 msgstr ""
 
-#: src/fileman.c:616 src/keyring.c:1658
+#: src/fileman.c:665 src/keyring.c:1658
 msgid "help"
 msgstr "pomoc"
 
-#: src/fileman.c:634
+#: src/fileman.c:764
 msgid "File"
 msgstr "Plik"
 
-#: src/fileman.c:687
+#: src/fileman.c:821
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Menedżer plików "
 
@@ -449,7 +449,7 @@
 msgstr "Unieważniony klucz"
 
 #: src/gpafileencryptop.c:360 src/gpafileencryptop.c:400 src/gpawizard.c:279
-#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:418
 #: src/keyeditdlg.c:150 src/keylist.c:512 src/settingsdlg.c:166
 #: src/verifydlg.c:117
 msgid "_Close"
@@ -622,12 +622,12 @@
 msgid "Can authenticate"
 msgstr "Można autoryzować"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:768
-#: src/gpgmetools.c:887
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:577 src/gpgmetools.c:785
+#: src/gpgmetools.c:904
 msgid "Revoked"
 msgstr "Unieważniony"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:883
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:579 src/gpgmetools.c:900
 msgid "Expired"
 msgstr "Po terminie ważności"
 
@@ -639,7 +639,7 @@
 msgid "Unsigned"
 msgstr "Brak podpisów"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:874 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:891 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Poprawny"
 
@@ -766,7 +766,7 @@
 msgstr "RSA (tylko do podpisywania)"
 
 #: src/gpgmetools.c:545 src/gpgmetools.c:568 src/gpgmetools.c:585
-#: src/gpgmetools.c:879 src/gpgmetools.c:912
+#: src/gpgmetools.c:896 src/gpgmetools.c:929
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -806,56 +806,56 @@
 msgid "Enter Passphrase"
 msgstr "Wprowadź hasło"
 
-#: src/gpgmetools.c:761
+#: src/gpgmetools.c:778
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:851 src/verifydlg.c:271
+#: src/gpgmetools.c:868 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Nieznany identyfikator użytkownika]"
 
-#: src/gpgmetools.c:877 src/verifydlg.c:219
+#: src/gpgmetools.c:894 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Zły"
 
-#: src/gpgmetools.c:900
+#: src/gpgmetools.c:917
 msgid "Generic"
 msgstr "Ogólne"
 
-#: src/gpgmetools.c:903
+#: src/gpgmetools.c:920
 msgid "Persona"
 msgstr "Nie sprawdzone"
 
-#: src/gpgmetools.c:906
+#: src/gpgmetools.c:923
 msgid "Casual"
 msgstr "Pobieżny"
 
-#: src/gpgmetools.c:909
+#: src/gpgmetools.c:926
 msgid "Positive"
 msgstr "Dokładne"
 
-#: src/gpgmetools.c:927
+#: src/gpgmetools.c:944
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "Ten klucz może być użyty do wydawania certyfikatów, podpisywania i "
 "szyfrowania."
 
-#: src/gpgmetools.c:930
+#: src/gpgmetools.c:947
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Ten klucz może być użyty do wydawania certyfikatów i podpisywania, ale nie "
 "nadaje siÄ™ do szyfrowania danych."
 
-#: src/gpgmetools.c:936
+#: src/gpgmetools.c:953
 msgid "The key can be used for certification and encryption."
 msgstr "Ten klucz może być użyty do wydawania certyfikatów i szyfrowania."
 
-#: src/gpgmetools.c:939
+#: src/gpgmetools.c:956
 msgid "The key can be used only for certification."
 msgstr "Ten klucz może być użyty tylko do certyfikatów."
 
-#: src/gpgmetools.c:947
+#: src/gpgmetools.c:964
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -863,15 +863,15 @@
 "Ten klucz może być użyty do podpisywania i szyfrowania, ale nie nadaję się "
 "do wydawania certyfikatów."
 
-#: src/gpgmetools.c:950
+#: src/gpgmetools.c:967
 msgid "The key can be used only for signing."
 msgstr "Ten klucz może być użyty tylko do podpisywania."
 
-#: src/gpgmetools.c:955
+#: src/gpgmetools.c:972
 msgid "The key can be used only for encryption."
 msgstr "Ten klucz może być użyty tylko do szyfrowania."
 
-#: src/gpgmetools.c:958
+#: src/gpgmetools.c:975
 msgid "This key is useless."
 msgstr "Ten klucz jest bezużyteczny."
 
@@ -892,7 +892,8 @@
 msgstr "Używasz tego programu dzięki:"
 
 #: src/helpmenu.c:280
-msgid "GPA is free software under the"
+#, fuzzy
+msgid "GPA is Free Software under the"
 msgstr "GPA jest programem rozprowadzanym na"
 
 #: src/helpmenu.c:284
@@ -903,35 +904,42 @@
 msgid "For news see:"
 msgstr "Aktualne wiadomości znajdują się na:"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:293
+#, fuzzy
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gnupg.org"
+
+#: src/helpmenu.c:295
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:374
-msgid "GNU general public license"
-msgstr "Powszechna Licencja Publiczna GNU"
+#: src/helpmenu.c:378
+#, fuzzy
+msgid "GNU General Public License"
+msgstr "Powszechniej Licencji Publicznej GNU."
 
-#: src/helpmenu.c:401
-msgid "_GNU general public license"
-msgstr "Powszechna Licencja Publiczna _GNU"
+#: src/helpmenu.c:405
+#, fuzzy
+msgid "_GNU General Public License"
+msgstr "Powszechniej Licencji Publicznej GNU."
 
-#: src/helpmenu.c:428
+#: src/helpmenu.c:432
 msgid "Show Help Text\n"
 msgstr "Pokaż tekst pomocy\n"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:440
 msgid "/_Help"
 msgstr "/_Pomoc"
 
-#: src/helpmenu.c:438
+#: src/helpmenu.c:442
 msgid "/Help/_Contents"
 msgstr "/Pomoc/_Zawartość"
 
-#: src/helpmenu.c:441
+#: src/helpmenu.c:445
 msgid "/Help/_License"
 msgstr "/Pomoc/_Licencja"
 
-#: src/helpmenu.c:442
+#: src/helpmenu.c:446
 msgid "/Help/_About"
 msgstr "/Pomoc/O _programie"
 
@@ -1815,6 +1823,12 @@
 msgid "Signatures:"
 msgstr "Podpisy:"
 
+#~ msgid "GNU general public license"
+#~ msgstr "Powszechna Licencja Publiczna GNU"
+
+#~ msgid "_GNU general public license"
+#~ msgstr "Powszechna Licencja Publiczna _GNU"
+
 #~ msgid ">.\n"
 #~ msgstr ">.\n"
 

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2007-05-18 19:38:42 UTC (rev 776)
+++ trunk/po/pt_BR.po	2007-05-24 13:15:53 UTC (rev 777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2007-04-25 15:07+0200\n"
+"POT-Creation-Date: 2007-05-24 14:59+0200\n"
 "PO-Revision-Date: 2003-01-20 18:39+0100\n"
 "Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
 "Language-Team: PORTUGUES <