[Pkg-gnupg-commit] [gpa] 01/04: New upstream version 0.9.10
Andreas Rönnquist
gusnan at moszumanska.debian.org
Wed Nov 23 16:19:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
gusnan pushed a commit to branch master
in repository gpa.
commit db9f97c67b4dab02605b4054e244c14f37bdc22e
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date: Mon Nov 21 18:15:29 2016 +0100
New upstream version 0.9.10
---
ChangeLog | 88 +++
Makefile.in | 2 +
NEWS | 18 +
README | 2 +-
VERSION | 2 +-
aclocal.m4 | 291 ++++++++-
configure | 250 +++++++-
configure.ac | 2 +-
doc/Makefile.in | 2 +
m4/Makefile.in | 2 +
pixmaps/Makefile.in | 2 +
po/LINGUAS | 2 +-
po/ar.gmo | Bin 28799 -> 28517 bytes
po/ar.po | 457 +++++++-------
po/cs.gmo | Bin 57442 -> 56066 bytes
po/cs.po | 450 +++++++-------
po/de.gmo | Bin 53960 -> 53966 bytes
po/de.po | 456 +++++++-------
po/es.gmo | Bin 25078 -> 24769 bytes
po/es.po | 463 +++++++-------
po/fr.gmo | Bin 34104 -> 33790 bytes
po/fr.po | 461 +++++++-------
po/gpa.pot | 444 ++++++-------
po/ja.gmo | Bin 18065 -> 18065 bytes
po/ja.po | 455 +++++++-------
po/nl.gmo | Bin 19563 -> 19563 bytes
po/nl.po | 455 +++++++-------
po/pl.gmo | Bin 20078 -> 20078 bytes
po/pl.po | 455 +++++++-------
po/pt_BR.gmo | Bin 16635 -> 16635 bytes
po/pt_BR.po | 457 +++++++-------
po/ru.gmo | Bin 30300 -> 36014 bytes
po/ru.po | 553 +++++++++--------
po/sv.gmo | Bin 35693 -> 35435 bytes
po/sv.po | 458 +++++++-------
po/tr.gmo | Bin 19484 -> 19484 bytes
po/tr.po | 455 +++++++-------
po/zh_CN.gmo | Bin 0 -> 41472 bytes
po/{gpa.pot => zh_CN.po} | 1540 +++++++++++++++++++++++++---------------------
po/zh_TW.gmo | Bin 15677 -> 15677 bytes
po/zh_TW.po | 455 +++++++-------
src/Makefile.am | 1 +
src/Makefile.in | 153 ++---
src/cm-openpgp.c | 4 +-
src/convert.c | 31 +-
src/convert.h | 3 +-
src/fileman.c | 7 +-
src/gpa-key-details.c | 85 ++-
src/gpa-marshal.c | 6 +-
src/gpa-tofu-list.c | 266 ++++++++
src/gpa-tofu-list.h | 31 +
src/gpa.c | 2 +-
src/gpa.h | 4 +
src/gpafiledecryptop.c | 12 +-
src/gpafileencryptop.c | 11 +-
src/gpafilesignop.c | 10 +-
src/gpakeydeleteop.c | 25 +-
src/gpakeyselector.c | 61 +-
src/gpasubkeylist.c | 2 +
src/gpgmeedit.c | 34 +-
src/gpgmetools.c | 89 ++-
src/gpgmetools.h | 18 +-
src/helpmenu.c | 2 +-
src/keylist.c | 22 +-
src/keymanager.c | 3 +
65 files changed, 5461 insertions(+), 4098 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 220be9b..6d797b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,93 @@
+2016-11-19 Werner Koch <wk at gnupg.org>
+
+ Release 0.9.10.
+
+ po: Auto update.
+
+ po: Update German translation.
+
+ po: Add zh_CN translation.
+
+2016-11-19 Andreas Rönnquist <gusnan at gusnan.se>
+
+ Fix some minor problems in original English strings.
+
+2016-11-05 Werner Koch <wk at gnupg.org>
+
+ Fix make distcheck broken by last commit.
+
+ Add new tab to the key details with TOFU information.
+ * src/gpa-tofu-list.c: New.
+ * src/gpa-tofu-list.h: New.
+ * src/Makefile.am (gpa_SOURCES): Add new files.
+ * src/gpa.h (ENABLE_TOFU_INFO): Define depending on GPGME version.
+ * src/keymanager.c (key_manager_selection_changed): List with tofu
+ info.
+ * src/convert.c (gpa_expiry_date_string): Factor code out to ...
+ (gpa_date_string): new.
+ * src/gpa-key-details.c: Include gpa-tofu-list.h.
+ (struct _GpaKeyDetails): Add fields tofu_list and tofu_page.
+ (gpa_key_details_finalize): Release tofu objects.
+ (build_tofu_page): New.
+ (ui_mode_changed): Call that.
+ (gpa_key_details_update): Add TOFU notebook page.
+
+ * src/gpa-key-details.c (details_page_fill_key): Move KeyID after the
+ fingerprint.
+
+2016-09-16 Werner Koch <wk at gnupg.org>
+
+ Remove the keyid column from two lists.
+ * src/keylist.c (GPA_KEYLIST_COLUMN_KEYID): Remove.
+ (gpa_keylist_init): Remove corresponding entry.
+ (gpa_keylist_next): Remove keyid setting.
+ (search_keylist_function): Remove keyid searching.
+ (setup_columns): Don't fill keyid column.
+ * src/gpakeyselector.c: Include gtktools.h and convert.h.
+ (GPA_KEY_SELECTOR_COLUMN_KEYID): Renamed to
+ GPA_KEY_SELECTOR_COLUMN_CREATED.
+ (gpa_key_selector_init): Show Creation date instead of Keyid.
+
+2016-07-18 Justus Winter <justus at g10code.com>
+
+ Fix drag-and-drop.
+ * src/fileman.c (dnd_drop_handler): Instead of hard-coding the
+ position of the expected target (which may crash if the list is
+ shorter), look for the expected target in the list supplied by the
+ source window.
+
+ GnuPG-bug-id: 2413
+
+2016-05-20 Werner Koch <wk at gnupg.org>
+
+ Make the gpgme edito FSM more robust.
+ * src/gpgmeedit.c (edit_fnc): Whitelist instead of blacklisting needed
+ status codes.
+
+2015-11-03 Neal H. Walfield <neal at gnu.org>
+
+ Provide an option to choose an alternate name for files that exist.
+ * src/gpgmetools.c (check_overwriting): Change return type from a
+ boolean to a char *. If the file exists, offer the user the option to
+ select a different file. Return the file that is actually used.
+ (gpa_fopen): Take an additional parameter, FILENAME_USED. Save the
+ filename returned by check_overwriting there. Update users.
+ (gpa_open_output): Likewise.
+
+2015-09-11 Werner Koch <wk at gnupg.org>
+
+ Fix segv when if build against gpgme 1.6.1.
+ * src/gpasubkeylist.c (gpa_subkey_list_new): Remove one STRING column
+ for gpgme >= 1.6.1.
+
+ Allow deletion of X.509 keys.
+ * src/gpakeydeleteop.c (gpa_key_delete_operation_start): Set the
+ protocol before calling the delete function.
+
2015-09-09 Werner Koch <wk at gnupg.org>
+ Post release updates.
+
Release 0.9.9.
Fix build problem for gpgme < 1.6.1.
diff --git a/Makefile.in b/Makefile.in
index b1838f1..4da7857 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,6 +332,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/NEWS b/NEWS
index 34a328a..06a6d7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Noteworthy changes in version 0.9.10 (2016-11-19)
+-------------------------------------------------
+
+ * Addded basic support for TOFU information.
+
+ * Removed key-ID from some listings in favor of using the
+ fingerprint.
+
+ * Fixed deletion of X.509 keys.
+
+ * Allow for saving to an alternate file name if the file already
+ exists.
+
+ * Fixed several problems with key edit functions.
+
+ * Fixed drag-and-drop.
+
+
Noteworthy changes in version 0.9.9 (2015-09-09)
------------------------------------------------
diff --git a/README b/README
index bbd660b..bf6bbf9 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ files, to verify signatures and to manage the private and public keys.
Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
Copyright (C) 2002-2004 Miguel Coca.
-Copyright (C) 2005-2014 g10 Code GmbH
+Copyright (C) 2005-2016 g10 Code GmbH
GPA uses fragments from the following programs and libraries:
JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
diff --git a/VERSION b/VERSION
index 7e310ba..56f3151 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.9
+0.9.10
diff --git a/aclocal.m4 b/aclocal.m4
index 501ff62..fb848ff 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -46,19 +46,8 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
no_gtk=""
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
- :
- else
- echo "*** pkg-config too old; version 0.7 or better required."
- no_gtk=yes
- PKG_CONFIG=no
- fi
- else
- no_gtk=yes
- fi
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ PKG_PROG_PKG_CONFIG([0.7])
min_gtk_version=ifelse([$1], ,2.0.0,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
@@ -274,6 +263,282 @@ AC_DEFUN([gt_INTL_MACOSX],
AC_SUBST([INTL_MACOSX_LIBS])
])
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
diff --git a/configure b/configure
index 15c7e72..d2732b9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gpa 0.9.9.
+# Generated by GNU Autoconf 2.69 for gpa 0.9.10.
#
# Report bugs to <https://bugs.gnupg.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gpa'
PACKAGE_TARNAME='gpa'
-PACKAGE_VERSION='0.9.9'
-PACKAGE_STRING='gpa 0.9.9'
+PACKAGE_VERSION='0.9.10'
+PACKAGE_STRING='gpa 0.9.10'
PACKAGE_BUGREPORT='https://bugs.gnupg.org'
PACKAGE_URL=''
@@ -640,6 +640,8 @@ GPG_ERROR_CFLAGS
GPG_ERROR_CONFIG
GTK_LIBS
GTK_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
POSUB
LTLIBINTL
@@ -796,7 +798,10 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
-CPP'
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR'
# Initialize some variables set by options.
@@ -1337,7 +1342,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gpa 0.9.9 to adapt to many kinds of systems.
+\`configure' configures gpa 0.9.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1407,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gpa 0.9.9:";;
+ short | recursive ) echo "Configuration of gpa 0.9.10:";;
esac
cat <<\_ACEOF
@@ -1458,6 +1463,11 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1525,7 +1535,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gpa configure 0.9.9
+gpa configure 0.9.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1894,7 +1904,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gpa $as_me 0.9.9, which was
+It was created by gpa $as_me 0.9.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2768,7 +2778,7 @@ fi
# Define the identity of the package.
PACKAGE='gpa'
- VERSION='0.9.9'
+ VERSION='0.9.10'
cat >>confdefs.h <<_ACEOF
@@ -2891,7 +2901,7 @@ have_libassuan=no
#
# Provide information about the build.
#
-BUILD_REVISION="d4756cd"
+BUILD_REVISION="9d0c65f"
cat >>confdefs.h <<_ACEOF
@@ -2900,7 +2910,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}54389"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}40204"
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
@@ -7949,6 +7959,126 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+fi
# Check whether --enable-gtktest was given.
if test "${enable_gtktest+set}" = set; then :
enableval=$enable_gtktest;
@@ -7969,8 +8099,18 @@ fi
no_gtk=""
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PKG_CONFIG+:} false; then :
@@ -7996,7 +8136,6 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
@@ -8010,18 +8149,77 @@ $as_echo "no" >&6; }
fi
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
- :
- else
- echo "*** pkg-config too old; version 0.7 or better required."
- no_gtk=yes
- PKG_CONFIG=no
- fi
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
else
- no_gtk=yes
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.7
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+fi
min_gtk_version=2.10.0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
@@ -9911,7 +10109,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gpa $as_me 0.9.9, which was
+This file was extended by gpa $as_me 0.9.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9977,7 +10175,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gpa config.status 0.9.9
+gpa config.status 0.9.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -10966,6 +11164,6 @@ fi
echo "
GPA v${VERSION} has been configured as follows:
- Revision: d4756cd (54389)
+ Revision: 9d0c65f (40204)
Platform: $host
"
diff --git a/configure.ac b/configure.ac
index 7efcc39..ca7c0a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.10"
# (git tag -s gpa-1.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [0.9.9])
+m4_define([mym4_version], [0.9.10])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a3b6e78..fdd3c76 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -220,6 +220,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index df7ef8e..1ff4ef9 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -189,6 +189,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index 2b3b7a5..2efd357 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -210,6 +210,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
diff --git a/po/LINGUAS b/po/LINGUAS
index c4d3536..6d2cbc5 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
# Set of available languages.
-de cs fr zh_TW pt_BR ja nl es sv pl ru tr ar
+de cs fr zh_TW zh_CN pt_BR ja nl es sv pl ru tr ar
diff --git a/po/ar.gmo b/po/ar.gmo
index 150f575..21b4366 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 5ca57f8..077f70e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2011-12-12 10:14+0100\n"
"Last-Translator: \n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -42,13 +42,13 @@ msgstr "احفظ باسم..."
msgid "Clipboard"
msgstr "الحافظة"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_ملف"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -91,7 +91,7 @@ msgstr "يظهِّر النصّ المحدد"
msgid "Close the buffer"
msgstr "يخلي البراح"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -109,11 +109,11 @@ msgstr ""
msgid "Cut the selection"
msgstr "يقص المحدد إلى الحافظة"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "ينسخ المحدد"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "يلصق ما في الحافظة"
@@ -130,11 +130,11 @@ msgstr ""
msgid "Keyring"
msgstr "حلقة مفاتيح"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "ملفات"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "الحافظة"
@@ -212,13 +212,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_نعم"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_لا"
@@ -243,23 +243,23 @@ msgstr "أشهر"
msgid "years"
msgstr "سنين"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "لا تنتهي أبدا"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "مجهول"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "مجهول"
@@ -292,7 +292,7 @@ msgstr "من فضلك أدخل تاريخا صحيحا."
msgid "Change expiry date"
msgstr "غيّر تاريخ انتهاء الصلاحية"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "أ_لغِ"
@@ -333,15 +333,15 @@ msgstr ""
msgid "Select all files"
msgstr "أغلق كل الملفات"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "ملف"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "مدير الملفات"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "الملفّ مفتوح بالفعل."
@@ -387,7 +387,7 @@ msgstr "افتح محرر حلقة المفاتيح (البدئي)"
msgid "Open file manager"
msgstr "افتح مدير الملفات"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "يفتح مدير الملفات"
@@ -430,34 +430,34 @@ msgstr "واجهة رسومية لأجل GnuPG"
msgid "Please report bugs to <"
msgstr "من فضلك أبلغ عن العلات في <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_نوافذ"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "يفتح محرر حلقة المفاتيح"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "يفتح مدير الملفات"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "يفتح الحافظة"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "يقص المحدد إلى الحافظة"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/تحرير/تفضيلات ال_خلفية..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -540,28 +540,28 @@ msgstr "أُرسلت المفاتيح إلى الخادوم."
msgid "Decrypting..."
msgstr "يجري التَّظهير..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "لا يحتوي \"%s\" على بيانات OpenPGP."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "لا يحتوي الملفّ \"%s\" على بيانات OpenPGP."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "لا يحوي \"%s\" بيانات معماة صالحة."
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "لا يحوي الملفّ \"%s\" بيانات معماة صالحة."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "عبارة السر خطأ."
@@ -570,45 +570,45 @@ msgstr "عبارة السر خطأ."
msgid "Encrypting..."
msgstr "تجري التعمية..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "مفتاح مجهول"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "ستقوم بتعمية وثيقة مستخدما المفتاح التالي:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "إلا أنه من غير المؤكد أن هذا المفتاح يخص ذاك الشخص."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "أتريد <b>حقا</b> استخدام هذا المفتاح؟"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "مفتاح منقوض"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "أ_غلق"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "نُقض هذا المفتاح من قِبِل مالكه:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "ولا يمكن استخدامه للتعمية."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "انتهت صلاحية هذا المفتاح في %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -616,7 +616,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "لم تحدد مفتاحا للتوقيع"
@@ -657,7 +657,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "لم توجد مفاتيح."
@@ -669,12 +669,17 @@ msgstr ""
"أُدخلت وقتا غير صحيح.\n"
"(لا يمكن أن يكون تاريخ انتهاء الصلاحية في الماضي.)"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "معرِّف المفتاح"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "أُنشئ في:"
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:92 src/keylist.c:623
+#, fuzzy
+msgid "The Creation Date is the date the certificate was created."
+msgstr "تاريخ الانتهاء هو التاريخ الذي تنتهي عنده صلاحية الشهادة."
+
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "اسم المستخدم"
@@ -742,103 +747,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "يجري التحقق..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "مُعرِّف المفتاح الفرعي"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "الحالة"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "الخوارزمية"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "الطول"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "أُنشئ في:"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "منتهية صلاحيته"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "يمكن التوقيع به"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "يمكن الشهادة به"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "يمكن التعمية به"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "يمكن الاستيثاق به"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "منقوض"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "منتهية صلاحيته"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "معطل"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "غير موقّع"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "صالح"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "اسم المستخدم:"
@@ -847,12 +847,12 @@ msgstr "اسم المستخدم:"
msgid "User Names:"
msgstr "أسماء المستخدم:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "معرِّف المفتاح:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "البصمة:"
@@ -925,7 +925,7 @@ msgstr ""
"في الأغلب هذه علّة في GPA.\n"
"سيُحاول GPA التعافي من هذا العطل."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -934,7 +934,16 @@ msgstr ""
"الملفّ %s موجود بالفعل.\n"
"أتريد استبداله؟"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/ملف/_افتح"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -948,7 +957,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -956,205 +965,205 @@ msgstr ""
"المفتاح المحفوظ احتياطيا في هذا الملف هو:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "مجهول"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "أبدًا"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "هامشية"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "كاملة"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "مطلقة"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "ناقص"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "صالح تماما"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "من فضلك أدخل عبارة سر المفتاح التالي:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "عبارة سر خاطئة؛ أعِد المحاولة:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "أدخل عبارة السر"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[لاشيء]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[هوية مستخدم مجهولة]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "سيئ"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "عام"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "شخصي"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "عادي"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "إيجابي"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "كل التوقيعات"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "كل التوقيعات"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "التوقيع: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr "يمكن استخدام المفتاح في الشهادة و التوقيع و التعمية."
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr "يمكن استخدام المفتاح في الشهادة و التوقيع لكن ليس في التعمية."
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "يمكن استخدام المفتاح في الشهادة و التعمية."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "يمكن استخدام المفتاح في الشهادة فقط."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
msgstr "يمكن استخدام المفتاح في التوقيع و التعمية لكن ليس في الشهادة."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "يمكن استخدام المفتاح في التوقيع فقط."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "يمكن استخدام المفتاح في التعمية فقط."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "لا فائدة لهذا المفتاح."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1171,36 +1180,36 @@ msgstr ""
"استُورِدت %i مفاتيح سرّية\n"
"لم تتغير %i مفاتيح سرّية"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
#, fuzzy
msgid "You must enter a name."
msgstr "يجب أن تُدخِل هوية مُستخدم."
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1332,7 +1341,7 @@ msgstr "حرر المفتاح"
msgid "Change _passphrase"
msgstr "غيّر _عبارة السر"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "تاريخ الانتهاء"
@@ -1461,7 +1470,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "خُذ _نسخة احتياطية"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "_لاحقا"
@@ -1487,7 +1496,7 @@ msgstr ""
"\n"
"تم توليد مفتاحك بنجاح. المفتاح صالح بلا أمد محدد وطوله 1024 بتّة."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1495,30 +1504,21 @@ msgstr ""
"يُعيد GnuPG بناء قاعدة بيانات الثقة.\n"
"قد يستغرق هذا بضع دقائق."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr "مُعرّف المفتاح هو رقم صغير لتعريف الشهادة."
-
-#: src/keylist.c:641
-#, fuzzy
-msgid "The Creation Date is the date the certificate was created."
-msgstr "تاريخ الانتهاء هو التاريخ الذي تنتهي عنده صلاحية الشهادة."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr "تاريخ الانتهاء هو التاريخ الذي تنتهي عنده صلاحية الشهادة."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "الثقة في المالك"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
@@ -1527,11 +1527,11 @@ msgstr ""
"لقد وُضِعت الثقة في المالك من قِبلك وتوضّح إلى أي مدى تثق في حامل الشهادة ليوقّع "
"(يُجيز) الشهادات الأخرى. لهذا معنى بالنسبة إلى OpenGPG فقط."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "الصلاحية"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1539,7 +1539,7 @@ msgstr ""
"تصف الصلاحية مستوى ثقة النظام في هذه الشهادة. هذا هو مدى الثقة في أن "
"المستخدم المذكور هو من يكون."
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1549,17 +1549,17 @@ msgstr "اسم المستخدم هو اسم وفي أحان كثيرة عنوا
msgid "No keys selected for signing."
msgstr "لم تُحدد أي مفاتيح للتعمية."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
msgstr "ليس لديك مفتاح سري. أتريد توليد واحد الآن (محبذ) أم القيام بهذا لاحقا؟"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_ولِّد المفتاح الآن"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1567,197 +1567,197 @@ msgstr ""
"لم تتخذ نسخة احتياطية من مفتاحك السري بعد. أتريد أخذ نسخة احتياطية الآن "
"(محبذ) أم القيام بهذا لاحقا؟"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "ا_حفظ المفتاح احتياطيا الآن"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/ال_مفاتيح"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/ال_خادوم"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "ينعش حلقة المفاتيح"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/المفاتيح/مفتاح _جديد"
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "ولّد مفتاحا"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/ا_حذف المفاتيح..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "احذف المفتاح المحدد"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/و_قّع المفاتيح..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "وقّع المفتاح المحدد"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/حدّد ال_ثقة في المالك..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "احذف المفتاح المحدد"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/حرّ_ر المفتاح السرّي..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "حرّر المفتاح السري المحدد"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "استورِد المفاتيح"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "استورِد المفاتيح"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/_صدّر المفاتيح..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "صدّر المفاتيح"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/احفظ ا_حتياطيا..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "ا_حفظ المفتاح احتياطيا الآن"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/الخادوم/المفاتيح ال_سرّية..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "أنعش حلقة المفاتيح"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "/أر_سِل المفاتيح للخادوم..."
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/و_قّع المفاتيح..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "/أر_سِل المفاتيح للخادوم..."
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "يعرض قائمة مفاتيح موجزة"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "يعرض تفاصيل المفاتيح"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "حرّر"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
#, fuzzy
msgid "Delete"
msgstr "/تحرير/احذف"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "وقّع"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "صدّر"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "استورد"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "المفتاح المحدد بدئيا:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "لم يحدد أي مفتاح بدئيا في التفضيلات."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "مدير الملفات"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "للمفتاح جزءان؛ سرّي وعلني"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "للمفتاح جزءان؛ سرّي وعلني"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "لهذا المفتاح جزء علني فقط"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u بتّة"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "لم تُحدد أي مفاتيح"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
@@ -1768,63 +1768,67 @@ msgstr[3] "حُدِّدت %d مفاتيح"
msgstr[4] "حُدِّد %d مفتاحًا"
msgstr[5] "حُدِّد %d مفتاح"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "اسم المستخدم:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "ينتهي في:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "الثقة في المالك:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "صلاحية المفتاح:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "نوع المفتاح:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "أُنشئ في:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "التفاصيل"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "اعرض التوقيعات على اسم المستخدم:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "يمكن التوقيع به"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "التوقيعات"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "كل التوقيعات"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "المفاتيح الفرعية"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/ال_مفاتيح"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "وقّع المفتاح"
@@ -2008,6 +2012,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "معرِّف المفتاح"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2526,7 +2535,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2547,7 +2556,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2836,6 +2845,9 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "مُعرّف المفتاح هو رقم صغير لتعريف الشهادة."
+
#, fuzzy
#~ msgid "Error"
#~ msgstr "عطل في GPA"
@@ -2912,9 +2924,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/ملف/ا_مسح"
-#~ msgid "/File/_Open"
-#~ msgstr "/ملف/_افتح"
-
#~ msgid "/File/Save _As"
#~ msgstr "/ملف/احفظ _باسم"
diff --git a/po/cs.gmo b/po/cs.gmo
index 8c17a21..6aff4ad 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 0493f1c..dcf8067 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2014-09-11 09:17+0100\n"
"Last-Translator: Zdeněk Hataš <zdenek.hatas at gmail.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -41,12 +41,12 @@ msgstr "Uložit jako..."
msgid "Clipboard"
msgstr "Schránka"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
msgid "_File"
msgstr "_Soubor"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
msgid "_Edit"
msgstr "Úpr_avy"
@@ -83,7 +83,7 @@ msgstr "Dešifrovat text v mezipaměti"
msgid "Close the buffer"
msgstr "Uzavřít mezipaměť"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr "Ukončit program"
@@ -100,11 +100,11 @@ msgstr "Opakovat poslední vrácenou akci"
msgid "Cut the selection"
msgstr "Vyjmout výběr"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "Kopírovat výběr"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "Vložit ze schránky"
@@ -120,11 +120,11 @@ msgstr "Vybrat celý dokument"
msgid "Keyring"
msgstr "Klíčenka"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Soubory"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr "Karta"
@@ -202,13 +202,13 @@ msgid "Configure backend to use a keyserver?"
msgstr "Nastavit programy backednu"
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Ano"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Ne"
@@ -234,23 +234,23 @@ msgstr "měsíce"
msgid "years"
msgstr "roky"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "nikdy nevyprší"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "neznámá"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr "Pan"
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr "Paní"
-#: src/convert.c:129
+#: src/convert.c:142
msgid "(unknown)"
msgstr "(neznámý)"
@@ -282,7 +282,7 @@ msgstr "Zadejte prosím platné datum."
msgid "Change expiry date"
msgstr "Změnit datum expirace"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Zrušit"
@@ -322,15 +322,15 @@ msgstr "Zavřít okno"
msgid "Select all files"
msgstr "Vybrat všechny soubory"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Soubor"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "Správce souborů"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Soubor je již otevřený"
@@ -370,7 +370,7 @@ msgstr "Otevřít správce klíčů (výchozí)"
msgid "Open file manager"
msgstr "Otevřít správce souborů"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
msgid "Open the card manager"
msgstr "Otevřít správce karet"
@@ -410,31 +410,31 @@ msgstr "Grafické rozhraní pro GnuPG"
msgid "Please report bugs to <"
msgstr "Nahlaste prosím chybu <"
-#: src/gpa.h:80
+#: src/gpa.h:84
msgid "_Windows"
msgstr "_Okna"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "Otevřít správce klíčenky"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "Otevřít správce souborů"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "Otevřít schránku"
-#: src/gpa.h:105
+#: src/gpa.h:109
msgid "Configure the application"
msgstr "Nastavit aplikaci"
-#: src/gpa.h:108
+#: src/gpa.h:112
msgid "_Backend Preferences"
msgstr "Na_stavení backendu"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr "Nastavit programy backednu"
@@ -517,28 +517,28 @@ msgstr "Klíče byly odeslány na server."
msgid "Decrypting..."
msgstr "Dešifruji...."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "\"%s\" neobsahoval OpenPGP data."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Soubor \"%s\" neobsahoval OpenPGP data."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "\"%s\" neobsahoval platná šifrovaná data."
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "Soubor \"%s\" neobsahoval platná šifrovaná data."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Neplatné heslo!"
@@ -547,45 +547,45 @@ msgstr "Neplatné heslo!"
msgid "Encrypting..."
msgstr "Šifruji ..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Neznámý klíč"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "Hodláte zašifrovat dokument následujícím klíčem:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Nicméně není jisté, že klíč patří této osobě."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "<b>Určitě</b> chcete použít tento klíč?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Zneplatněný klíč"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Zavřít"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "Následující klíč byl zneplatněn vlastníkem:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "A nemůže být použit pro šifrování."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "Následujícímu klíči vypršela platnost %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -595,7 +595,7 @@ msgstr ""
"Vybrané certifikáty nejsou stejného typu. To znamená, že mícháte certifikáty "
"OpenPGP a X.509. Ujistěte se prosím, že volíte certifikáty stejného typu."
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Nevybrali jste žádný klíč pro podpis"
@@ -636,7 +636,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Nebyly nalezeny žádné klíče."
@@ -646,12 +646,15 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr "Neplatný čas.(nemůžete nastavit čas vypršení do minulosti.)"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "ID klíče"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+msgid "Created"
+msgstr "Vytvořen"
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr "Datum vytvoření je datum, kdy byl certifikát vytvořen."
+
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Jméno uživatele"
@@ -713,100 +716,96 @@ msgstr "Zprava je podepisována"
msgid "Verifying message ..."
msgstr "Zpráva je ověřována..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "ID podklíče"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Stav"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
msgid "Algo"
msgstr "Algoritmus"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Velikost"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-msgid "Created"
-msgstr "Vytvořen"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
msgid "Expires"
msgstr "Vyprší platnost"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr "P"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Smí podepisovat"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr "C"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Smí certifikovat"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr "Š"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Smí šifrovat"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr "A"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Smí autentizovat"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr "K"
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr "Soukromý klíč byl uložen na kartě."
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr "SČ karty"
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr "Výrobní číslo čipové karty."
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Zneplatněn"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Vypršela platnost"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Deaktivovaný"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Nepodepsaný"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Platný"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Jméno uživatele:"
@@ -815,12 +814,12 @@ msgstr "Jméno uživatele:"
msgid "User Names:"
msgstr "Jména uživatelů:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "ID klíče:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Otisk:"
@@ -896,7 +895,7 @@ msgstr ""
"Toto je zřejmě problém v instalaci nebo chyba v %s.\n"
"%s se pokusí obnovit z chybového stavu."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -905,7 +904,15 @@ msgstr ""
"Soubor %s již existuje.\n"
"Chcete jej přepsat?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+msgid "_Open"
+msgstr ""
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -922,7 +929,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -930,181 +937,181 @@ msgstr ""
"V souboru je zálohován tento klíč:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Neznámá"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Žádná"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Částečná"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Plná"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Absolutní"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Nekompletní"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Platný"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Zadejte prosím heslo pro následující klíč:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Špatné heslo, zkuste to prosím znovu:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Zadat heslo"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[Žádný]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Neznámé ID uživatele]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Špatný"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Obecný"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Persona"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Přibližný"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Pozitivní"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, c-format
msgid "Bad signature by %s: %s"
msgstr "Neplatný podpis od %s: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, c-format
msgid "Bad signature by %s"
msgstr "Neplatný podpis od %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr "Neplatný podpis neznámým klíčem %s: %s"
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr "Neplatný podpis neznámým klíčem %s"
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr "Neplatný podpis neznámým klíčem: %s"
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr "Neplatný podpis neznámým klíčem"
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, c-format
msgid "Good signature by %s: %s"
msgstr "Platný podpis od %s: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, c-format
msgid "Good signature by %s"
msgstr "Platný podpis od %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr "Platný podpis neznámým klíčem %s: %s"
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr "Platný podpis neznámým klíčem %s"
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr "Platný podpis neznámým klíčem: %s"
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr "Platný podpis neznámým klíčem"
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Nejistý podpis od %s: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, c-format
msgid "Uncertain signature by %s"
msgstr "Nejistý podpis od %s"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Nejistý podpis neznámým klíčem %s: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Nejistý podpis neznámým klíčem %s"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Nejistý podpis neznámým klíčem: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr "Nejistý podpis neznámým klíčem"
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
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:1188
+#: src/gpgmetools.c:1221
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:1194
+#: src/gpgmetools.c:1227
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:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Tento klíč smí být použit pouze pro certifikaci."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1112,26 +1119,26 @@ msgstr ""
"Tento klíč smí být použit pouze pro šifrování a podpis, ne však pro "
"certifikaci."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Tento klíč smí být použit pouze pro podpis."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Tento klíč smí být použit pouze pro šifrování."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Tento klíč je nepoužitelný."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1148,35 +1155,35 @@ msgstr ""
"%i získáno soukromých klíčů\n"
"%i nezměněných soukromých klíčů"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr "Požadovaná komponenta stroje není instalovaná."
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr "Volání programu šifrovacího stroje selhalo."
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr "Musíte zadat jméno."
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr "Neplatný znak ve jménu."
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr "Jméno nemůže začínat číslicí."
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr "Jméno je příliš krátké."
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr "E-mailová adresa není platná."
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr "Neplatný znak v komentářích."
@@ -1295,7 +1302,7 @@ msgstr "Upravit klíč"
msgid "Change _passphrase"
msgstr "Změnit _heslo"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Platnost do"
@@ -1422,7 +1429,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Vytvořit _záložní kopii"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "_Později"
@@ -1449,7 +1456,7 @@ msgstr ""
"Právě jste úspěšně vytvořili klíč. Tento klíč je trvale platný, jeho délka "
"je %d bitů."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1457,7 +1464,7 @@ msgstr ""
"GnuPG rekonstruuje databázi důvěry.\n"
"Toto může pár sekund trvat."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
@@ -1465,23 +1472,15 @@ msgstr ""
"Tento sloupec indikuje typ certifikátu. Písmeno 'P' znamená OpenPGP, 'X' "
"znamená X.509 (S/MIME)."
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr "ID klíče je krátké číslo k identifikaci certifikátu."
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr "Datum vytvoření je datum, kdy byl certifikát vytvořen."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr "Datum vypršení je datum, do kterého je certifikát platný."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Důvěra ve vlastníka"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
@@ -1491,11 +1490,11 @@ msgstr ""
"certifikátu korektně podepisuje (certifikuje) ostatní certifikáty. To má "
"smysl pouze pro OpenPGP."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Platnost"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1503,7 +1502,7 @@ msgstr ""
"Platnost popisuje úroveň důvěry systému vůči tomuto certifikátu. Říká, jak "
"jste si jisti, že daný uživatel je skutečně tím, za koho se vydává."
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1515,7 +1514,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "Nebyl vybrán klíč pro podpis."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1523,11 +1522,11 @@ msgstr ""
"Ještě nemáte žádný soukromý klíč. Chcete jej vytvořit nyní (doporučeno), "
"nebo později?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_Vytvořit klíč nyní"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1535,178 +1534,178 @@ msgstr ""
"Nemáte záložní kopii soukromého klíče. Chcete ji vytvořit nyní (doporučeno), "
"nebo později?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "_Zálohovat klíč nyní"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
msgid "_Keys"
msgstr "_Klíče"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
msgid "_Server"
msgstr "_Server"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr "Vybrat všechny certifikáty"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Aktualizovat keyring"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
msgid "_New key..."
msgstr "_Nový klíč..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
msgid "Generate a new key"
msgstr "Vytvořit nový klíč"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
msgid "_Delete keys"
msgstr "Smazat klíče"
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Odstranit vybraný klíč"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
msgid "_Sign Keys..."
msgstr "Podep_sat klíče..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Podepsat vybraný klíč"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
msgid "Set _Owner Trust..."
msgstr "Nastavit úr_oveň důvěry..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
msgid "Set owner trust of the selected key"
msgstr "Nastavit úroveň důvěry zvoleného klíče"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
msgid "_Edit Private Key..."
msgstr "Upravit _soukromý klíč..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Upravit vybraný soukromý klíč"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
msgid "_Import Keys..."
msgstr "_Importovat klíče..."
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importovat klíče"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
msgid "E_xport Keys..."
msgstr "E_xportovat klíče..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Exportovat klíče"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
msgid "_Backup..."
msgstr "_Zálohovat..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
msgid "Backup key"
msgstr "Zálohovat klíč"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
msgid "_Retrieve Keys..."
msgstr "_Získat klíče..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr "Získat klíče ze serveru"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "Aktualizovat keyring"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "Získat klíče ze serveru"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
msgid "_Send Keys..."
msgstr "Ode_slat klíče..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
msgid "Send keys to server"
msgstr "Odeslat klíče na server..."
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Zobrazit stručný seznam klíčů"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Zobrazit podrobný seznam klíčů"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Upravit"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "Smazat"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Podepsat"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Exportovat"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Importovat"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "Zvolený výchozí klíč:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "V předvolbách nebyl zvolen žádný výchozí klíč."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
msgid "Key Manager"
msgstr "Správce klíčů"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
msgid "The key has both a smartcard based private part and a public part"
msgstr "Klíč má soukromou i veřejnou část uloženou na čipové kartě"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Klíč má soukromou i veřejnou část"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Klíč má pouze veřejnou část"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bitů"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Žádný klíč nevybrán"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
@@ -1714,58 +1713,62 @@ msgstr[0] "%d klíčů vybráno"
msgstr[1] "%d klíčů vybráno"
msgstr[2] "%d klíčů vybráno"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
msgid "User name:"
msgstr "Uživatelské jméno:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Vyprší:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Důvěra ve vlastníka:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
msgid "Key validity:"
msgstr "Platnost klíče:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
msgid "Key type:"
msgstr "Typ klíče:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Vytvořen:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Podrobnosti"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Zobrazit podpisy u jména uživatele:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Chain"
msgstr "Řetěz"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Podpisy"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Všechny podpisy"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Podklíče"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Key"
msgstr "Klíč"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Podepsat klíč"
@@ -1963,6 +1966,11 @@ msgstr ""
"Zkontrolujte zda byl nalezen alespoň jeden odpovídající X.509 certifikát pro "
"použití s S/MIME."
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "ID klíče"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2507,6 +2515,7 @@ msgstr ""
"<b>Reset kódu</b> , poté novou hodnotu PIN a tu na dalším řádku zopakovali."
#: src/cm-openpgp.c:1096
+#, fuzzy
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2515,7 +2524,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2556,7 +2565,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
#, fuzzy
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2920,6 +2929,9 @@ msgstr ""
"Pro kartu %s není mnoho informací ke zobrazení. Zkuste použít tlačítko pro "
"volbu aplikace pro přepnutí na jinou aplikaci, která je na kartě k dispozici."
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "ID klíče je krátké číslo k identifikaci certifikátu."
+
#~ msgid "Error"
#~ msgstr "Fehler"
diff --git a/po/de.gmo b/po/de.gmo
index 2103a21..a70935e 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index c6a5f73..df0097a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
-"PO-Revision-Date: 2014-12-08 17:36+0100\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
+"PO-Revision-Date: 2016-11-19 11:40+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -40,12 +40,12 @@ msgstr "Speichern unter..."
msgid "Clipboard"
msgstr "Zwischenablage"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
msgid "_File"
msgstr "_Datei"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
msgid "_Edit"
msgstr "_Bearbeiten"
@@ -82,7 +82,7 @@ msgstr "Text entschlüsseln"
msgid "Close the buffer"
msgstr "Das Fenster schliessen"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr "Das Programm beenden"
@@ -99,11 +99,11 @@ msgstr "Die letzte rückgängig gemachte Aktion wiederholen"
msgid "Cut the selection"
msgstr "Auswahl ausschneiden"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "Auswahl kopieren"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "Zwischenablage einfügen"
@@ -119,11 +119,11 @@ msgstr "Das gesamte Dokument auswählen"
msgid "Keyring"
msgstr "Schlüsselverwaltung"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Dateien"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr "Smartcard"
@@ -201,13 +201,13 @@ msgid "Configure backend to use a keyserver?"
msgstr "Soll ein Schlüssel-Server konfiguriert werden?"
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Ja"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Nein"
@@ -232,23 +232,23 @@ msgstr "Monate"
msgid "years"
msgstr "Jahre"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "kein Verfallsdatum"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "unbekannt"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr "Herr"
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr "Frau"
-#: src/convert.c:129
+#: src/convert.c:142
msgid "(unknown)"
msgstr "(unbekannt)"
@@ -280,7 +280,7 @@ msgstr "Bitte geben Sie ein gültiges Datum ein."
msgid "Change expiry date"
msgstr "Verfallsdatum ändern"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Abbrechen"
@@ -320,15 +320,15 @@ msgstr "Das Fenster schliessen"
msgid "Select all files"
msgstr "Alle Dateien auswählen"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Datei"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "Dateiverwaltung"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Die Datei ist bereits geöffnet."
@@ -368,7 +368,7 @@ msgstr "Schlüsselverwaltung öffnen"
msgid "Open file manager"
msgstr "Dateiverwaltung öffnen "
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
msgid "Open the card manager"
msgstr "Kartenmanager aufrufen"
@@ -408,31 +408,31 @@ msgstr "Grafische Benutzeroberfläche für GnuPG"
msgid "Please report bugs to <"
msgstr "Fehler bitte berichten an <"
-#: src/gpa.h:80
+#: src/gpa.h:84
msgid "_Windows"
msgstr "_Fenster"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "Schlüsselverwaltung öffnen"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "Dateiverwaltung aufrufen"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "Zwischenablage öffnen"
-#: src/gpa.h:105
+#: src/gpa.h:109
msgid "Configure the application"
msgstr "Konfigurieren des Programms"
-#: src/gpa.h:108
+#: src/gpa.h:112
msgid "_Backend Preferences"
msgstr "\"_Backend\" Einstellungen"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr "Konfigurien des GnuPG Systems"
@@ -513,28 +513,28 @@ msgstr "Die Schlüssel wurden zum Server gesandt."
msgid "Decrypting..."
msgstr "_Entschlüsseln"
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "\"%s\" enthält keine korrekt verschlüsselten OpenPGP-Daten."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Die Datei \"%s\" enthält keine korrekt verschlüsselten OpenPGP-Daten."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "\"%s\" enthält keine korrekt verschlüsselten Daten."
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "Die Datei \"%s\" enthält keine korrekt verschlüsselten Daten."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Unsicherer Passwortsatz!"
@@ -543,45 +543,45 @@ msgstr "Unsicherer Passwortsatz!"
msgid "Encrypting..."
msgstr "Verschlüsseln ..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Unbekannter Schlüssel"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "Wollen Sie das Dokument mit dem folgenden Schlüssel verschlüsseln?"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Allerdings ist nicht sicher, dass der Schlüssel dieser Person gehört."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Wollen Sie diesen Schlüssel <b>tatsächlich</b> benutzen?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Zurückgezogener Schlüssel"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Fenster schließen"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "Der folgende Schlüssel wurde vom Besitzer zurückgezogen:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "und kann nicht zum Verschlüsseln benutzt werden."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "The folgende Schlüssel lief am %s aus:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -592,7 +592,7 @@ msgstr ""
"also wohl OpenPGP als auch X.509 Zertifikate ausgewählt. Bitte wählen\n"
"Sie nur Zertifikate eines Typs aus."
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Es wurde kein Schlüssel zum Signieren ausgewählt."
@@ -636,7 +636,7 @@ msgstr ""
"Benutzen Sie die lange Schlüsselkennung oder den Fingerprint für eine "
"verfeinerte Suche."
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Es wurde kein Schlüssel gefunden."
@@ -648,12 +648,15 @@ msgstr ""
"Ungültige Zeitangabe.\n"
"(Sie können die Ablaufzeit nicht in die Vergangenheit setzen.)"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "Schlüsselkennung"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+msgid "Created"
+msgstr "Erstellt"
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr "Das Erstellungsdatum ist das Datum ab dem das Zertifikat gültig ist."
+
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Benutzerkennung"
@@ -714,100 +717,96 @@ msgstr "Nachricht signieren"
msgid "Verifying message ..."
msgstr "Prüfen einer Nachricht ..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "Kennung des untergeordneten Schlüssels"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Gültigkeit der Beglaubigung"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
msgid "Algo"
msgstr "Algo"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Größe"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-msgid "Created"
-msgstr "Erstellt"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
msgid "Expires"
msgstr "Läuft ab"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr "S"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Zum Signieren verwendbar"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr "Z"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Zum Überprüfen verwendbar"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr "V"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Zum Verschlüsseln verwendbar"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr "A"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Zum Authentifizieren verwendbar"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr "T"
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr "Geheimer Schlüssel befindet sich auf einer Smartcard"
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr "Kartennummer"
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr "Seriennummer der Smartcard"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Widerrufen"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Abgelaufen"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Deaktiviert"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Nicht beglaubigt"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Gültig"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Benutzerkennung:"
@@ -816,12 +815,12 @@ msgstr "Benutzerkennung:"
msgid "User Names:"
msgstr "Benutzernamen:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "Schlüsselkennung:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Fingerabdruck:"
@@ -897,7 +896,7 @@ msgstr ""
"Dies ist wahrscheinlich ein Fehler in %s.\n"
"%s versucht nun, sich davon wieder zu erholen."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -906,7 +905,15 @@ msgstr ""
"Die Datei »%s« existiert bereits.\n"
"Möchten Sie sie überschreiben?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr "Einen _anderen Dateiname benutzen"
+
+#: src/gpgmetools.c:202
+msgid "_Open"
+msgstr "_Öffnen"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -921,7 +928,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -929,186 +936,186 @@ msgstr ""
"Der in dieser Datei gesicherte Schlüssel ist:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "unbekannt"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "niemals"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "geringfügig"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "vollständig"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Ultimativ"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "unvollständig"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "voll gültig"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Bitte geben Sie den Passwortsatz für den folgenden Schlüssel ein:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Falscher Passwortsatz, bitte versuchen Sie es erneut:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Passwortsatz eingeben"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[Keine]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Unbekannte Benutzerkennung]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Ungültig"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Generisch"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Persona"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Beiläufig"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Positiv"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, c-format
msgid "Bad signature by %s: %s"
msgstr "Falsche Signatur von %s: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, c-format
msgid "Bad signature by %s"
msgstr "Falsche Signatur durch %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr "Falsche Signatur durch unbekannten Schlüssel %s: %s"
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr "Falsche Signatur durch unbekannten Schlüssel %s"
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr "Falsche Signatur durch unbekannten Schlüsel: %s"
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr "Falsche Signatur durch unbekanntes Zertifikat"
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, c-format
msgid "Good signature by %s: %s"
msgstr "Korrekte Signatur von %s: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, c-format
msgid "Good signature by %s"
msgstr "Korrekte Signatur von %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr "Korrekte Signatur durch unbekannten Schlüssel %s: %s"
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr "Korrekte Signatur durch unbekannten Schlüssel %s"
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr "Korrekte Signatur durch unbekannten Schlüssel: %s"
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr "Korrekte Signatur durch unbekannten Schlüssel"
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Ungewisse Signatur von %s: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, c-format
msgid "Uncertain signature by %s"
msgstr "Ungewisse Signatur von %s"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Ungewisse Signatur durch unbekanntes Zertifikat %s: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Ungewisse Signatur durch unbekanntes Zertifikat %s"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Ungewisse Signatur durch unbekanntes Zertifikat: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr "Ungewisse Signatur durch unbekanntes Zertifikat"
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
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:1188
+#: src/gpgmetools.c:1221
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:1194
+#: src/gpgmetools.c:1227
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:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Der Schlüssel ist ausschließlich zum Zertifizieren verwendbar."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1116,19 +1123,19 @@ msgstr ""
"Der Schlüssel ist nur zum Signieren und Verschlüsseln verwendbar, nicht aber "
"zum Zertifizieren."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Der Schlüssel ist ausschließlich zum Signieren verwendbar."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Der Schlüssel ist ausschließlich zum Verschlüsseln verwendbar."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Dieser Schlüssel ist nicht verwendbar."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
@@ -1137,7 +1144,7 @@ msgstr ""
"%u Datei(en) gelesen\n"
"%u Datei(en) mit Fehlern"
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1154,35 +1161,35 @@ msgstr ""
"%i geheime Schlüssel importiert\n"
"%i geheime Schlüssel unverändert"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr "Eine notwendige Krypto-Engine ist nicht installiert"
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr "Aufruf der Crypto-Engine fehlgeschlagen."
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr "Sie müssen einen Namen angeben."
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr "Ungültige Zeichen im Namen"
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr "Eine Ziffer am Anfang des Names ist nicht erlaubt."
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr "Der Name ist zu kurz."
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr "Die Email Adresse ist nicht gültig."
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr "Ungültige Zeichen im Kommentarfeld."
@@ -1302,7 +1309,7 @@ msgstr "Schlüssel bearbeiten"
msgid "Change _passphrase"
msgstr "_Passwortsatz ändern"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Verfallsdatum"
@@ -1432,7 +1439,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "_Sicherheitskopie anlegen"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Später _erledigen"
@@ -1458,7 +1465,7 @@ msgstr ""
"Sie haben erfolgreich Ihren neuen Schlüssel erzeugt. Dieser Schlüssel hat "
"eine Länge von %d Bit und hat kein Verfallsdatum."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1466,7 +1473,7 @@ msgstr ""
"GnuPG stellt die Verlässlichkeits-Datenbank wieder her.\n"
"Das kann einige Sekunden dauern."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
@@ -1474,25 +1481,15 @@ msgstr ""
"Diese Spalte beschreibt den Typ des Zertifikats. Ein 'P' steht für\n"
"OpenPGP und ein 'X' für X.509 (S/MIME). "
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr ""
-"Die Schlüsselkennung (Key ID) is eine kurze Zahl zur Identifizerung eines "
-"Zertifikats."
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr "Das Erstellungsdatum ist das Datum ab dem das Zertifikat gültig ist."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr "Das Ablaufdatum ist das Datum bis zu dem das Zertifikat gültig ist."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Benutzervertrauen"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
@@ -1503,11 +1500,11 @@ msgstr ""
"zu unterschreiben (zertifizieren). Dieser Wert ist nur für OpenPGP\n"
"relevant."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Gültigkeit"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1516,7 +1513,7 @@ msgstr ""
"Zertifikat steckt. Also, wie sicher es ist, daß die benannte Person\n"
"wirklich diese Person ist. "
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1528,7 +1525,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "Keine Schlüssel ausgewählt."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1536,11 +1533,11 @@ msgstr ""
"Sie haben noch keinen geheimen Schlüssel. Wollen Sie jetzt einen erzeugen "
"(empfohlen), oder dies später erledigen?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "Jetzt Schlüssel _erzeugen"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1548,236 +1545,240 @@ msgstr ""
"Sie haben noch keine Sicherheitskopie Ihres geheimen Schlüssels. Wollen Sie "
"jetzt einen Sicherheitskopie anlegen (empfohlen), oder dies später erledigen?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "_Sicherheitskopie anlegen"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
msgid "_Keys"
msgstr "_Schlüssel"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
msgid "_Server"
msgstr "_Server"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr "Alle Zertifikate auswählen"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Schlüsselbund auffrischen"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
msgid "_New key..."
msgstr "_Neuer Schlüssel..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
msgid "Generate a new key"
msgstr "Schlüssel erzeugen"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
msgid "_Delete keys"
msgstr "Schlüssel _löschen"
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Gewählten Schlüssel entfernen"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
msgid "_Sign Keys..."
msgstr "Schlüssel _Signieren..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Gewählten Schlüssel signieren"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
msgid "Set _Owner Trust..."
msgstr "Schlüssel-_Vertrauen einstellen..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
msgid "Set owner trust of the selected key"
msgstr "Vertrauen des gewählten Schlüssels einstellen"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
msgid "_Edit Private Key..."
msgstr "G_eheimen Schlüssel bearbeiten..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Ausgewählten geheimen Schlüssel bearbeiten"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
msgid "_Import Keys..."
msgstr "Schlüssel importieren..."
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Schlüssel importieren"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
msgid "E_xport Keys..."
msgstr "Schlüssel e_xportieren..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Schlüssel exportieren"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
msgid "_Backup..."
msgstr "Sicherheitskopie _anlegen..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
msgid "Backup key"
msgstr "Sicherheitskopie des Schlüssels"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
msgid "_Retrieve Keys..."
msgstr "_Schlüssel erhalten..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr "Schlüssel _zum Key-Server senden"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
msgid "Re_fresh Keys"
msgstr "Schlüssel auf_frischen"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
msgid "Refresh keys from server"
msgstr "Schlüssel vom Key-Server auffrischen"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
msgid "_Send Keys..."
msgstr "Schlüssel _Senden..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
msgid "Send keys to server"
msgstr "Schlüssel _zum Server senden ..."
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Schlüssel nur mit Benutzerkennung anzeigen"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Schlüssel mit Verfallsdatum und Vertrauenswerten anzeigen"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Ändern"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "Löschen"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Signieren"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Export"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Import"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "Standard-Schlüssel:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "Kein Standard-Schlüssel in den Einstellungen ausgewählt."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
msgid "The key has both a smartcard based private part and a public part"
msgstr ""
"Dieser Schlüssel hat einen öffentlichen und einen kartenbasierten geheimen "
"Teil"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Dieser Schlüssel hat einen öffentlichen und einen geheimen Teil"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Dieser Schlüssel hat nur einen öffentlichen Teil"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bit"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Keine Schlüssel ausgewählt"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d Schlüssel ausgewählt"
msgstr[1] "%d Schlüssel ausgewählt"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
msgid "User name:"
msgstr "Benutzerkennung:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "ungültig ab:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Benutzervertrauen:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
msgid "Key validity:"
msgstr "Gültigkeit:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
msgid "Key type:"
msgstr "Art:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "erzeugt am:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Details"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Signaturen für Benutzerkennung anzeigen:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Chain"
msgstr "Kette"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Signaturen"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Alle Signaturen"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Untergeordnete Schlüssel"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Key"
msgstr "Schlüssel"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr "TOFU"
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Schlüssel signieren"
@@ -1986,6 +1987,11 @@ msgstr ""
"Angekreuzt falls zumindest ein für S.MIME verwendbares Zertifikat gefunden "
"wurde"
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "Schlüsselkennung"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2530,7 +2536,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2551,7 +2557,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2858,6 +2864,11 @@ msgstr ""
"können jedoch mit dem Knopf zur Anwendungsauswahl auf eine andere, auf der "
"Karte verfügbare, Anwendung umschalten."
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr ""
+#~ "Die Schlüsselkennung (Key ID) is eine kurze Zahl zur Identifizerung eines "
+#~ "Zertifikats."
+
#~ msgid "Error"
#~ msgstr "Fehler"
@@ -3967,9 +3978,6 @@ msgstr ""
#~ msgid "_Accept"
#~ msgstr "_Übernehmen"
-#~ msgid "_Open"
-#~ msgstr "_Öffnen"
-
#~ msgid ""
#~ "The keyserver returned an error message:\n"
#~ "\n"
diff --git a/po/es.gmo b/po/es.gmo
index 984aea3..e44c2cc 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index bf28ec7..09cd5be 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.7.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2008-03-11 09:35+0100\n"
"Last-Translator: \n"
"Language-Team: Spanish <es at li.org>\n"
@@ -45,13 +45,13 @@ msgstr "Guardar Como..."
msgid "Clipboard"
msgstr "Portapapeles"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Archivo"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -94,7 +94,7 @@ msgstr "Descifrar el texto seleccionado"
msgid "Close the buffer"
msgstr "Limpiar buffer"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -112,11 +112,11 @@ msgstr ""
msgid "Cut the selection"
msgstr "Cortar la selección"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "Copiar la selección"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "Pegar el portapapeles"
@@ -133,11 +133,11 @@ msgstr ""
msgid "Keyring"
msgstr "Anillo de claves"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Archivos"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "Portapapeles"
@@ -215,13 +215,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Sí"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_No"
@@ -246,23 +246,23 @@ msgstr "meses"
msgid "years"
msgstr "años"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "no caduca nunca"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "desconocida"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "desconocida"
@@ -295,7 +295,7 @@ msgstr "Por favor, proporcione una fecha correcta"
msgid "Change expiry date"
msgstr "Cambiar fecha de caducidad"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Cancelar"
@@ -336,15 +336,15 @@ msgstr ""
msgid "Select all files"
msgstr "Cerrar todos los archivos"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Archivo"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "Gestor de Archivos"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "El archivo ya está abierto."
@@ -390,7 +390,7 @@ msgstr "Abrir editor del anillo de claves (por defecto)"
msgid "Open file manager"
msgstr "Abrir gestor de archivos"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Abrir el gestor de archivos"
@@ -433,34 +433,34 @@ msgstr "Interfaz gráfico a GnuPG"
msgid "Please report bugs to <"
msgstr "Por favor, envíe informes de error a <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_Ventanas"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "Abrir el editor de anillo de claves"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "Abrir el gestor de archivos"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "Abrir el portapapeles"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "Cortar la selección"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Editar/Pr_eferencias del motor..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -543,28 +543,28 @@ msgstr "Las claves se han enviado al servidor."
msgid "Decrypting..."
msgstr "Descifrando..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "El archivo \"%s\" no contiene datos válidos de OpenPGP."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "El archivo \"%s\" no contiene datos válidos de OpenPGP."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "El archivo \"%s\" no contiene datos cifrados válidos."
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "El archivo \"%s\" no contiene datos cifrados válidos."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "¡Contraseña incorrecta!"
@@ -573,47 +573,47 @@ msgstr "¡Contraseña incorrecta!"
msgid "Encrypting..."
msgstr "Cifrando..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Clave Desconocida"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "Va a cifrar un documento usando la siguiente clave:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr ""
"Sin embargo, no existe seguridad de que la clave pertenezca a esa persona"
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "¿Está <b>seguro</b> de que quiere usar esa clave?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Clave Revocada"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Cerrar"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
#, fuzzy
msgid "The following key has been revoked by its owner:"
msgstr "Esta clave ha sido revocada por su propietario:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "Y no se puede usar para cifrado."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "Esta clave caducó el %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -621,7 +621,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "No se seleccionó ninguna clave con la que firmar"
@@ -662,7 +662,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "No se encontró ninguna clave."
@@ -674,12 +674,18 @@ msgstr ""
"Tiempo no válido.\n"
"(no puede indicar un tiempo de expiración en el pasado.)"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "ID de Clave"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Creada el:"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+#, fuzzy
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
+"La Fecha de Caducidad es la fecha hasta la cual el certificado es válido."
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Nombre de Usuario"
@@ -749,103 +755,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Verificando..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "ID de Subclave"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Estado"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Algoritmo"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Tamaño"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Creada el:"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Caducada"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Puede firmar"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Puede certificar"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Puede cifrar"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Puede autenticar"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Revocada"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Caducada"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Desactivada"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Sin firmar"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Válida"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nombre de Usuario:"
@@ -854,12 +855,12 @@ msgstr "Nombre de Usuario:"
msgid "User Names:"
msgstr "Nombres de Usuario:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "ID de Clave:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Huella dactilar:"
@@ -933,7 +934,7 @@ msgstr ""
"Esto probablemente se deba a un fallo en GPA.\n"
"GPA intentará recuperarse de este error."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -942,7 +943,16 @@ msgstr ""
"El archivo %s ya existe.\n"
"¿Quiere sobreescribirlo?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/Archivo/_Abrir"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -956,7 +966,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -964,181 +974,181 @@ msgstr ""
"La clave contenida en este archivo es:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Desconocida"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Nunca"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Parcial"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Total"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Absoluta"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Incompleta"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Totalmente Válida"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Por favor introduzca la contraseña para la siguiente clave:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Contraseña incorrecta, por favor vuelva a intentarlo:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Introduzca Contraseña"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[Ninguno]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Identificador de usuario, user ID, desconocido]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Incorrecta"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Genérica"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Persona"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Casual"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Positiva"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Todas las firmas"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Todas las firmas"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Firmas: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
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:1188
+#: src/gpgmetools.c:1221
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:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "Esta clave puede utilizarse para certificación y cifrado."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Esta clave puede utilizarse sólo para certificación."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1146,26 +1156,26 @@ msgstr ""
"Esta clave puede utilizarse sólo para firma y cifrado, pero no para\n"
"certificación."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Esta clave puede utilizarse tan sólo para firma."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Esta clave puede utilizarse tan sólo para cifrado."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Esta clave no vale para nada."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1182,36 +1192,36 @@ msgstr ""
"%i claves secretas importadas\n"
"%i claves secretas sin cambios"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
#, fuzzy
msgid "You must enter a name."
msgstr "Tienes que introducir un Identificador de Usuario (User ID)"
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1344,7 +1354,7 @@ msgstr "Editar Clave"
msgid "Change _passphrase"
msgstr "Cambiar contra_seña"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Fecha de Caducidad"
@@ -1477,7 +1487,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Crear copia de _seguridad"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Hacerlo más _tarde"
@@ -1505,7 +1515,7 @@ msgstr ""
"Ha generado una clave con éxito. La clave no caduca nunca y tiene una "
"longitud de 1024 bits."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1513,34 +1523,22 @@ msgstr ""
"GnuPG está reconstruyendo la base de datos de confianza\n"
"Esto podría llevar unos segundos."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr ""
-"El identificador de clave (key ID) es un número corto para identificar el "
-"certificado."
-
-#: src/keylist.c:641
-#, fuzzy
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-"La Fecha de Caducidad es la fecha hasta la cual el certificado es válido."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
"La Fecha de Caducidad es la fecha hasta la cual el certificado es válido."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Confianza en el Usuario"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
@@ -1550,11 +1548,11 @@ msgstr ""
"describe si confias en dueño del certificado para firmar otros certificados. "
"Esta opción solo tiene funcionalidad para OpenPGP."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Validez"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1563,7 +1561,7 @@ msgstr ""
"certificado. La Valided permite medir la certeza de que el nombre de usuario "
"es realmente el usuario."
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1575,7 +1573,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "No hay ninguna clave seleccionada para firmar."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1583,11 +1581,11 @@ msgstr ""
"Aún no tiene una clave privada. ¿Quiere generar una ahora (recomendado) o "
"hacerlo más tarde?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_Generar clave ahora"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1595,260 +1593,264 @@ msgstr ""
"No ha hecho aún una copia de seguridad de su clave privada. ¿Desea hacer una "
"copia de seguridad ahora (recomendado), o más tarde?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "Hacer _copia de seguridad ahora"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/_Claves"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/_Servidor"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Actualizar el anillo de llaves"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/Claves/_Nueva Clave..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "Generar clave"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/_Borrar Claves..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Borrar la clave seleccionada"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/_Firmar Claves..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Firmar la clave seleccionada"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Establecer _Confianza en el Usuario..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Borrar la clave seleccionada"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Editar Clave Privada..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Editar la clave privada seleccionada"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "Importar Claves"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importar Claves"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_xportar Claves..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Exportar Claves"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/_Copia de Seguridad..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "Hacer _copia de seguridad ahora"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Servidor/_Descargar Claves..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "actualizar el anillo de llaves"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "E_nviar claves al servidor"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/_Firmar Claves..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "E_nviar claves al servidor"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Mostrar Lista de Claves Breve"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Mostrar detalles de las claves"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Editar"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
#, fuzzy
msgid "Delete"
msgstr "/Editar/Eliminar"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Firmar"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Exportar"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Importar"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "Clave por defecto seleccionada:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "No hay ninguna clave predeterminada seleccionada en preferencias."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "Gestor de Archivos"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "Esta clave tiene tanto una parte secreta como una pública"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Esta clave tiene tanto una parte secreta como una pública"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Esta clave solo tiene una parte pública"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bits"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "No hay claves seleccionadas"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d clave seleccionada"
msgstr[1] "%d claves seleccionadas"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Nombre de Usuario:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Caduca el:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Confianza en el usuario:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Validez de la Clave:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Tipo de Clave:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Creada el:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Detalles"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Mostrar firmas en el nombre de usuario:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "Puede firmar"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Firmas"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Todas las firmas"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Subclaves"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/_Claves"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Firmar Clave"
@@ -2043,6 +2045,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "ID de Clave"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2563,7 +2570,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2584,7 +2591,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2873,6 +2880,11 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr ""
+#~ "El identificador de clave (key ID) es un número corto para identificar el "
+#~ "certificado."
+
#, fuzzy
#~ msgid "Error"
#~ msgstr "Error de GPA"
@@ -2949,9 +2961,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/Archivo/Li_mpiar"
-#~ msgid "/File/_Open"
-#~ msgstr "/Archivo/_Abrir"
-
#~ msgid "/File/Save _As"
#~ msgstr "/Archivo/Guardar _Como"
diff --git a/po/fr.gmo b/po/fr.gmo
index d0a51d5..3ee150b 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 64bd599..7719475 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.8.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2014-12-08 17:37+0100\n"
"Last-Translator: Eric Lassauge <lassauge at users.sf.net>\n"
"Language-Team: <fr at li.org>\n"
@@ -44,12 +44,12 @@ msgstr "Enregistrer sous…"
msgid "Clipboard"
msgstr "Presse-papiers"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
msgid "_File"
msgstr "_Fichier"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
msgid "_Edit"
msgstr "É_diter"
@@ -86,7 +86,7 @@ msgstr "Déchiffrer le tampon de texte"
msgid "Close the buffer"
msgstr "Fermer tampon"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr "Quitter le programme"
@@ -103,11 +103,11 @@ msgstr "Refaire la dernière action annulée"
msgid "Cut the selection"
msgstr "Couper la sélection"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "Copier la sélection"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "Coller le presse-papiers"
@@ -123,11 +123,11 @@ msgstr "Sélectionner le document en entier"
msgid "Keyring"
msgstr "Trousseau de clefs"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Fichiers"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "Presse-papiers"
@@ -206,13 +206,13 @@ msgid "Configure backend to use a keyserver?"
msgstr "Configurer les programmes « backend »"
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Oui"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Non"
@@ -238,23 +238,23 @@ msgstr "mois"
msgid "years"
msgstr "années"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "N'expire jamais"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "Inconnu(e)"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "Inconnu(e)"
@@ -287,7 +287,7 @@ msgstr "Veuillez indiquer une date correcte."
msgid "Change expiry date"
msgstr "Changer la date d'expiration"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Annuler"
@@ -327,15 +327,15 @@ msgstr "Fermer la fenêtre"
msgid "Select all files"
msgstr "Sélectionner tous les fichiers"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Fichier"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "Gestionnaire de fichiers"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Le fichier est déjà ouvert."
@@ -376,7 +376,7 @@ msgstr "Éditeur de trousseau de clefs (par défaut)"
msgid "Open file manager"
msgstr "Ouvrir le gestionnaire de fichiers"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Ouvrir le gestionnaire de fichiers"
@@ -419,31 +419,31 @@ msgstr "Interface graphique pour GnuPG"
msgid "Please report bugs to <"
msgstr "Veuillez envoyer vos rapports de faille à <"
-#: src/gpa.h:80
+#: src/gpa.h:84
msgid "_Windows"
msgstr "F_enêtres"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "Ouvrir l'éditeur de trousseau de clefs"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "Ouvrir le gestionnaire de fichiers"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "Ouvrir le presse-papiers"
-#: src/gpa.h:105
+#: src/gpa.h:109
msgid "Configure the application"
msgstr "Configurer l'application"
-#: src/gpa.h:108
+#: src/gpa.h:112
msgid "_Backend Preferences"
msgstr "Préférences « backends »"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr "Configurer les programmes « backend »"
@@ -526,29 +526,29 @@ msgstr "Les clés ont été envoyées au serveur."
msgid "Decrypting..."
msgstr "Déchiffrement…"
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "« %s » ne contient pas de données OpenPGP valides."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Le fichier « %s » ne contient pas de données OpenPGP valides."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "« %s » ne contient pas de données chiffrées OpenPGP valides."
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr ""
"Le fichier « %s » ne contient pas de données chifrrées OpenPGP valides."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Mot de passe incorrect !"
@@ -557,46 +557,46 @@ msgstr "Mot de passe incorrect !"
msgid "Encrypting..."
msgstr "Chiffrement…"
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Clef inconnue"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "Vous allez chiffrer un document à l'aide de cette clef :"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr ""
"Cependant, il n'est pas certain que cette clef appartienne à cette personne."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Etes-vous <b>certain</b> de vouloir utiliser cette clef ?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Clef révoquée"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Fermer"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "La clef suivante a été révoquée par son propriétaire :"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "et ne peut être utilisée pour le chiffrement."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "La clef suivante a expiré le %s :"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -607,7 +607,7 @@ msgstr ""
"mélangé des certificats OpenPGP et X.509. Vérifiez que vous ne sélectionnez "
"que des certificats du même type."
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Vous n'avez pas sélectionné une clef pour signer"
@@ -649,7 +649,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Clefs introuvables."
@@ -661,12 +661,19 @@ msgstr ""
"La date est invalide.\n"
"(la date d'expiration ne peut être située dans le passé.)"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "ID de clef"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Créée le :"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+#, fuzzy
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
+"La date d'expiration indique la date à laquelle le certificat cesse d'être "
+"valide."
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Nom d'utilisateur"
@@ -738,103 +745,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Vérification…"
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "ID de sous-clef"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "État"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Algorithme"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Taille"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Créée le :"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Expirée"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Signe"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Certifie"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Chiffre"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Authentifie"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Révoquée"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Expirée"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Hors-fonction"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Non-signé"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Valide"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nom d'utilisateur :"
@@ -843,12 +845,12 @@ msgstr "Nom d'utilisateur :"
msgid "User Names:"
msgstr "Noms d'utilisateur :"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "ID de clef :"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Empreinte :"
@@ -922,7 +924,7 @@ msgstr ""
"Il s'agit probablement d'un bogue dans le GPA.\n"
"GPA va tenter de récupérer de cette erreur."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -931,7 +933,15 @@ msgstr ""
"Le fichier %s existe déjà.\n"
"Voulez-vous l'écraser ?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+msgid "_Open"
+msgstr ""
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -945,7 +955,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -953,185 +963,185 @@ msgstr ""
"La clef sauvegardée dans ce fichier est :\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "inconnu"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Jamais"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Marginale"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Complète"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Ultime"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Incomplet"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Complètement valide"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Veuillez entrer le mot de passe pour la clef suivante :"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Mauvais mot de passe, essayez encore:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Entrer le mot de passe"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[Aucun]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[ID d'utilisateur inconnu]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Mauvaise"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Générique"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Personnelle"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Informelle"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Positive"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Toutes les signatures"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Toutes les signatures"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Signatures : %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr ""
"La clef peut être utilisée pour fins de certification, de signature et de "
"chiffrement."
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr ""
"La clef peut être utilisée pour fins de certification et de signature mais "
"pas de chiffrement."
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr ""
"La clef peut être utilisée pour fins de certification et de chiffrement."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "La clef peut être utilisée pour fins de certification seulement."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1139,26 +1149,26 @@ msgstr ""
"La clef peut être utilisée pour fins de signature et de chiffrement mais pas "
"de certification."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "La clef peut être utilisée pour fins de signature seulement."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "La clef peut être utilisée pour fins de chiffrement seulement."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Cette clef est inutilisable."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1175,36 +1185,36 @@ msgstr ""
"%i clefs secrètes importées\n"
"%i clefs secrètes inchangées"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
#, fuzzy
msgid "You must enter a name."
msgstr "Vous devez entrer un identificateur d'usager."
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1326,7 +1336,7 @@ msgstr "Éditer la clef"
msgid "Change _passphrase"
msgstr "Changer le mot de _passe"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Expiration"
@@ -1457,7 +1467,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Créer une _copie de sauvegarde"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Le faire plus _tard"
@@ -1485,7 +1495,7 @@ msgstr ""
"Vous avez généré avec succès une clef. La clef n'a pas de date d'expiration "
"et a une longueur de 1024 bits."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1493,7 +1503,7 @@ msgstr ""
"GnuPG met à jour les données de confiance.\n"
"Ceci peut prendre quelques secondes."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
@@ -1501,30 +1511,17 @@ msgstr ""
"Cette colonne indique le type du certificat. Un « P » indique OpenPGP et un "
"« P » indique X.509 (S/MIME)."
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr ""
-"L'identificateur de clef est une suite de chiffres et de lettres servant à "
-"identifier un certificat."
-
-#: src/keylist.c:641
-#, fuzzy
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-"La date d'expiration indique la date à laquelle le certificat cesse d'être "
-"valide."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
"La date d'expiration indique la date à laquelle le certificat cesse d'être "
"valide."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Confiance du propriétaire"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
@@ -1534,11 +1531,11 @@ msgstr ""
"confiance que vous apportez au détenteur du certificat lorsqu'il signe "
"(certifie) d'autres certificats. Ceci n'est tenu en compte que par OpenPGP."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Validité"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1547,7 +1544,7 @@ msgstr ""
"certificat. Ceci indique le niveau de certitude concernant l'identité de cet "
"utilisateur."
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1558,7 +1555,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "Aucune clef sélectionnée pour signer."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1566,11 +1563,11 @@ msgstr ""
"Vous n'avez pas encore de clef privée. Voulez-vous en générer une maintenant "
"(recommendé) ou le faire plus tard ?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_Générer la clef maintenant"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1578,243 +1575,247 @@ msgstr ""
"Vous n'avez pas encore de sauvegarde de votre clef privée. Voulez-vous faire "
"une sauvegarde maintenant (recommendé) ou le faire plus tard ?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "_Sauvegarder la clef maintenant"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
msgid "_Keys"
msgstr "_Clefs"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
msgid "_Server"
msgstr "_Serveur"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr "Sélectionner tout les certificats"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Recharger le trousseau de clefs"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
msgid "_New key..."
msgstr "_Nouvelle clef…"
-#: src/keymanager.c:951
+#: src/keymanager.c:954
msgid "Generate a new key"
msgstr "Générer une nouvelle clef"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
msgid "_Delete keys"
msgstr "_Supprimer des clefs"
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Supprimer la clef sélectionnée"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
msgid "_Sign Keys..."
msgstr "Clefs de _signature…"
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Signer la clef sélectionnée"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
msgid "Set _Owner Trust..."
msgstr "Changer la c_onfiance du propriétaire…"
-#: src/keymanager.c:957
+#: src/keymanager.c:960
msgid "Set owner trust of the selected key"
msgstr "Changer la confiance du propriétaire de la clef sélectionnée"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
msgid "_Edit Private Key..."
msgstr "_Éditer une clef privée…"
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Éditer la clef sélectionnée"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
msgid "_Import Keys..."
msgstr "_Importer des clefs…"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importer des clefs"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
msgid "E_xport Keys..."
msgstr "E_xporter des clefs…"
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Exporter des clefs"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
msgid "_Backup..."
msgstr "_Sauvegarder…"
-#: src/keymanager.c:967
+#: src/keymanager.c:970
msgid "Backup key"
msgstr "Sauvegarde des clés"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
msgid "_Retrieve Keys..."
msgstr "_Récupération de clefs…"
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr "Récupérer des clefs depuis un serveur"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "Recharger le trousseau de clefs"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "Récupérer des clefs depuis un serveur"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
msgid "_Send Keys..."
msgstr "_Envoyer des clefs…"
-#: src/keymanager.c:978
+#: src/keymanager.c:981
msgid "Send keys to server"
msgstr "Envoi de clefs au serveur"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Montrer un résumé de la liste de clefs"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Montrer les détails de la clef"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Éditer"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "Effacer"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Signer"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Exporter"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Importer"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "Clef sélectionnée par défaut :"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "Aucune clef sélectionnée par défaut dans les préférences"
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "Gestionnaire de fichiers"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "La clef a à la fois une partie privée et une partie publique"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "La clef a à la fois une partie privée et une partie publique"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "La clef a seulement une partie publique"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bits"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Pas de clef sélectionnée"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d clef sélectionnée"
msgstr[1] "%d clefs sélectionnées"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Nom d'utilisateur :"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Expire le :"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Confiance du propriétaire :"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Validité :"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Type de clef :"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Créée le :"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Détails"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Afficher les signatures d'un nom d'usager :"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "Signe"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Signatures"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Toutes les signatures"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Sous-clefs"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "_Clefs"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Signer clef"
@@ -2010,6 +2011,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "ID de clef"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2543,7 +2549,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2564,7 +2570,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2852,6 +2858,11 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr ""
+#~ "L'identificateur de clef est une suite de chiffres et de lettres servant "
+#~ "à identifier un certificat."
+
#, fuzzy
#~ msgid "Error"
#~ msgstr "Erreur GPA"
diff --git a/po/gpa.pot b/po/gpa.pot
index 38fd285..20a8611 100644
--- a/po/gpa.pot
+++ b/po/gpa.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gpa 0.9.9\n"
+"Project-Id-Version: gpa 0.9.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -41,12 +41,12 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
msgid "_File"
msgstr ""
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
msgid "_Edit"
msgstr ""
@@ -83,7 +83,7 @@ msgstr ""
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -100,11 +100,11 @@ msgstr ""
msgid "Cut the selection"
msgstr ""
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr ""
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr ""
@@ -120,11 +120,11 @@ msgstr ""
msgid "Keyring"
msgstr ""
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr ""
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr ""
@@ -199,13 +199,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr ""
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr ""
@@ -230,23 +230,23 @@ msgstr ""
msgid "years"
msgstr ""
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr ""
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr ""
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
msgid "(unknown)"
msgstr ""
@@ -278,7 +278,7 @@ msgstr ""
msgid "Change expiry date"
msgstr ""
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr ""
@@ -318,15 +318,15 @@ msgstr ""
msgid "Select all files"
msgstr ""
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr ""
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr ""
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr ""
@@ -366,7 +366,7 @@ msgstr ""
msgid "Open file manager"
msgstr ""
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
msgid "Open the card manager"
msgstr ""
@@ -406,31 +406,31 @@ msgstr ""
msgid "Please report bugs to <"
msgstr ""
-#: src/gpa.h:80
+#: src/gpa.h:84
msgid "_Windows"
msgstr ""
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr ""
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr ""
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr ""
-#: src/gpa.h:105
+#: src/gpa.h:109
msgid "Configure the application"
msgstr ""
-#: src/gpa.h:108
+#: src/gpa.h:112
msgid "_Backend Preferences"
msgstr ""
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -502,28 +502,28 @@ msgstr ""
msgid "Decrypting..."
msgstr ""
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr ""
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr ""
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr ""
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr ""
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr ""
@@ -532,45 +532,45 @@ msgstr ""
msgid "Encrypting..."
msgstr ""
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr ""
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr ""
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr ""
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr ""
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr ""
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr ""
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr ""
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr ""
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr ""
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -578,7 +578,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr ""
@@ -615,7 +615,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr ""
@@ -625,12 +625,15 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+msgid "Created"
msgstr ""
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
+
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr ""
@@ -691,100 +694,96 @@ msgstr ""
msgid "Verifying message ..."
msgstr ""
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr ""
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr ""
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
msgid "Algo"
msgstr ""
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr ""
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-msgid "Created"
-msgstr ""
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
msgid "Expires"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr ""
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr ""
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr ""
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr ""
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr ""
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr ""
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr ""
@@ -793,12 +792,12 @@ msgstr ""
msgid "User Names:"
msgstr ""
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr ""
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr ""
@@ -857,14 +856,22 @@ msgid ""
"%s will now try to recover from this error."
msgstr ""
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
"Do you want to overwrite it?"
msgstr ""
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+msgid "_Open"
+msgstr ""
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -873,211 +880,211 @@ msgid ""
"\n"
msgstr ""
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
msgstr ""
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr ""
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr ""
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr ""
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr ""
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr ""
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr ""
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr ""
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr ""
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr ""
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr ""
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr ""
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr ""
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr ""
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr ""
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr ""
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr ""
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, c-format
msgid "Bad signature by %s: %s"
msgstr ""
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, c-format
msgid "Bad signature by %s"
msgstr ""
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, c-format
msgid "Good signature by %s: %s"
msgstr ""
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, c-format
msgid "Good signature by %s"
msgstr ""
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, c-format
msgid "Uncertain signature by %s: %s"
msgstr ""
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, c-format
msgid "Uncertain signature by %s"
msgstr ""
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, c-format
msgid "Uncertain signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr ""
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr ""
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr ""
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr ""
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
msgstr ""
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr ""
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr ""
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr ""
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1088,35 +1095,35 @@ msgid ""
"%i secret keys unchanged"
msgstr ""
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1227,7 +1234,7 @@ msgstr ""
msgid "Change _passphrase"
msgstr ""
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr ""
@@ -1341,7 +1348,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr ""
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr ""
@@ -1361,52 +1368,44 @@ msgid ""
"a length of %d bits."
msgstr ""
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
msgstr ""
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr ""
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr ""
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr ""
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1416,250 +1415,254 @@ msgstr ""
msgid "No keys selected for signing."
msgstr ""
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
msgstr ""
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr ""
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
msgstr ""
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr ""
-#: src/keymanager.c:927
+#: src/keymanager.c:930
msgid "_Keys"
msgstr ""
-#: src/keymanager.c:929
+#: src/keymanager.c:932
msgid "_Server"
msgstr ""
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:950
+#: src/keymanager.c:953
msgid "_New key..."
msgstr ""
-#: src/keymanager.c:951
+#: src/keymanager.c:954
msgid "Generate a new key"
msgstr ""
-#: src/keymanager.c:952
+#: src/keymanager.c:955
msgid "_Delete keys"
msgstr ""
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr ""
-#: src/keymanager.c:954
+#: src/keymanager.c:957
msgid "_Sign Keys..."
msgstr ""
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr ""
-#: src/keymanager.c:956
+#: src/keymanager.c:959
msgid "Set _Owner Trust..."
msgstr ""
-#: src/keymanager.c:957
+#: src/keymanager.c:960
msgid "Set owner trust of the selected key"
msgstr ""
-#: src/keymanager.c:959
+#: src/keymanager.c:962
msgid "_Edit Private Key..."
msgstr ""
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr ""
-#: src/keymanager.c:962
+#: src/keymanager.c:965
msgid "_Import Keys..."
msgstr ""
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr ""
-#: src/keymanager.c:964
+#: src/keymanager.c:967
msgid "E_xport Keys..."
msgstr ""
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr ""
-#: src/keymanager.c:966
+#: src/keymanager.c:969
msgid "_Backup..."
msgstr ""
-#: src/keymanager.c:967
+#: src/keymanager.c:970
msgid "Backup key"
msgstr ""
-#: src/keymanager.c:971
+#: src/keymanager.c:974
msgid "_Retrieve Keys..."
msgstr ""
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
msgid "Re_fresh Keys"
msgstr ""
-#: src/keymanager.c:975
+#: src/keymanager.c:978
msgid "Refresh keys from server"
msgstr ""
-#: src/keymanager.c:977
+#: src/keymanager.c:980
msgid "_Send Keys..."
msgstr ""
-#: src/keymanager.c:978
+#: src/keymanager.c:981
msgid "Send keys to server"
msgstr ""
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr ""
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr ""
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr ""
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr ""
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr ""
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr ""
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr ""
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr ""
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
msgid "Key Manager"
msgstr ""
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
msgid "The key has both a smartcard based private part and a public part"
msgstr ""
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr ""
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr ""
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr ""
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr ""
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] ""
msgstr[1] ""
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
msgid "User name:"
msgstr ""
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr ""
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr ""
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
msgid "Key validity:"
msgstr ""
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
msgid "Key type:"
msgstr ""
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr ""
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr ""
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr ""
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Chain"
msgstr ""
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr ""
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr ""
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr ""
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Key"
msgstr ""
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr ""
@@ -1822,6 +1825,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr ""
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2315,7 +2323,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2336,7 +2344,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
diff --git a/po/ja.gmo b/po/ja.gmo
index 8847951..d12a513 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 46815f0..3e9ba41 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.6.1-cvs\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\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"
@@ -43,13 +43,13 @@ msgstr ""
msgid "Clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/�ե����� (_F)"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -92,7 +92,7 @@ msgstr "
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -111,12 +111,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "����ե������Ź沽����"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
#, fuzzy
msgid "Copy the selection"
msgstr "����ե������Ź沽����"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
#, fuzzy
msgid "Paste the clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
@@ -135,11 +135,11 @@ msgstr ""
msgid "Keyring"
msgstr "��«���ǥ���"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "�ե�����"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
@@ -222,13 +222,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "�Ϥ� (_Y)"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "������ (_N)"
@@ -253,23 +253,23 @@ msgstr "
msgid "years"
msgstr "ǯ"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "̵����"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "̤��ǧ"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "̤��ǧ"
@@ -303,7 +303,7 @@ msgstr "
msgid "Change expiry date"
msgstr "ͭ�����¤��ѹ�"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "����� (_C)"
@@ -344,16 +344,16 @@ msgstr ""
msgid "Select all files"
msgstr "�ե�����٤��Ĥ���"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "�ե�����"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
#, fuzzy
msgid "File Manager"
msgstr "�ե�����ޥ͡�����"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "�ե�����ϳ�����Ƥ��ޤ�"
@@ -401,7 +401,7 @@ msgstr "
msgid "Open file manager"
msgstr "�ե�����ޥ͡������"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "�ե�����ޥ͡������"
@@ -448,37 +448,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "���� <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/������ɥ� (_W)"
-#: src/gpa.h:83
+#: src/gpa.h:87
#, fuzzy
msgid "Open the keyring editor"
msgstr "��«���ǥ����� (�ǥե����)"
-#: src/gpa.h:85
+#: src/gpa.h:89
#, fuzzy
msgid "Open the file manager"
msgstr "�ե�����ޥ͡������"
-#: src/gpa.h:87
+#: src/gpa.h:91
#, fuzzy
msgid "Open the clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "����ե������Ź沽����"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/�Խ� (E)/���� (_E)"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -561,28 +561,28 @@ msgstr "
msgid "Decrypting..."
msgstr "���沽��..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, fuzzy, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "�ե����� \"%s\" �ˤ� OpenPGP �ǡ������ޤޤ�Ƥ��ޤ���"
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, fuzzy, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "�ե����� \"%s\" �ˤ� OpenPGP �ǡ������ޤޤ�Ƥ��ޤ���"
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, fuzzy, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "�ե����� \"%s\" �ˤ�ͭ���ʰŹ沽�ǡ������ޤޤ�Ƥ��ޤ���"
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, fuzzy, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "�ե����� \"%s\" �ˤ�ͭ���ʰŹ沽�ǡ������ޤޤ�Ƥ��ޤ���"
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "�ѥ��ե졼�����㤤�ޤ���"
@@ -591,47 +591,47 @@ msgstr "
msgid "Encrypting..."
msgstr "�Ź沽��..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "̤��ǧ�θ�"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
#, fuzzy
msgid "You are going to encrypt a document using the following key:"
msgstr "���θ���Ȥäƥե������Ź沽���褦�Ȥ��Ƥ��ޤ�:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "�ȤϤ��������θ������οͤ�°���Ƥ��뤫�ɤ����ϳμ¤ǤϤ���ޤ���"
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "<b>������</b>���θ���Ȥ������ΤǤ���?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "�˴��Ѥߤθ�"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "�Ĥ��� (_C)"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
#, fuzzy
msgid "The following key has been revoked by its owner:"
msgstr "�ʲ��θ��Ͻ�ͭ�Ԥˤ�ä��˴�����Ƥ��ޤ�:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "��äơ��Ź沽�˻Ȥ����ȤϤǤ��ޤ���"
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "���θ���ͭ�����¤� %s �Ǥ�:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -639,7 +639,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "��̾���븰�����ޤ���Ǥ���"
@@ -677,7 +677,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "�������դ���ޤ���Ǥ�����"
@@ -687,12 +687,16 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "�� ID"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "����"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "�桼��̾"
@@ -760,103 +764,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "������..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "���� ID"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "���ơ�����"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "���르�ꥺ��"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "������"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "����"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "�����ڤ�"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "��̾��ǽ"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "������ǽ"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "�Ź沽��ǽ"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "ǧ�ڲ�ǽ"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "�˴��Ѥ�"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "�����ڤ�"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "̵��"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "��̾�ʤ�"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "ͭ��"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "�桼��̾:"
@@ -865,12 +864,12 @@ msgstr "
msgid "User Names:"
msgstr "�桼��̾:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "�� ID:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "����:"
@@ -944,7 +943,7 @@ msgstr ""
"����Ϥ����餯 GPA �ΥХ��Ǥ���\n"
"�������ޥ��顼�����������ߤޤ���"
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -953,7 +952,16 @@ msgstr ""
"Ʊ���ե����� %s ������ޤ�\n"
"����ޤ���?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "����"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -967,7 +975,7 @@ msgstr ""
"**********************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -975,207 +983,207 @@ msgstr ""
"���Υե�����˥Хå����åפ���Ƥ��븰��:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "̤��ǧ"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "�Կ�"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "����"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "����"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "���"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "�Դ���"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "������ͭ��"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "�ʲ��θ��Υѥ���ɤ����Ϥ��Ʋ�����:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "�ѥ��ե졼�����㤤�ޤ����⤦���٤��ꤤ���ޤ�:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "�ѥ��ե졼��������"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[̤��ǧ�桼�� ID]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "����"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "����"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "�Ŀ�"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "�����奢��"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "�ݥ��ƥ���"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "��̾"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "��̾"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
#, fuzzy
msgid "Bad signature by unknown key"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "��̾"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "��̾"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
#, fuzzy
msgid "Uncertain signature by unknown key"
msgstr "̵���ʽ�̾������"
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr "��������̾���Ź沽�˻Ȥ��븰�Ǥ���"
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr "��������ӽ�̾�˻Ȥ��ޤ������Ź沽�ˤϻȤ��ʤ����Ǥ���"
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "�����ȰŹ沽�˻Ȥ��븰�Ǥ���"
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "�����ˤΤȤ��븰�Ǥ���"
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
msgstr "��̾����ӰŹ沽�˻Ȥ��ޤ����������ˤϻȤ��ʤ����Ǥ���"
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "��̾�ˤΤȤ��븰�Ǥ���"
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "�Ź沽�ˤΤȤ��븰�Ǥ���"
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "���θ��ϻȤ��ޤ���"
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1192,36 +1200,36 @@ msgstr ""
"%i �Ĥ���̩����ݡ��Ȥ��ޤ���\n"
"%i �Ĥ���̩����̵�ѹ��Ǥ�"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
#, fuzzy
msgid "Name is too short."
msgstr "̾����Ĺ��ޤ�"
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1352,7 +1360,7 @@ msgstr "
msgid "Change _passphrase"
msgstr "�ѥ��ե졼�����ѹ� (_P)"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "ͭ������"
@@ -1480,7 +1488,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "�Хå����åפκ��� (_B)"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "��� (_L)"
@@ -1505,7 +1513,7 @@ msgstr ""
"����ǤȤ��������ޤ���\n"
"���κ������������ޤ��������θ���̵���¤�ͭ���ǡ�Ĺ���� 1024 �ӥåȤǤ���"
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1513,48 +1521,39 @@ msgstr ""
"GnuPG �Ͽ����٥ǡ����١�����ƹ��ۤ��Ƥ��ޤ���\n"
"���Ф餯���Ԥ�����������"
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-#, fuzzy
-msgid "The key ID is a short number to identify a certificate."
-msgstr "�����ˤΤȤ��븰�Ǥ���"
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "��ͭ�Ԥο�����"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
#, fuzzy
msgid "Validity"
msgstr "����ͭ����"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1564,18 +1563,18 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "��̾���븰������Ƥ��ޤ���"
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
msgstr ""
"�ޤ���̩��������ޤ��������������ޤ��� (���侩)������Ȥ��ˤ��ޤ���?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "����������������� (_G)"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1583,263 +1582,267 @@ msgstr ""
"�ޤ���̩���ΥХå����åפ�����ޤ�����������Хå����åפ��ޤ��� (����"
"��)������Ȥ��ˤ��ޤ�����"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "����������Хå����åפ��� (_B)"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/�� (_K)"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/������ (_S)"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
#, fuzzy
msgid "Select all certificates"
msgstr "�������������� (_V)"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/�� (K)/�������... (_N)"
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "��������"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/������... (_D)"
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "���줿������"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/���˽�̾... (_S)"
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "���줿���˽�̾����"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/��ͭ�Ԥο����٤����... (_O)"
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "���줿������"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/��̩�����Խ�... (_E)"
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "���줿��̩�����Խ�"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "����ݡ���"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "����ݡ���"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/�������ݡ���... (_X)"
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "�������ݡ���"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/�Хå����å�... (_B)"
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "����Хå����å�"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/������ (S)/�������... (_R)"
-#: src/keymanager.c:972
+#: src/keymanager.c:975
#, fuzzy
msgid "Retrieve keys from server"
msgstr "�����������"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "������"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "�����������"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/���˽�̾... (_S)"
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "/����������... (_N)"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "�����Ǥθ��ꥹ�Ȥ�ɽ��"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "���ξܺ٤�ɽ��"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "�Խ�"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "���"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "��̾����"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "�������ݡ���"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "����ݡ���"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
#, fuzzy
msgid "Selected default key:"
msgstr "���줿�ǥե���Ȥθ�:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
#, fuzzy
msgid "No default key selected in the preferences."
msgstr "�ݸ��ե����뤬����Ƥ��ޤ���"
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "�ե�����ޥ͡�����"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "���θ�����̩���ȸ�����������"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "���θ�����̩���ȸ�����������"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "���θ��ϸ����������ʤ�"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u �ӥå�"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "��������Ƥ��ޤ���"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d �Ĥθ�������Ƥ��ޤ�"
msgstr[1] "%d �Ĥθ�������Ƥ��ޤ�"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "�桼��̾:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "ͭ������:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "��ͭ�Ԥο�����:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "����ͭ����:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "��������:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "������:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "�ܺ�"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "�桼��̾���Ф����̾��ɽ��"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "��̾��ǽ"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "��̾"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "���٤Ƥν�̾"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "����"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/�� (_K)"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "���˽�̾"
@@ -2029,6 +2032,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "�� ID"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2561,7 +2569,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2582,7 +2590,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2872,6 +2880,10 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "�����ˤΤȤ��븰�Ǥ���"
+
#~ msgid "Error"
#~ msgstr "���顼"
@@ -3575,9 +3587,6 @@ msgstr ""
#~ msgid "/File/C_heck"
#~ msgstr "/�ե����� (F)/�����å� (_H)"
-#~ msgid "Open"
-#~ msgstr "����"
-
#~ msgid " Decrypt "
#~ msgstr " ���沽 "
diff --git a/po/nl.gmo b/po/nl.gmo
index f5eddfd..464bc39 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index d5c50a4..36a2e0f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.5.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\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"
@@ -40,13 +40,13 @@ msgstr ""
msgid "Clipboard"
msgstr "Naar _klembord"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Bestand"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -89,7 +89,7 @@ msgstr "Ontsleutel het geselecteerde bestand"
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -108,12 +108,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "Versleutel het geselecteerde bestand"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
#, fuzzy
msgid "Copy the selection"
msgstr "Versleutel het geselecteerde bestand"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
#, fuzzy
msgid "Paste the clipboard"
msgstr "Naar _klembord"
@@ -132,11 +132,11 @@ msgstr ""
msgid "Keyring"
msgstr "Keyring Editor"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Bestanden"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "Naar _klembord"
@@ -218,13 +218,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Ja"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Nee"
@@ -249,23 +249,23 @@ msgstr "maanden"
msgid "years"
msgstr "jaren"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "vervalt nooit"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "onbekend"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "onbekend"
@@ -299,7 +299,7 @@ msgstr "Voorzie aub een correcte datum."
msgid "Change expiry date"
msgstr "Verander verval datum"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Annuleer"
@@ -340,16 +340,16 @@ msgstr ""
msgid "Select all files"
msgstr "Alle bestanden sluiten"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Bestand"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
#, fuzzy
msgid "File Manager"
msgstr "bestandsbeheerder"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Het bestand is reeds geopend."
@@ -397,7 +397,7 @@ msgstr "open keyring editor (standaard)"
msgid "Open file manager"
msgstr "open bestandsbeheerder"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Open de bestandsbeheerder"
@@ -444,37 +444,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "Rapporteer fouten aub naar <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_Vensters"
-#: src/gpa.h:83
+#: src/gpa.h:87
#, fuzzy
msgid "Open the keyring editor"
msgstr "open keyring editor (standaard)"
-#: src/gpa.h:85
+#: src/gpa.h:89
#, fuzzy
msgid "Open the file manager"
msgstr "Open de bestandsbeheerder"
-#: src/gpa.h:87
+#: src/gpa.h:91
#, fuzzy
msgid "Open the clipboard"
msgstr "Naar _klembord"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "Versleutel het geselecteerde bestand"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Bewerk/Voork_euren..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -557,28 +557,28 @@ msgstr "De sleutels werden naar de server gestuurd."
msgid "Decrypting..."
msgstr "Aan het ontsleutelen..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, fuzzy, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "Het bestand \"%s\" bevat geen OpenPGP data."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, fuzzy, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Het bestand \"%s\" bevat geen OpenPGP data."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, fuzzy, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "Het bestand \"%s\" bevat geen geldige versleutelde data."
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, fuzzy, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "Het bestand \"%s\" bevat geen geldige versleutelde data."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Verkeerd wachtwoord!"
@@ -587,47 +587,47 @@ msgstr "Verkeerd wachtwoord!"
msgid "Encrypting..."
msgstr "Aan het versleutelen..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Onbekende Sleutel"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
#, fuzzy
msgid "You are going to encrypt a document using the following key:"
msgstr "U gaat een bestand versleutelen met de volgende sleutel:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Hoewel, het is niet zeker dat de sleutel aan die persoon toebehoort."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Wil je <b>echt</b> deze sleutel gebruiken?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Teruggetrokken sleutel"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Sluiten"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
#, fuzzy
msgid "The following key has been revoked by its owner:"
msgstr "De volgende sleutel is gerevoceerd door de eigenaar:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "En kan niet gebruikt worden voor versleuteling."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "De volgende sleutel vervalt op %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -635,7 +635,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "U hebt geen sleutel geselecteerd voor ondertekening"
@@ -673,7 +673,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Geen sleutels gevonden."
@@ -683,12 +683,16 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "Sleutel ID:"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Maken"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Gebruiker naam"
@@ -760,103 +764,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Aan het verifieren..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "Subsleutels ID"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Status"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Algoritme"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Grootte"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Maken"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Vervallen"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Kan ondertekend worden"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Kan gecertifieerd worden"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Kan versleuteld worden"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Kan geauthenticeerd worden"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Terugtrekken"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Vervallen"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Uitgeschakeld"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Niet ondertekend"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Geldig"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Gebruiker naam:"
@@ -865,12 +864,12 @@ msgstr "Gebruiker naam:"
msgid "User Names:"
msgstr "Gebruikers Namen:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "Sleutel ID:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Vingerafdruk:"
@@ -944,7 +943,7 @@ msgstr ""
"Dit is waarschijnlijk een fout in GPA.\n"
"GPA zal nu proberen te herstellen van deze fout."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -953,7 +952,16 @@ msgstr ""
"Het bestand %s bestaat al.\n"
"Wilt u het bestand overschrijven?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "Openen"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -966,7 +974,7 @@ msgstr ""
"* Bewaar dit bestand aub in een veilige plaats. *\n"
"************************************************************************\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -974,184 +982,184 @@ msgstr ""
"De sleutel is gebackuped in dit bestand:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Onbekend"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Nooit"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Marginaal"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Volledig"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Ultiem"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Niet compleet"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Volledig geldig"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Geef aub het wachwoord in voor de volgende sleutel:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Verkeerd wachtwoord, probeer aub opnieuw:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Wachtwoord ingeven"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Onbekende gebruiker ID]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Slecht"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Algemeen"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Persoonlijk"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Gewoon"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Positief"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Ondertekeningen"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
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:1188
+#: src/gpgmetools.c:1221
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:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "De sleutel kan gebruikt worden voor certificatie en versleuteling."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1159,26 +1167,26 @@ msgstr ""
"De sleutel kan enkel gebruikt worden voor ondertekenen en encryptie, maar "
"niet voor certificatie."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "De sleutel kan alleen gebruikt worden voor ondertekenen."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "De sleutel kan alleen gebruikt worden voor versleuteling."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Deze sleutel is waardeloos."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1195,36 +1203,36 @@ msgstr ""
"%i geheime sleutels ge�mporteerd\n"
"%i geheime sleutels onveranderd"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
#, fuzzy
msgid "Name is too short."
msgstr "Naam te lang"
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1357,7 +1365,7 @@ msgstr "Bewerk sleutel"
msgid "Change _passphrase"
msgstr "Verkeerd wachtwoord!"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Verval datum"
@@ -1488,7 +1496,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Maak _backup kopie"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Doe het _later"
@@ -1515,53 +1523,44 @@ msgstr ""
"U heeft succesvol een sleutel genereert. De sleutel oneindig geldig en "
"heefeen lengte van 1024 bits."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
msgstr ""
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-#, fuzzy
-msgid "The key ID is a short number to identify a certificate."
-msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Eigenaars vertrouwen"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Geldigheid"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1571,7 +1570,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "Geen sleutels geselecteerd voor ondertekening."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1579,11 +1578,11 @@ msgstr ""
"U heeft nog geen geheime sleutel. Wil u er nu een genereren (aanbevolen) of "
"dit later doen?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_Genereer sleutel nu"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1591,263 +1590,267 @@ msgstr ""
"U heeft nog geen backup van uw geheime sleutel. Wil u uw sleutel nubackuppen "
"(aanbevolen) of dit later doen?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "_Backup sleutel nu"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/_Sleutels"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/_Server"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
#, fuzzy
msgid "Select all certificates"
msgstr "_genereerd terugtrekkings certificaat"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/Sleutels/_Nieuwe Sleutel..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "Genereer sleutel"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/_Verwijder sleutels...."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Verwijder de geselecteerde sleutel"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/_Onderteken Sleutels..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Onderteken de geselecteerde sleutel"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Verander _Eigenaars Vertrouwen...."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Verwijder de geselecteerde sleutel"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Bewerk Sleutel..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Bewerk de geselecteerde sleutel"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "Importeer sleutels"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importeer sleutels"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_xporteer Sleutels...."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Exporteer Sleutels"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/_Backup...."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "Sleutels Backuppen"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Server/_Haal sleutels...."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
#, fuzzy
msgid "Retrieve keys from server"
msgstr "Ontvang sleutel van server:"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "Verwijder sleutel"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "Ontvang sleutel van server:"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/_Onderteken Sleutels..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "Stel keyserver in"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Toon beperkte sleutellijst"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Toon Sleutel Details"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Bewerk"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "Wissen"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Ondertekenen"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Exporteer"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Importeer"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
#, fuzzy
msgid "Selected default key:"
msgstr "Selecteer Standaard Sleutel:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
#, fuzzy
msgid "No default key selected in the preferences."
msgstr "Geen sleutels geselecteerd voor export."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "bestandsbeheerder"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "De sleutel heeft een geheim en publiek deel"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "De sleutel heeft een geheim en publiek deel"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "De sleutel heeft enkel een publiek deel"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr ""
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Geen sleutels geselecteerd"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d sleutels geselecteerd"
msgstr[1] "%d sleutels geselecteerd"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Gebruiker naam:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Vervalt op:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Eigenaars Vertrouwen:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Sleutel geldigheid:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Sleutel Type:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Gemaakt op:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Details"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Controleer ondertekeningen van het geselecteerde bestand"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "Kan ondertekend worden"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Ondertekeningen"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Ondertekeningen"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Subsleutels"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/_Sleutels"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Onderteken Sleutel"
@@ -2040,6 +2043,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "Sleutel ID:"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2567,7 +2575,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2588,7 +2596,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2878,6 +2886,10 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
+
#~ msgid "Error"
#~ msgstr "Fout"
@@ -3585,9 +3597,6 @@ msgstr ""
#~ msgid "/File/C_heck"
#~ msgstr "/Bestand/C_heck"
-#~ msgid "Open"
-#~ msgstr "Openen"
-
#~ msgid ""
#~ "@Options:\n"
#~ " "
diff --git a/po/pl.gmo b/po/pl.gmo
index 5eb1722..041fe8a 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index b1e1619..7afbb0c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa-0.7\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\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"
@@ -42,13 +42,13 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Plik"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -91,7 +91,7 @@ msgstr "Deszyfruje wybrany plik"
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -110,12 +110,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "Szyfruje wybrany plik"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
#, fuzzy
msgid "Copy the selection"
msgstr "Szyfruje wybrany plik"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr ""
@@ -133,11 +133,11 @@ msgstr ""
msgid "Keyring"
msgstr "Edytor zbioru kluczy"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Pliki"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr ""
@@ -215,13 +215,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Tak"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Nie"
@@ -246,23 +246,23 @@ msgstr "miesięcy"
msgid "years"
msgstr "lat"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "nie traci ważności"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "nieznany"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "nieznany"
@@ -296,7 +296,7 @@ msgstr "Proszę podać prawidłową datę."
msgid "Change expiry date"
msgstr "Zmiana daty ważności"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr ""
@@ -337,16 +337,16 @@ msgstr ""
msgid "Select all files"
msgstr "Zamyka wszystkie pliki"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Plik"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
#, fuzzy
msgid "File Manager"
msgstr "menedżer plików"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Ten plik jest już otwarty"
@@ -394,7 +394,7 @@ msgstr "otwiera edytor zbioru kluczy (domyślne)"
msgid "Open file manager"
msgstr "otwiera okno menedżera plików"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Otwiera okno menedżera plików"
@@ -440,37 +440,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "Raporty o błędach wysyłaj do <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_Okna"
-#: src/gpa.h:83
+#: src/gpa.h:87
#, fuzzy
msgid "Open the keyring editor"
msgstr "otwiera edytor zbioru kluczy (domyślne)"
-#: src/gpa.h:85
+#: src/gpa.h:89
#, fuzzy
msgid "Open the file manager"
msgstr "Otwiera okno menedżera plików"
-#: src/gpa.h:87
+#: src/gpa.h:91
#, fuzzy
msgid "Open the clipboard"
msgstr "Otwiera okno menedżera plików"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "Szyfruje wybrany plik"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Edycja/_Ustawienia..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -554,28 +554,28 @@ msgstr "Klucze zostały wysłane na serwer."
msgid "Decrypting..."
msgstr "Odszyfrowywanie..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, fuzzy, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "Plik \"%s\" nie zawierał żadnych danych OpenPGP."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, fuzzy, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Plik \"%s\" nie zawierał żadnych danych OpenPGP."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, fuzzy, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "Plik \"%s\" nie zawierał zaszyfrowanych danych."
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, fuzzy, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "Plik \"%s\" nie zawierał zaszyfrowanych danych."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Niepoprawne hasło!"
@@ -584,47 +584,47 @@ msgstr "Niepoprawne hasło!"
msgid "Encrypting..."
msgstr "Szyfrowanie..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Nieznany klucz"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
#, fuzzy
msgid "You are going to encrypt a document using the following key:"
msgstr "Zamierzasz zaszyfrować plik za pomocą następującego klucza:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Nie ma jednak pewności że klucz należy do tej osoby."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Czy <b>naprawdę</b> chcesz użyć tego klucza?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Unieważniony klucz"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "Z_amknij"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
#, fuzzy
msgid "The following key has been revoked by its owner:"
msgstr "Ten klucz został unieważniony przez swojego właściciela:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "Nie można wykorzystywać tego klucza do szyfrowania."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "Ten klucz przekroczył swój termin ważności %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -632,7 +632,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Nie wybrano żadnego klucza do podpisywania"
@@ -674,7 +674,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Nie odnaleziono żadnych kluczy."
@@ -684,12 +684,16 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "ID klucza"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Utworzony dnia:"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Nazwa użytkownika"
@@ -757,103 +761,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Weryfikacja..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "Identyfikator podklucza"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Stan"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Algorytm"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Rozmiar"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Utworzony dnia:"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Po terminie ważności"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Można podpisywać"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Można poświadczać"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Można szyfrować"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Można autoryzować"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Unieważniony"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Po terminie ważności"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Wyłączone"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Brak podpisów"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Poprawny"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nazwa użytkownika:"
@@ -862,12 +861,12 @@ msgstr "Nazwa użytkownika:"
msgid "User Names:"
msgstr "Nazwy użytkownika:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "ID klucza:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Odcisk klucza:"
@@ -942,7 +941,7 @@ msgstr ""
"błędem w samym GPA.\n"
"Nastąpi teraz próba powrotu do normalnego działania GPA."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -951,7 +950,16 @@ msgstr ""
"Plik %s już istnieje.\n"
"Czy chcesz go nadpisać?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/Plik/_Otwórz"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -965,7 +973,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -973,184 +981,184 @@ msgstr ""
"Kopia zapasowa tego klucza znajduje się w pliku: \n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Nieznany"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Nigdy"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Marginalne"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Pełne"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Nieograniczone"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Niepełne"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "W pełni poprawny"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Proszę podać hasło dla następującego klucza:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Niewłaściwe hasło, proszę spróbować ponownie:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Wprowadź hasło"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Nieznany identyfikator użytkownika]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Zły"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Ogólne"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Nie sprawdzone"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Pobieżny"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Dokładne"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Wszystkie podpisy"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Wszystkie podpisy"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Podpis: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
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:1188
+#: src/gpgmetools.c:1221
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:1194
+#: src/gpgmetools.c:1227
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:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Ten klucz może być użyty tylko do certyfikatów."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1158,26 +1166,26 @@ msgstr ""
"Ten klucz może być użyty do podpisywania i szyfrowania, ale nie nadaję się "
"do wydawania certyfikatów."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Ten klucz może być użyty tylko do podpisywania."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Ten klucz może być użyty tylko do szyfrowania."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Ten klucz jest bezużyteczny."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1194,35 +1202,35 @@ msgstr ""
"%i tajnych kluczy zaimportowano\n"
"%i tajnych kluczy nie uległo zmianie"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1356,7 +1364,7 @@ msgstr "Edycja klucza"
msgid "Change _passphrase"
msgstr "Zmień _hasło"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Data końca ważności"
@@ -1486,7 +1494,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Utwórz kopię _zapasową"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Zrób to _później"
@@ -1514,7 +1522,7 @@ msgstr ""
"Twój klucz został poprawnie wygenerowany. Został on oznaczony jako poprawny "
"i ma długość 1024 bitów."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1522,48 +1530,39 @@ msgstr ""
"GnuPG przebudowuje bazę danych zaufania.\n"
"Może to zająć klika sekund."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-#, fuzzy
-msgid "The key ID is a short number to identify a certificate."
-msgstr "Ten klucz może być użyty tylko do certyfikatów."
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Zaufanie do właściciela"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
#, fuzzy
msgid "Validity"
msgstr "Poprawność klucza"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1573,7 +1572,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "Nie wybrano kluczy do podpisu."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1581,11 +1580,11 @@ msgstr ""
"Nie posiadasz jeszcze klucza prywatnego. Wygenerować taki klucz teraz "
"(zalecane), czy uczynić to później?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_Wygeneruj klucz teraz"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1593,261 +1592,265 @@ msgstr ""
"Nie posiadasz kopii zapasowej swojego klucza prywatnego. Sporządzić kopię "
"zapasową klucza teraz (zalecane), czy uczynić to później? "
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "_Sporządź kopię zapasową teraz"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/_Klucze"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/_Serwer"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Odświeża zbiór kluczy"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/Klucze/_Nowy Klucz..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "Wygeneruj klucz"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/_Usuń klucze..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Usuwa wybrany klucz"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/_Podpisz klucze..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Podpisuje wybrany klucz"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Ustaw poziom zaufania do właściciela..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Usuwa wybrany klucz"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Edytuj klucz prywatny..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Edytuje wybrany klucz prywatny"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "Importuje klucze"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importuje klucze"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_ksportuj klucze..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Eksportuje klucze"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/_Kopia zapasowa..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "Kopia zaspasowa kluczy"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Serwer/_Pobierz klucze..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "odświeża zbiór kluczy"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "/W_yślij klucze na serwer..."
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/_Podpisz klucze..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "/W_yślij klucze na serwer..."
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Pokazuje zwięzłą listę kluczy"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Pokazuje szczegółową listę kluczy"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Edycja"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
#, fuzzy
msgid "Delete"
msgstr "/Edycja/Wybierz _wszystko"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Podpisz"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Eksport"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Import"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
#, fuzzy
msgid "Selected default key:"
msgstr "Wybrano domyślny klucz"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "menedżer plików"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "Klucz posiada zarówno cześć publiczną jak i prywatną"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Klucz posiada zarówno cześć publiczną jak i prywatną"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Klucz posiada tylko część publiczną"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bit"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Nie wybrano żadnego klucza"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "wybranych kluczy - %d"
msgstr[1] "wybranych kluczy - %d"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Nazwa użytkownika:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Traci ważność:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Zaufanie do właściciela:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Poprawność klucza:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Rodzaj klucza:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Utworzony dnia:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Szczegóły"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Pokaż podpisy danego użytkownika:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "Można podpisywać"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Podpisy"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Wszystkie podpisy"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Podklucze"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/_Klucze"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Podpisz klucz"
@@ -2041,6 +2044,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "ID klucza"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2562,7 +2570,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2583,7 +2591,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2872,6 +2880,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "Ten klucz może być użyty tylko do certyfikatów."
+
+#, fuzzy
#~ msgid "Error"
#~ msgstr "Błąd GPA"
@@ -2948,9 +2960,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/Plik/Wy_czyść"
-#~ msgid "/File/_Open"
-#~ msgstr "/Plik/_Otwórz"
-
#, fuzzy
#~ msgid "/File/Save _As"
#~ msgstr "/Plik/Z_amknij"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 964ae90..7200c7e 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 833b48c..c093c2e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.6.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2003-01-20 18:39+0100\n"
"Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
"Language-Team: PORTUGUES <rmartini at cipsga.org.br>\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/Ar_quivo"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -90,7 +90,7 @@ msgstr "Desencriptar o arquivo selecionado"
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -109,12 +109,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "Encriptar o arquivo selecionado"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
#, fuzzy
msgid "Copy the selection"
msgstr "Encriptar o arquivo selecionado"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr ""
@@ -132,11 +132,11 @@ msgstr ""
msgid "Keyring"
msgstr "Editor do chaveiro digital"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Arquivos"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr ""
@@ -217,13 +217,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Sim"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_N�o"
@@ -248,23 +248,23 @@ msgstr "meses"
msgid "years"
msgstr "anos"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "jamais expira"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "desconhecido"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "desconhecido"
@@ -298,7 +298,7 @@ msgstr "Queira indicar uma data correta"
msgid "Change expiry date"
msgstr "Muda a data de expira��o"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Cancelar"
@@ -340,16 +340,16 @@ msgstr ""
msgid "Select all files"
msgstr "Abrir um arquivo"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Arquivo"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
#, fuzzy
msgid "File Manager"
msgstr "gerenciador de arquivos"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "O arquivo j� est� aberto"
@@ -397,7 +397,7 @@ msgstr "abre editor do chaveiro digital (padr
msgid "Open file manager"
msgstr "abre Gerenciador de arquivos"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Abrir Gerenciador de arquivos"
@@ -443,37 +443,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "Por favor envie os bugs para <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_Janelas"
-#: src/gpa.h:83
+#: src/gpa.h:87
#, fuzzy
msgid "Open the keyring editor"
msgstr "abre editor do chaveiro digital (padr�o)"
-#: src/gpa.h:85
+#: src/gpa.h:89
#, fuzzy
msgid "Open the file manager"
msgstr "Abrir Gerenciador de arquivos"
-#: src/gpa.h:87
+#: src/gpa.h:91
#, fuzzy
msgid "Open the clipboard"
msgstr "Abrir Gerenciador de arquivos"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "Encriptar o arquivo selecionado"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Editar/Pr_efer�ncias..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -556,28 +556,28 @@ msgstr ""
msgid "Decrypting..."
msgstr "_Desencriptar"
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, fuzzy, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "O arquivo \"%s\" n�o cont�m dados encriptados v�lidos."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, fuzzy, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "O arquivo \"%s\" n�o cont�m dados encriptados v�lidos."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, fuzzy, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "O arquivo \"%s\" n�o cont�m dados encriptados v�lidos."
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, fuzzy, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "O arquivo \"%s\" n�o cont�m dados encriptados v�lidos."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Senha errada!"
@@ -587,47 +587,47 @@ msgstr "Senha errada!"
msgid "Encrypting..."
msgstr "Encriptar"
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Chave desconhecida"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
#, fuzzy
msgid "You are going to encrypt a document using the following key:"
msgstr "Voc� est� encriptando um arquivo usando a seguinte chave:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "No entanto, n�o � certo que esta chave perten�a a esta pessoa."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Voc� <b>realmente</b> quer usar esta chave?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Chave revogada"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Fechar"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
#, fuzzy
msgid "The following key has been revoked by its owner:"
msgstr "A seguinte chave foi revogada pelo seu propriet�rio:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "E n�o pode ser usada para encripta��o."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "A seguinte chave expira em %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -635,7 +635,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Nenhuma chave selecionada para assinatura"
@@ -676,7 +676,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Nenhuma chave foi encontrada."
@@ -686,12 +686,17 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "Key ID"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Criado"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+#, fuzzy
+msgid "The Creation Date is the date the certificate was created."
+msgstr "Certificado de revoga��o criado."
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Nome do Usu�rio"
@@ -758,107 +763,102 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Verificar"
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
#, fuzzy
msgid "Subkey ID"
msgstr "Key ID"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Status"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "_Algoritmo:"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr ""
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Criado"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Expirado"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
#, fuzzy
msgid "Can sign"
msgstr "_assinar"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
#, fuzzy
msgid "Can encrypt"
msgstr "encriptado"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr ""
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Revogado"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Expirado"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Desabilitado"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
#, fuzzy
msgid "Unsigned"
msgstr "assinado"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "V�lido"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nome do Usu�rio:"
@@ -867,12 +867,12 @@ msgstr "Nome do Usu
msgid "User Names:"
msgstr "Nomes de Usu�rio:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "Key ID:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Impress�o digital:"
@@ -939,7 +939,7 @@ msgid ""
"%s will now try to recover from this error."
msgstr ""
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -948,7 +948,16 @@ msgstr ""
"O arquivo %s j� existe.\n"
"Voc� quer sobrescrev�-lo?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "Abrir"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -964,7 +973,7 @@ msgstr ""
"****************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -972,209 +981,209 @@ msgstr ""
"A chave copiada por seguran�a para este arquivo �:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "desconhecido"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Nunca"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Moderado"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Completo"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Inteira"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Incompleto"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Totalmente v�lido"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Queria indicar a senha para a seguinte chave:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Senha errada, por favor tente de novo:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Entrar com a senha"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[User ID desconhecido]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Ruim"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr ""
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr ""
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr ""
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr ""
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Todas as assinaturas"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Todas as assinaturas"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Assinaturas"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr ""
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr ""
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
#, fuzzy
msgid "The key can be used for certification and encryption."
msgstr "E n�o pode ser usada para encripta��o."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
#, fuzzy
msgid "The key can be used only for certification."
msgstr "E n�o pode ser usada para encripta��o."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
msgstr ""
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
#, fuzzy
msgid "The key can be used only for signing."
msgstr "Nenhuma chave selecionada para assinar."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
#, fuzzy
msgid "The key can be used only for encryption."
msgstr "E n�o pode ser usada para encripta��o."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr ""
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1191,36 +1200,36 @@ msgstr ""
"%i chave secreta importada\n"
"%i chave secreta sem altera��es"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
#, fuzzy
msgid "Name is too short."
msgstr "Nome muito longo"
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1350,7 +1359,7 @@ msgstr "Editar a chave"
msgid "Change _passphrase"
msgstr "Mudar _senha"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Date de expira��o"
@@ -1482,7 +1491,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Criar uma _c�pia de backup"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Faz�-lo mais _tarde"
@@ -1510,54 +1519,44 @@ msgstr ""
"Voc� gerou com sucesso uma chave. A chave tem uma validade indefinida e tem "
"um tamanho de 1024 bits."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
msgstr ""
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-#, fuzzy
-msgid "The key ID is a short number to identify a certificate."
-msgstr "E n�o pode ser usada para encripta��o."
-
-#: src/keylist.c:641
-#, fuzzy
-msgid "The Creation Date is the date the certificate was created."
-msgstr "Certificado de revoga��o criado."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Confian�a no propriet�rio"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Validade"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1567,7 +1566,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "Nenhuma chave selecionada para assinar."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1575,11 +1574,11 @@ msgstr ""
"Voc� n�o tem ainda uma chave privada. Voc� desejar gerar uma agora "
"(recomendado) ou faz�-lo mais tarde?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "_Gerar chave agora"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1587,265 +1586,269 @@ msgstr ""
"Voc� n�o tem uma c�pia de backup de sua chave privada. Voc� quer fazer isso "
"agora (recomendado) ou fazer mais tarde?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "_Backup de chave agora"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/_Chaves"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "_Nunca"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
#, fuzzy
msgid "Select all certificates"
msgstr "Gerar certificado de revoga��o"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
#, fuzzy
msgid "Refresh the keyring"
msgstr "_Chaveiro de chaves secretas"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/Chaves/_Nova Chave..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "Gerar chave"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/_Apagar Chaves..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Remover a chave selecionada"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/A_ssinar Chaves..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Assinar a chave selecionada"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/A_lterar a confiabilidade..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Remover a chave selecionada"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Editar Chave Privada..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Editar a chave privada selecionada"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "Importar chaves"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importar chaves"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_xportar Chaves..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Exportar Chaves"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/_Backup..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "Backup de chaves"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Chaves/_Apagar Chaves..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
#, fuzzy
msgid "Retrieve keys from server"
msgstr "Receber chave de _servidor:"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "_Chaveiro de chaves secretas"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "Receber chave de _servidor:"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/A_ssinar Chaves..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "_Servidor de chave:"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Mostrar resumo da lista de chaves"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Mostrar detalhes da chave"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Editar"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "_Apagar"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Assinar"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Exportar"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Importar"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
#, fuzzy
msgid "Selected default key:"
msgstr "Chave default selecionada:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
#, fuzzy
msgid "No default key selected in the preferences."
msgstr "Nenhum arquivo selecionado para ser protegido"
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "gerenciador de arquivos"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "A chave tem ao mesmo tempo uma parte privada e p�blica"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "A chave tem ao mesmo tempo uma parte privada e p�blica"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "A chave tem apenas uma parte p�blica"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, fuzzy, c-format
msgid "%s %u bits"
msgstr "%s %li bits"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Nenhuma chave selecionada"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d chaves selecionadas"
msgstr[1] "%d chaves selecionadas"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Nome do Usu�rio:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Expira em:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Confian�a no propriet�rio:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Validade da chave:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Tipo de chave:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Criada em:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Detalhes"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Mostrar assinaturas no nome do usu�rio:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "_assinar"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Assinaturas"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Todas as assinaturas"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Subkeys"
msgstr "Key ID"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/_Chaves"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Assinar chave"
@@ -2044,6 +2047,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "Key ID"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2573,7 +2581,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2594,7 +2602,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2883,6 +2891,10 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "E n�o pode ser usada para encripta��o."
+
#~ msgid "Error"
#~ msgstr "Erro"
@@ -3605,9 +3617,6 @@ msgstr ""
#~ msgid "/File/C_heck"
#~ msgstr "/Arquivo/Abri_r"
-#~ msgid "Open"
-#~ msgstr "Abrir"
-
#~ msgid ""
#~ "@Options:\n"
#~ " "
diff --git a/po/ru.gmo b/po/ru.gmo
index 3296167..b8751d9 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 909fa03..4a0277b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.8\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2011-12-12 10:17+0100\n"
"Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
"Language-Team: Russian <moscow at hro.org>\n"
@@ -43,13 +43,13 @@ msgstr "Сохранить как..."
msgid "Clipboard"
msgstr "Буфер"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Файл"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -92,7 +92,7 @@ msgstr "Расшифровать выбранный текст"
msgid "Close the buffer"
msgstr "Очистить буфер"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -110,11 +110,11 @@ msgstr ""
msgid "Cut the selection"
msgstr "Вырезать выделенное в буфер"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "Копировать выделенное в буфер"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "Вставить из буфера"
@@ -131,11 +131,11 @@ msgstr ""
msgid "Keyring"
msgstr "Ключи"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Файлы"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "Буфер"
@@ -213,13 +213,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "Да"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "Нет"
@@ -244,23 +244,23 @@ msgstr "месяцев"
msgid "years"
msgstr "лет"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "неогр."
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "неизвестно"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "неизвестно"
@@ -283,7 +283,7 @@ msgstr "Подписать _как"
#: src/encryptdlg.c:228 src/filesigndlg.c:241
msgid "A_rmor"
-msgstr "_Защитить"
+msgstr "_Упаковка в текст"
#: src/expirydlg.c:64
msgid "Please provide a correct date."
@@ -293,7 +293,7 @@ msgstr "Пожалуйста, введите корректную дату."
msgid "Change expiry date"
msgstr "Изменить срок годности"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "От_мена"
@@ -334,15 +334,15 @@ msgstr ""
msgid "Select all files"
msgstr "Закрыть все файлы"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Файл"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "Менеджер _файлов"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Файл уже открыт."
@@ -388,7 +388,7 @@ msgstr "Открыть менеджер ключей (по умолчанию)"
msgid "Open file manager"
msgstr "Открыть менеджер файлов"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Открыть менеджер файлов"
@@ -431,34 +431,34 @@ msgstr "Графическая оболочка к GnuPG"
msgid "Please report bugs to <"
msgstr "Об ошибках сообщайте <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_Окно"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "Открыть менеджер ключей"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "Открыть менеджер файлов"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "Открыть буфер"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "Вырезать выделенное в буфер"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Правка/Настройки _шифр. программы..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -512,6 +512,8 @@ msgstr "Ключи экспортированы в %s."
#: src/gpaexportop.c:219
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
+"Выбраны сертификаты разных типов, то есть сертификаты OpenPGP и X.509. "
+"Выберите, пожалуйста, сертификаты одного типа."
#: src/gpaexportserverop.c:146
#, fuzzy, c-format
@@ -541,28 +543,28 @@ msgstr "Ключи успешно отправлены на сервер."
msgid "Decrypting..."
msgstr "Расшифровка..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "\"%s\" не содержит данных OpenPGP."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Файл \"%s\" не содержит данных OpenPGP."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "\"%s\" не содержит зашифрованных данных."
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "Файл \"%s\" не содержит зашифрованных данных."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Неверный пароль!"
@@ -571,45 +573,45 @@ msgstr "Неверный пароль!"
msgid "Encrypting..."
msgstr "Шифрование..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Неизвестный ключ"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "Файл будет зашифрован ключом:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Однако нет уверенности, что ключ принадлежит именно этому человеку."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Вы <b><действительно уверены/b>, что хотите использовать этот ключ? "
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Отзыв ключа"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Закрыть"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "Ключ отозван владельцем:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "Он не может использоваться для шифрования."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "Срок годности ключа истек %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -617,7 +619,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Не выбран ключ для подписи"
@@ -659,7 +661,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Ключи не обнаружены."
@@ -668,15 +670,20 @@ msgid ""
"Invalid time given.\n"
"(you may not set the expiration time to the past.)"
msgstr ""
-"Некорректная дата.\n"
-"(Нельзя устанавливать срок годности задним числом.)"
+"Неправильная дата\n"
+"(нельзя устанавливать истекший срок годности)."
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "ID ключа"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Создан:"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+#, fuzzy
+msgid "The Creation Date is the date the certificate was created."
+msgstr "Срок годности определяет продолжительность действия сертификата."
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Имя"
@@ -744,103 +751,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Проверка..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "ID подключа"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Статус"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Алгоритм"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Размер"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Создан:"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Истек"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Может подпис."
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Может сертиф."
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Может шифр."
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Может авториз."
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Отозван"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Истек"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Отключен"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
-msgstr "Неподписан"
+msgstr "Не подписан"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Достоверно"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Имя:"
@@ -849,12 +851,12 @@ msgstr "Имя:"
msgid "User Names:"
msgstr "Имена:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "ID ключа:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Отпечаток:"
@@ -920,15 +922,15 @@ msgid ""
"This is either an installation problem or a bug in %s.\n"
"%s will now try to recover from this error."
msgstr ""
-"Неизвестная ошибка в библиотеке GPGME.\n"
-"Сообщение ошибки:\n"
+"Неожиданная ошибка в библиотеке GPGME в %s:%i.\n"
+"Сообщение об ошибке:\n"
"\n"
"\t%s\n"
"\n"
-"Возможно, ошибка в программе GPA.\n"
-"GPA попытатется возобновить свою работоспособность."
+"Это проблема установки либо ошибка в %s.\n"
+"%s попытается продолжить работу."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -937,7 +939,16 @@ msgstr ""
"Файл %s уже существует.\n"
"Перезаписать?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/Файл/_Открыть"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -951,7 +962,7 @@ msgstr ""
"****************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -959,183 +970,183 @@ msgstr ""
"Резервная копия сохранена в файле:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Неизвестно"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Никогда"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Ограниченное"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Полное"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Абсолютное"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Не полностью"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Полностью достоверен"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Введите пароль для доступа к ключу:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Неверный пароль, пожалуйста, еще раз:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Введите пароль"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[Нет]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Неизвестный ID пользователя]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Плохой"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Общий"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Персон."
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Случайн."
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Позитив."
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Все подписи"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Все подписи"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Подпись: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr ""
"Ключ может быть использован для сертифицирования, подписи и шифрования."
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr ""
"Ключ может быть использован для сертифицирования и подписи, но не для "
"шифрования."
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "Ключ может быть использован для сертифицирования и шифрования."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Ключ может быть использован только для сертифицирования."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1143,26 +1154,26 @@ msgstr ""
"Ключ может быть использован для подписи и шифрования, но не для "
"сертифицирования."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Ключ может быть использован только для подписи."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Ключ может быть использован только для шифрования."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Данный ключ бесполезен/неприменим."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1179,36 +1190,36 @@ msgstr ""
"Импортировано закрытых ключей: %i\n"
"Не изменено закрытых ключей: %i"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
#, fuzzy
msgid "You must enter a name."
msgstr "Введите ID пользователя."
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1298,10 +1309,10 @@ msgid ""
"\n"
"Are you really sure you want to delete it?"
msgstr ""
-"Если вы удалите этот ключ, то не сможете прочитать\n"
+"Если удалить этот ключ, нельзя будет читать\n"
"зашифрованные им сообщения.\n"
"\n"
-"Удалить ключ?"
+"Все равно удалить?"
#: src/keydeletedlg.c:91
msgid "Remove Key"
@@ -1340,7 +1351,7 @@ msgstr "Редактировать ключ"
msgid "Change _passphrase"
msgstr "Изменить пароль"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Срок годности"
@@ -1472,7 +1483,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Создать резервную копию"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "Позже"
@@ -1500,7 +1511,7 @@ msgstr ""
"Создание ключа успешно завершено. Новый ключ имеет абсолютную достоверность "
"и длину 1024 бит."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1508,44 +1519,35 @@ msgstr ""
"GnuPG перестраивает базу с записями об уровне доверия.\n"
"Это может занять несколько секунд."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr "ID ключа - короткий номер для идентификации сертификата."
-
-#: src/keylist.c:641
-#, fuzzy
-msgid "The Creation Date is the date the certificate was created."
-msgstr "Срок годности определяет продолжительность действия сертификата."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr "Срок годности определяет продолжительность действия сертификата."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Доверие владельцу"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-"Доверие владельцу - значение, устанавливаемое вами. Вы определяете, "
-"насколько доверяете владельцу сертификата подписывать другие сертификаты. "
-"(Актуально только для OpenPGP)."
+"Доверие владельцу устанавливается Вами. Оно определяет, насколько Вы "
+"доверяете владельцу сертификата подписывать другие сертификаты. Имеет смысл "
+"только для OpenPGP."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Достоверность"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1553,7 +1555,7 @@ msgstr ""
"Достоверность - уровень доверия к данному сертификату (насколько можно быть "
"уверенным, что сертификат действительно принадлежит данному лицу)."
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1563,7 +1565,7 @@ msgstr "Имя владельца сертификата и (часто) его
msgid "No keys selected for signing."
msgstr "Не выбран ключ для подписи."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1571,11 +1573,11 @@ msgstr ""
"У вас пока нет закрытого ключа. Хотите создать его сейчас (рекомендуется) "
"или позже?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "Создать ключ"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1583,197 +1585,197 @@ msgstr ""
"Вы еще не сделали резервную копию закрытого ключа. Хотите сделать ее сейчас "
"(рекомендуется) или позже?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "Создать резервную копию"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/_Ключи"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/_Сервер"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Обновить связку ключей"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/Ключи/_Создать..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "Генерация ключа"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/Удалить ключи..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Удалить выбранный ключ"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/Подписать ключи..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Подписать выбранный ключ"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Доверие владельцу..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Удалить выбранный ключ"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/Редактировать закрытый ключ..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Правка выделенного закрытого ключа"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "Импорт ключей"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Импорт ключей"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/Экспортировать ключи..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Экспорт ключей"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/Резервная копия..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "Создать резервную копию"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Сервер/_Загрузить ключи..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "обновить связку ключей"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "/Отправить на сервер..."
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/Подписать ключи..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "/Отправить на сервер..."
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Краткий список ключей"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Подробный список ключей"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Правка"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
#, fuzzy
msgid "Delete"
msgstr "/Правка/_Удалить"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Подписать"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Экспорт"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Импорт"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "Ключ по умолчанию:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "В настройках не выбран ключ по умолчанию."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "Менеджер _файлов"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "Закрытый и открытый ключи"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Закрытый и открытый ключи"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Только открытый ключ"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u бит"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Не выбран ключ"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
@@ -1781,63 +1783,67 @@ msgstr[0] "%d ключ выбран"
msgstr[1] "%d ключа выбрано"
msgstr[2] "%d ключей выбрано"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Имя:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Годен до:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Доверие владельцу:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Достоверность ключа:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Тип ключа:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Создан:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Подробно"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Показать подписи имени владельца:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "Может подпис."
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Подписи"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Все подписи"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Подключи"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/_Ключи"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Подпись ключа"
@@ -2025,6 +2031,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "ID ключа"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2150,7 +2161,7 @@ msgstr "Ключ уже существует на сервере"
#: src/server-access.c:322
msgid "Key incomplete"
-msgstr "Ключ неполный"
+msgstr "Ключ неполон"
#: src/server-access.c:325
msgid "Could not contact keyserver"
@@ -2167,7 +2178,7 @@ msgid ""
"Please wait."
msgstr ""
"Подключение к серверу \"%s\".\n"
-"Подождите, пожалуйста."
+"Подождите."
#: src/server-access.c:387 src/server-access.c:407
#, c-format
@@ -2328,7 +2339,7 @@ msgstr "Уровень"
#: src/verifydlg.c:116
msgid "Verify documents"
-msgstr "Проверить файлы"
+msgstr "Проверить документы"
#: src/verifydlg.c:235
msgid "Expired Key"
@@ -2494,6 +2505,15 @@ msgstr ""
#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
+"<b>Разблокировка PIN</b>\n"
+"\n"
+"Счетчик попыток PIN обратился в ноль, но был установлен код сброса.\n"
+"\n"
+"Код сброса сходен с PUK (кодом разблокировки PIN), с его помощью можно "
+"разблокировать PIN, не зная административного PIN.\n"
+"\n"
+"Если продолжить, нужно будет ввести текущее значение <b>кода сброса</b>, а "
+"затем новое значение PIN, повторив его в ответ на другой запрос."
#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
@@ -2513,6 +2533,18 @@ msgstr "Подписать выбранный файл"
#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
+"<b>Изменение PIN</b>\n"
+"\n"
+"Если продолжить, нужно будет ввести текущее значение PIN, а затем новое "
+"значение, повторив его в ответ на другой запрос.\n"
+"\n"
+"Ввод неверного значения PIN уменьшает счетчик попыток. Если счетчики попыток "
+"PIN и кода сброса одновременно стали равны нулю, PIN все еще можно сбросить "
+"с помощью административного PIN.\n"
+"\n"
+"На новых стандартных картах PIN установлен равным <i>123456</i>. Однако "
+"издатель карты мог инициализировать карту другим значением PIN. Сверьтесь с "
+"инструкциями своего издателя."
#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
@@ -2521,6 +2553,13 @@ msgstr ""
#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
+"<b>Изменение кода сброса</b>\n"
+"\n"
+"Код сброса сходен с кодом разблокировки (PUK) и применяется для "
+"разблокировки PIN без необходимости прибегать к административному PIN.\n"
+"\n"
+"Если продолжить, нужно будет ввести текущее значение PIN, а затем новое "
+"значение кода сброса, повторив его в ответ на другой запрос."
#: src/cm-openpgp.c:1082
msgid ""
@@ -2535,6 +2574,19 @@ msgid ""
"Code</b> and then to enter a new value for the PIN and repeat that new value "
"at another prompt."
msgstr ""
+"<b>Сброс PIN или кода сброса</b>\n"
+"\n"
+"Если счетчики попыток PIN и кода сброса одновременно стали равны нулю, "
+"сбросить их можно, только если есть доступ к административному PIN.\n"
+"\n"
+"На новых стандартных картах административный PIN установлен равным "
+"<i>12345678</i>. Однако издатель карты мог инициализировать карту другим "
+"значением административного PIN, известным только издателю. Сверьтесь с "
+"инструкциями своего издателя.\n"
+"\n"
+"Если продолжить, нужно будет ввести текущее значение <b>административного "
+"PIN</b>, а затем новое значение PIN или кода сброса, повторив его в ответ на "
+"другой запрос."
#: src/cm-openpgp.c:1096
msgid ""
@@ -2545,7 +2597,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2566,7 +2618,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2713,6 +2765,15 @@ msgstr ""
#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
+"<b>Смена PIN или PUK</b>\n"
+"\n"
+"Если продолжить, нужно будет ввести текущее значение, а затем новое "
+"значение, повторив его в ответ на другой запрос.\n"
+"\n"
+"Ввод неверного текущего значения уменьшает счетчик попыток. Если счетчики "
+"попыток PIN и соответствующего PUK одновременно стали равны нулю, то ключи, "
+"которыми они управляют, непригодны для пользования, и разблокировать их "
+"невозможно!"
#: src/cm-netkey.c:142
msgid "blocked"
@@ -2735,6 +2796,18 @@ msgid ""
"\n"
"If you are unsure what to do, just click the button."
msgstr ""
+"<b>Сброс PUK</b>\n"
+"\n"
+"Хотя <i>PUK</i> означает <i>код разблокировки PIN</i>, TCOS, операционная "
+"система карты NetKey, реализует его как альтернативный PIN; таким образом, "
+"PUK можно разблокировать с помощью PIN.\n"
+"\n"
+"Если PUK заблокирован (счетчик попыток снизился до нуля), его можно "
+"разблокировать с помощью незаблокированного PIN. Тогда счетчик попыток снова "
+"устанавливается в первоначальное значение.\n"
+"\n"
+"Если продолжить, нужно будет ввести текущее значение PIN, а затем новое "
+"значение для заблокированного PUK, повторив его в ответ на другой запрос."
#: src/cm-netkey.c:596
#, fuzzy
@@ -2855,6 +2928,9 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "ID ключа - короткий номер для идентификации сертификата."
+
#, fuzzy
#~ msgid "Error"
#~ msgstr "Ошибка GPA"
@@ -2931,9 +3007,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/Файл/О_чистить"
-#~ msgid "/File/_Open"
-#~ msgstr "/Файл/_Открыть"
-
#~ msgid "/File/Save _As"
#~ msgstr "/Файл/Со_хранить как"
diff --git a/po/sv.gmo b/po/sv.gmo
index 52d2157..5f20e0e 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index e1d21e1..edc6d4a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2011-12-12 10:13+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -42,12 +42,12 @@ msgstr "Spara som..."
msgid "Clipboard"
msgstr "Urklipp"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
msgid "_File"
msgstr "_Arkiv"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
msgid "_Edit"
msgstr "R_edigera"
@@ -84,7 +84,7 @@ msgstr "Dekryptera bufferttexten"
msgid "Close the buffer"
msgstr "Stäng bufferten"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr "Avsluta programmet"
@@ -101,11 +101,11 @@ msgstr "Gör om senaste ångrade åtgärden"
msgid "Cut the selection"
msgstr "Klipp ut markeringen"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
msgstr "Kopiera markeringen"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr "Klistra in urklipp"
@@ -121,11 +121,11 @@ msgstr "Välj hela dokumentet"
msgid "Keyring"
msgstr "Nyckelring"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Filer"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
#, fuzzy
msgid "Card"
msgstr "Urklipp"
@@ -204,13 +204,13 @@ msgid "Configure backend to use a keyserver?"
msgstr "Konfigurera bakändesprogram"
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Ja"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Nej"
@@ -236,23 +236,23 @@ msgstr "månader"
msgid "years"
msgstr "år"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "går aldrig ut"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "okänt"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "okänt"
@@ -285,7 +285,7 @@ msgstr "Ange ett korrekt datum."
msgid "Change expiry date"
msgstr "Ändra utgångsdatum"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr "_Avbryt"
@@ -325,15 +325,15 @@ msgstr "Stäng fönstret"
msgid "Select all files"
msgstr "Markera alla filer"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Arkiv"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
msgstr "Filhanterare"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Filen är redan öppnad."
@@ -374,7 +374,7 @@ msgstr "Öppna nyckelringsredigeraren (standard)"
msgid "Open file manager"
msgstr "Öppna filhanteraren"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Öppna filhanteraren"
@@ -416,31 +416,31 @@ msgstr "Grafiskt användargränssnitt till GnuPG"
msgid "Please report bugs to <"
msgstr "Rapportera fel till <"
-#: src/gpa.h:80
+#: src/gpa.h:84
msgid "_Windows"
msgstr "_Fönster"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
msgstr "Öppna nyckelringsredigeraren"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
msgstr "Öppna filhanteraren"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
msgstr "Öppna urklipp"
-#: src/gpa.h:105
+#: src/gpa.h:109
msgid "Configure the application"
msgstr "Konfigurera programmet"
-#: src/gpa.h:108
+#: src/gpa.h:112
msgid "_Backend Preferences"
msgstr "Inställningar för bakände"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr "Konfigurera bakändesprogram"
@@ -523,28 +523,28 @@ msgstr "Nycklarna har skickats till servern."
msgid "Decrypting..."
msgstr "Dekrypterar..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "\"%s\" innehöll ingen OpenPGP-data."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "Filen \"%s\" innehöll ingen OpenPGP-data."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "\"%s\" innehöll ingen giltig krypterad data."
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "Filen \"%s\" innehöll ingen giltig krypterad data."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Fel lösenfras!"
@@ -553,45 +553,45 @@ msgstr "Fel lösenfras!"
msgid "Encrypting..."
msgstr "Krypterar..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Okänd nyckel"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
msgstr "Du är på väg att kryptera ett dokument med följande nyckel:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Det är dock inte säkert om nyckeln verkligen tillhör denna personen."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Vill du <b>verkligen</b> använda denna nyckel?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Spärrad nyckel"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Stäng"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "Följande nyckel har spärrats av sin ägare:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "och kan inte användas för kryptering."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "Följande nyckel gick ut den %s:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -602,7 +602,7 @@ msgstr ""
"OpenPGP och X.509-certifikat. Försäkra dig om att endast välja certifikat av "
"samma typ."
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "Du valde ingen nyckel för signering"
@@ -644,7 +644,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Inga nycklar hittades."
@@ -656,12 +656,17 @@ msgstr ""
"Ogiltig tid angiven.\n"
"(du kan inte ställa in utgångsdatumet till dåtid.)"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "Nyckelidentitet"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Skapad den:"
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:92 src/keylist.c:623
+#, fuzzy
+msgid "The Creation Date is the date the certificate was created."
+msgstr "Utgångsdatum är det datum som certifikatet är giltigt fram till."
+
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Användarnamn"
@@ -727,103 +732,98 @@ msgstr "Meddelandesignering"
msgid "Verifying message ..."
msgstr "Validerar meddelande..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "Undernyckelsidentitet"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Status"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Algoritm"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Storlek"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Skapad den:"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Utgången"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "Kan signera"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Kan certifiera"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "Kan kryptera"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Kan authentisera"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Spärrad"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Utgången"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Inaktiverad"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "Osignerad"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Giltig"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Användarnamn:"
@@ -832,12 +832,12 @@ msgstr "Användarnamn:"
msgid "User Names:"
msgstr "Användarnamn:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "Nyckelidentitet:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Fingeravtryck:"
@@ -911,7 +911,7 @@ msgstr ""
"Det här är antagligen ett fel i GPA.\n"
"GPA kommer nu att försöka komma över felet."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -920,7 +920,16 @@ msgstr ""
"Filen %s finns redan.\n"
"Vill du skriva över den?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/Arkiv/_Öppna"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -934,7 +943,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -942,208 +951,208 @@ msgstr ""
"Nyckeln som säkerhetskopierats till denna fil är:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Okänd"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Aldrig"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "Marginell"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Fullständig"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Förbehållslös"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Ofullständigt"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Fullständigt giltig"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "Ange lösenfrasen för följande nyckel:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Felaktig lösenfras, försök igen:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "Ange lösenfras"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr "[Ingen]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Okänd användaridentitet]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "Felaktigt"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Allmänt"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Personligen"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Flyktigt"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Helt säkert"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, c-format
msgid "Bad signature by %s: %s"
msgstr "Dålig signatur av %s: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, c-format
msgid "Bad signature by %s"
msgstr "Dålig signatur av %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr "Dålig signatur av okänd nyckel %s: %s"
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr "Dålig signatur av okänd nyckel %s"
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr "Dålig signatur av okänd nyckel: %s"
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr "Dålig signatur av okänd nyckel"
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, c-format
msgid "Good signature by %s: %s"
msgstr "Bra signatur av %s: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, c-format
msgid "Good signature by %s"
msgstr "Bra signatur av %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr "Bra signatur av okänd nyckel %s: %s"
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr "Bra signatur av okänd nyckel %s"
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr "Bra signatur av okänd nyckel: %s"
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr "Bra signatur av okänd nyckel"
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "Ogiltig signatur av %s: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "Ogiltig signatur av %s"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "Ogiltig signatur av okänd nyckel %s: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "Ogiltig signatur av okänd nyckel %s"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "Ogiltig signatur av okänd nyckel: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
#, fuzzy
msgid "Uncertain signature by unknown key"
msgstr "Ogiltig signatur av okänd nyckel"
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr "Nyckeln kan användas för certifiering, signering och kryptering."
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr ""
"Nyckeln kan användas för certifiering och signering, men inte för kryptering."
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "Nyckeln kan användas för certifiering och kryptering."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Nyckeln kan endast användas för certifiering."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
msgstr ""
"Nyckeln kan användas för signering och kryptering, men inte för certifiering."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Nyckeln kan endast användas för signering."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Nyckeln kan endast användas för kryptering."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Den här nyckeln är oanvändbar."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1160,36 +1169,36 @@ msgstr ""
"%i hemliga nycklar importerade\n"
"%i hemliga nycklar oförändrade"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
#, fuzzy
msgid "You must enter a name."
msgstr "Du måste ange en användaridentitet."
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1311,7 +1320,7 @@ msgstr "Redigera nyckel"
msgid "Change _passphrase"
msgstr "Ändra _lösenfras"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Utgångsdatum"
@@ -1442,7 +1451,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Skapa _säkerhetskopia"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "_Vänta till senare"
@@ -1469,7 +1478,7 @@ msgstr ""
"Du har skapat en nyckel som är 1024 bitar lång. Giltighetstiden är "
"obegränsad."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1477,7 +1486,7 @@ msgstr ""
"GnuPG bygger om tillitsdatabasen.\n"
"Det här kan ta några sekunder."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
@@ -1485,24 +1494,15 @@ msgstr ""
"Denna kolumn listar typen för certifikatet. Ett \"P\" betyder OpenPGP och "
"ett \"X\" betyder X.509 (S/MIME)."
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr "Nyckelidentiteten är ett kort tal för att identifiera ett certifikat."
-
-#: src/keylist.c:641
-#, fuzzy
-msgid "The Creation Date is the date the certificate was created."
-msgstr "Utgångsdatum är det datum som certifikatet är giltigt fram till."
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr "Utgångsdatum är det datum som certifikatet är giltigt fram till."
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Ägartillit"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
@@ -1512,11 +1512,11 @@ msgstr ""
"ägaren av certifikatet korrekt signerar (certifierar) andra certifikat. Det "
"är endast betydelsefullt för OpenPGP."
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
msgstr "Giltighet"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
@@ -1524,7 +1524,7 @@ msgstr ""
"Giltighet beskriver tillitsnivån systemet har i detta certifikat. Det är "
"hur säkert det är att namngiven användare verkligen är den användaren."
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1534,7 +1534,7 @@ msgstr "Användarnamn är namnet och ofta även e-postadressen för certifikatet
msgid "No keys selected for signing."
msgstr "Inga nycklar valda för signering."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1542,11 +1542,11 @@ msgstr ""
"Du har inte skapat en privat nyckel ännu. Vill du skapa en nu "
"(rekommenderas) eller vänta till senare?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "Generera nyckel _nu"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1554,243 +1554,247 @@ msgstr ""
"Du har inte gjort en säkerhetskopia av din privata nyckel ännu. Vill du göra "
"en nu (rekommenderas) eller vänta till senare?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "Skapa _säkerhetskopia nu"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
msgid "_Keys"
msgstr "_Nycklar"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
msgid "_Server"
msgstr "_Server"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr "Markera alla certifikat"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr "Uppdatera nyckelringen"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
msgid "_New key..."
msgstr "_Ny nyckel..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
msgid "Generate a new key"
msgstr "Generera en ny nyckel"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
msgid "_Delete keys"
msgstr "_Ta bort nycklar..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Ta bort vald nyckel"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
msgid "_Sign Keys..."
msgstr "_Signera nycklar..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Signera vald nyckel"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
msgid "Set _Owner Trust..."
msgstr "Ange _ägartillit..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
msgid "Set owner trust of the selected key"
msgstr "Ange ägartillit för vald nyckel"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
msgid "_Edit Private Key..."
msgstr "Redigera _privat nyckel..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Redigera markerad privat nyckel"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
msgid "_Import Keys..."
msgstr "_Importera nycklar..."
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Importera nycklar"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
msgid "E_xport Keys..."
msgstr "E_xportera nycklar..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Exportera nycklar"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
msgid "_Backup..."
msgstr "Säkerhetsk_opiera..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
msgid "Backup key"
msgstr "Säkerhetskopiera nyckel"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
msgid "_Retrieve Keys..."
msgstr "_Hämta nycklar..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr "Hämta nycklar från server"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "uppdatera nyckelring"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "Hämta nycklar från server"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
msgid "_Send Keys..."
msgstr "_Skicka nycklar..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
msgid "Send keys to server"
msgstr "Skicka nycklar till server"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "Visa kortfattad nyckellista"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Visa nyckeldetaljer"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "Redigera"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
msgstr "Ta bort"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "Signera"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "Exportera"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "Importera"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
msgstr "Vald standardnyckel:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr "Ingen standardnyckel har valts i inställningarna."
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "Filhanterare"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "Denna nyckel har både en privat och en publik del"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Denna nyckel har både en privat och en publik del"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Denna nyckel har endast en publik del"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bitar"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Inga nycklar valda"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d nyckel markerad"
msgstr[1] "%d nycklar markerade"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Användarnamn:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Går ut den:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Ägartillit:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Nyckelgiltighet:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Nyckeltyp:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Skapad den:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Detaljer"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "Visa signaturer på användarnamn:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "Kan signera"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "Signaturer"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "Alla signaturer"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Undernycklar"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "_Nycklar"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Signera nyckel"
@@ -1980,6 +1984,11 @@ msgstr ""
"Kontrollerade om åtminstone ett matchande X.509-certifikat för användning "
"med S/MIME hittades."
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "Nyckelidentitet"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2520,7 +2529,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2541,7 +2550,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2830,6 +2839,10 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr ""
+#~ "Nyckelidentiteten är ett kort tal för att identifiera ett certifikat."
+
#, fuzzy
#~ msgid "Error"
#~ msgstr "GPA-fel"
@@ -2909,9 +2922,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/Arkiv/_Töm"
-#~ msgid "/File/_Open"
-#~ msgstr "/Arkiv/_Öppna"
-
#, fuzzy
#~ msgid "/File/Save _As"
#~ msgstr "/Arkiv/Stä_ng"
diff --git a/po/tr.gmo b/po/tr.gmo
index 6e77409..e87c4c9 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index ef5e200..468ca19 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa 0.7.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2011-12-12 10:14+0100\n"
"Last-Translator: Mert �etin <mertc at su.sabanciuniv.edu>\n"
"Language-Team: xTc & D�j� Vu\n"
@@ -42,13 +42,13 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Dosya"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -91,7 +91,7 @@ msgstr "Se
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -110,12 +110,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "Se�ili dosyay� �ifrele"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
#, fuzzy
msgid "Copy the selection"
msgstr "Se�ili dosyay� �ifrele"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr ""
@@ -133,11 +133,11 @@ msgstr ""
msgid "Keyring"
msgstr "Anahtarl�k D�zenleyicisi"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "Dosyalar"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr ""
@@ -215,13 +215,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "_Evet"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "_Hay�r"
@@ -246,23 +246,23 @@ msgstr "ay"
msgid "years"
msgstr "y�l"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "asla bitmez"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "bilinmeyen"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "bilinmeyen"
@@ -296,7 +296,7 @@ msgstr "L
msgid "Change expiry date"
msgstr "Bitim s�resini de�i�tir"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr ""
@@ -337,16 +337,16 @@ msgstr ""
msgid "Select all files"
msgstr "B�t�n dosyalar� kapat"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "Dosya"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
#, fuzzy
msgid "File Manager"
msgstr "dosya y�neticisi"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "Bu dosya zaten a��k"
@@ -394,7 +394,7 @@ msgstr "anahtarl
msgid "Open file manager"
msgstr "dosya y�neticisini a�"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "Dosya Y�neticisini A�"
@@ -440,37 +440,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "L�tfen hatalar� <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/_Pencereler"
-#: src/gpa.h:83
+#: src/gpa.h:87
#, fuzzy
msgid "Open the keyring editor"
msgstr "anahtarl�k d�zenleyicisini a� (varsay�lan)"
-#: src/gpa.h:85
+#: src/gpa.h:89
#, fuzzy
msgid "Open the file manager"
msgstr "Dosya Y�neticisini A�"
-#: src/gpa.h:87
+#: src/gpa.h:91
#, fuzzy
msgid "Open the clipboard"
msgstr "Dosya Y�neticisini A�"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "Se�ili dosyay� �ifrele"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/D�zen/Te_rcihler..."
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -553,28 +553,28 @@ msgstr "Anahtarlar sunucuya yolland
msgid "Decrypting..."
msgstr "��z�yor..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, fuzzy, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "\"%s\" dosyas� OpenPGP verisi i�ermiyor."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, fuzzy, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "\"%s\" dosyas� OpenPGP verisi i�ermiyor."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, fuzzy, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "\"%s\" dosyas� �ifrelenmi� ge�erli veri i�ermiyor."
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, fuzzy, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "\"%s\" dosyas� �ifrelenmi� ge�erli veri i�ermiyor."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "Hatal� �ifre!"
@@ -583,46 +583,46 @@ msgstr "Hatal
msgid "Encrypting..."
msgstr "�ifreliyor..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "Bilinmeyen Anahtar"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
#, fuzzy
msgid "You are going to encrypt a document using the following key:"
msgstr "Bir dosyay� �u anahtar� kullanarak �ifrelemek �zeresiniz:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "Yine de, anahtar�n o ki�iye ait oldu�u kesin de�il."
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "Bu anahtar� <b>ger�ekten</b> kullanmak istiyor musunuz?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "Feshedilmi� Anahtar"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Kapat"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
msgstr "�u anahtar sahibi taraf�ndan feshedilmi�tir:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "Ve �ifreleme i�in kullan�lamaz."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "�u anahtar %s tarihinde sona ermi�tir:"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -630,7 +630,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "�ifreleme i�in hi�bir anahtar se�mediniz"
@@ -668,7 +668,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "Hi�bir anahtar bulunamad�."
@@ -678,12 +678,16 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "Anahtar Kimli�i"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "Yarat�lma Tarihi:"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "Kullan�c� Ad�"
@@ -755,103 +759,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Do�ruluyor..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "Altanahtar Kimli�i"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Durum"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "Algoritma"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "Boyut"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "Yarat�lma Tarihi:"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "Sona Ermi�"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "�mzalayabilir"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "Onaylayabilir"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "�ifreleyebilir"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "Do�rulayabilir"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "Feshedilmi�"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "Sona Ermi�"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "Ge�ersiz K�l�nm��"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "�mzalanmam��"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "Ge�erli"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Kullan�c� Ad�:"
@@ -860,12 +859,12 @@ msgstr "Kullan
msgid "User Names:"
msgstr "Kullan�c� Adlar�:"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "Anahtar Kimli�i:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "Parmakizi:"
@@ -939,7 +938,7 @@ msgstr ""
"Bu b�y�k ihtimalle GPA'deki bir hata.\n"
"GPA �imdi bu hatadan toparlanmaya �al��acakt�r."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -948,7 +947,16 @@ msgstr ""
"%s dosyas� zaten var. \n"
"�zerine yazmak istiyor musunuz?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/Dosya/_A�"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -962,7 +970,7 @@ msgstr ""
"************************************************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -970,182 +978,182 @@ msgstr ""
"Bu dosyada yedeklenmi� olan anahtar:\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "Bilinmiyor"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "Hi�"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "S�n�rl�"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "Tam"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "Sonsuz"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "Eksik"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "Tamamen Ge�erli"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "L�tfen �u anahtar i�in �ifre girin:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "Hatal� �ifre, l�tfen tekrar deneyin:"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "�ifreyi Girin"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[Bilinmeyen kullan�c� kimli�i]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "K�t�"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "Genel"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "Ki�isel"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "Hafif"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "Olumlu"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "T�m imzalar"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "T�m imzalar"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "�mzalar: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr "Anahtar onaylama, imzalama, ve �ifreleme i�in kullan�labilir."
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr ""
"Anahtar onaylama ve imzalama i�in kullan�labilir ama �ifreleme i�in "
"kullan�lamaz."
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "Anahtar onaylama ve �ifreleme i�in kullan�labilir."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "Anahtar sadece onaylama i�in kullan�labilir."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
@@ -1153,26 +1161,26 @@ msgstr ""
"Anahtar sadece imzalama ve �ifreleme i�in kullan�labilir, ama onaylama i�in "
"kullan�lamaz."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "Anahtar sadece imzalama i�in kullan�labilir."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "Anahtar sadece �ifreleme i�in kullan�labilir."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "Bu anahtar i�e yaramaz."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1189,35 +1197,35 @@ msgstr ""
"%i gizli anahtar d��ar�dan al�nd�\n"
"%i gizli anahtar de�i�tirilmedi"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1350,7 +1358,7 @@ msgstr "Anahtar
msgid "Change _passphrase"
msgstr "_�ifreyi De�i�tir"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "Bitim Tarihi"
@@ -1480,7 +1488,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Yedek _kopya yarat"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "So_nra yap"
@@ -1507,7 +1515,7 @@ msgstr ""
"Ba�ar�yla bir anahtar yaratt�n�z. Anahtar sonsuz ge�erlili�e sahip, ve 1024 "
"bit uzunlu�undad�r."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1515,48 +1523,39 @@ msgstr ""
"GnuPG g�ven veritaban�n� yeniden yap�land�r�yor.\n"
"Bu birka� saniyenizi alabilir."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-#, fuzzy
-msgid "The key ID is a short number to identify a certificate."
-msgstr "Anahtar sadece onaylama i�in kullan�labilir."
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "Sahibine G�ven"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
#, fuzzy
msgid "Validity"
msgstr "Anahtar Ge�erlili�i"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1566,7 +1565,7 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "�mzalamak i�in hi�bir anahtar se�ilmedi."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1574,11 +1573,11 @@ msgstr ""
"Hala bir �zel anahtara sahip de�ilsiniz. Bir tane yaratmak ister misiniz "
"(�nerilen) ya da daha sonra da yapabilirsiniz?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "Anahtar� �imdi _yarat"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
@@ -1586,261 +1585,265 @@ msgstr ""
"Hala �zel anahtar�n�z�n bir yedek kopyas�na sahip de�ilsiniz. Anahtar�n�z� "
"�imdi mi yedeklemek istersiniz (�nerilen) ya da daha sonra da yapabilirsiniz?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "Anahtar� �imdi ye_dekle"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/_Anahtarlar"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/_Sunucu"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/Anahtarlar/_Yeni Anahtar..."
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "Anahtar yarat"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/Anahtarlar� _Sil..."
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "Se�ili anahtar� kald�r"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/Anahtarlar� �m_zala..."
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "Se�ili anahtar� imzala"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Sahibine _G�veni Belirle..."
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Se�ili anahtar� kald�r"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/�zel Anahtar� _D�zenle..."
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "Se�ili �zel anahtar� d�zenle"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "Anahtarlar� D��ar�dan Al"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "Anahtarlar� D��ar�dan Al"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/Anahtarlar� _Yaz..."
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "Anahtarlar� D��ar� Yaz"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/_Yedekle..."
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "Anahtarlar� Yedekle"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Sunucu/A_nahtarlar� Edin..."
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "Anahtar� Kald�r"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "/Anahtarlar� Sunucuya _G�nder..."
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/Anahtarlar� �m_zala..."
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "/Anahtarlar� Sunucuya _G�nder..."
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "�zet Anahtar Listesi G�ster"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "Anahtar Detaylar�n� G�ster"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "D�zenle"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
#, fuzzy
msgid "Delete"
msgstr "/D�zen/_T�m�n� Se�"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "�mzala"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "D��ar� Yaz"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "D��ar�dan Al"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
#, fuzzy
msgid "Selected default key:"
msgstr "Se�ili Varsay�lan Anahtar:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "dosya y�neticisi"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "Anahtar hem genel hem de �zel b�l�mler i�eriyor"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "Anahtar hem genel hem de �zel b�l�mler i�eriyor"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "Anahtar sadece genel b�l�me sahip"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u bit"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "Hi�bir anahtar se�ilmedi"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d anahtar se�ildi"
msgstr[1] "%d anahtar se�ildi"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "Kullan�c� Ad�:"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "Bitim tarihi:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "Sahibine G�ven:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "Anahtar Ge�erlili�i"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "Anahtar Tipi:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "Yarat�lma Tarihi:"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "Detaylar"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "�u kullan�c� ad�ndaki imzalar� g�ster:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "�mzalayabilir"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "�mzalar"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "T�m imzalar"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "Altanahtarlar"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/_Anahtarlar"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "Anahtar� �mzala"
@@ -2034,6 +2037,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "Anahtar Kimli�i"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2555,7 +2563,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2576,7 +2584,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2865,6 +2873,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "Anahtar sadece onaylama i�in kullan�labilir."
+
+#, fuzzy
#~ msgid "Error"
#~ msgstr "GPA Hatas�"
@@ -2941,9 +2953,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/Dosya/_Temizle"
-#~ msgid "/File/_Open"
-#~ msgstr "/Dosya/_A�"
-
#, fuzzy
#~ msgid "/File/Save _As"
#~ msgstr "/Dosya/_Kapat"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
new file mode 100644
index 0000000..0bbfa86
Binary files /dev/null and b/po/zh_CN.gmo differ
diff --git a/po/gpa.pot b/po/zh_CN.po
similarity index 61%
copy from po/gpa.pot
copy to po/zh_CN.po
index 38fd285..60d4bd0 100644
--- a/po/gpa.pot
+++ b/po/zh_CN.po
@@ -1,438 +1,440 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Chinese (China) Translation for GPA.
+# Copyright (C) 2001, 2002, 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GPA package.
+# Shell Hung <shell at linux.org.hk>, 2001, 2002.
+# Mingye Wang <arthur200126 at gmail.com>, 2015.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gpa 0.9.9\n"
+"Project-Id-Version: gpa 0.9.7\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
+"PO-Revision-Date: 2015-08-15 23:56+0800\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
+"Language-Team: AOSC Chinese Simplified <aosc at members.fsf.org>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.8.4\n"
#: src/clipboard.c:385 src/fileman.c:388
msgid "Open File"
-msgstr ""
+msgstr "打开文件"
#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
-msgstr ""
+msgstr "GPA 消息"
#. TRANSLATORS: The arguments are the filename, the integer size
#. and the unit (such as KB or MB).
#: src/clipboard.c:430
#, c-format
msgid "The file %s is %llu%s large. Do you really want to open it?"
-msgstr ""
+msgstr "文件 %s 大小为 %llu%s。你真的想打开它吗？"
#: src/clipboard.c:548
msgid "Save As..."
-msgstr ""
+msgstr "保存为…"
#: src/clipboard.c:589 src/clipboard.c:619 src/clipboard.c:649
#: src/clipboard.c:679 src/clipboard.c:1020 src/clipboard.c:1050
msgid "Clipboard"
-msgstr ""
+msgstr "剪切板"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
msgid "_File"
-msgstr ""
+msgstr "文件 (_F)"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
msgid "_Edit"
-msgstr ""
+msgstr "编辑 (_E)"
#: src/clipboard.c:766
msgid "Clear buffer"
-msgstr ""
+msgstr "清除缓冲区"
#: src/clipboard.c:768 src/fileman.c:516
msgid "Open a file"
-msgstr ""
+msgstr "打开文件"
#: src/clipboard.c:770
msgid "Save to a file"
-msgstr ""
+msgstr "保存到文件"
#: src/clipboard.c:772
msgid "Sign buffer text"
-msgstr ""
+msgstr "签名缓冲区文字"
#: src/clipboard.c:774
msgid "Check signatures of buffer text"
-msgstr ""
+msgstr "检查缓冲区文字前面"
#: src/clipboard.c:776
msgid "Encrypt the buffer text"
-msgstr ""
+msgstr "加密缓冲区文字"
#: src/clipboard.c:778
msgid "Decrypt the buffer text"
-msgstr ""
+msgstr "解密缓冲区文字"
#: src/clipboard.c:780
msgid "Close the buffer"
-msgstr ""
+msgstr "关闭缓冲区"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
-msgstr ""
+msgstr "退出程序"
#: src/clipboard.c:788
msgid "Undo the last action"
-msgstr ""
+msgstr "撤销上一个动作"
#: src/clipboard.c:790
msgid "Redo the last undone action"
-msgstr ""
+msgstr "重做上一个撤销了的动作"
#: src/clipboard.c:793
msgid "Cut the selection"
-msgstr ""
+msgstr "剪切选区"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
msgid "Copy the selection"
-msgstr ""
+msgstr "复制选区"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
-msgstr ""
+msgstr "粘贴剪切板"
#: src/clipboard.c:799
msgid "Delete the selected text"
-msgstr ""
+msgstr "删除选区内文字"
#: src/clipboard.c:801
msgid "Select the entire document"
-msgstr ""
+msgstr "全选"
#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
-msgstr ""
+msgstr "钥匙圈"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
-msgstr ""
+msgstr "文件"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
-msgstr ""
+msgstr "卡"
#: src/confdialog.c:1003
msgid "<b>Main</b>"
-msgstr ""
+msgstr "<b>主要</b>"
#: src/confdialog.c:1160
msgid "Use default values"
-msgstr ""
+msgstr "使用预设值"
#: src/confdialog.c:1160
msgid "Use default value"
-msgstr ""
+msgstr "使用预设值"
#: src/confdialog.c:1163
msgid "Do not use option"
-msgstr ""
+msgstr "不要使用选项"
#: src/confdialog.c:1168
msgid "Use custom values"
-msgstr ""
+msgstr "使用自定义值"
#: src/confdialog.c:1168
msgid "Use custom value"
-msgstr ""
+msgstr "使用自定义值"
#: src/confdialog.c:1172
msgid "Use default argument"
-msgstr ""
+msgstr "使用预设参数"
#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
-msgstr ""
+msgstr "你的一些更改还未应用。修改专家设置将应用这些更改。你确认要继续吗？"
#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
-msgstr ""
+msgstr "密码学后端配置"
#: src/confdialog.c:1351
msgid "Reset"
-msgstr ""
+msgstr "重置"
#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
-msgstr ""
+msgstr "配置 GnuPG 系统诸工具。"
#: src/confdialog.c:1374
msgid "Level:"
-msgstr ""
+msgstr "级别："
#: src/confdialog.c:1383
msgid "Basic"
-msgstr ""
+msgstr "基础"
#: src/confdialog.c:1384
msgid "Advanced"
-msgstr ""
+msgstr "高级"
#: src/confdialog.c:1385
msgid "Expert"
-msgstr ""
+msgstr "专家"
#: src/confdialog.c:1589
msgid "A keyserver has not been configured."
-msgstr ""
+msgstr "密钥服务器未配置。"
#: src/confdialog.c:1590
msgid "Configure backend to use a keyserver?"
-msgstr ""
+msgstr "将后端配置为使用密钥服务器？"
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
-msgstr ""
+msgstr "是 (_Y)"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
-msgstr ""
+msgstr "否 (_N)"
#: src/confdialog.c:1605
msgid "Configuring the backend to use a keyserver failed"
-msgstr ""
+msgstr "将后端配置为使用密钥服务器失败。"
#: src/convert.c:29
msgid "days"
-msgstr ""
+msgstr "日"
#: src/convert.c:30
msgid "weeks"
-msgstr ""
+msgstr "周"
#: src/convert.c:31
msgid "months"
-msgstr ""
+msgstr "月"
#: src/convert.c:32
msgid "years"
-msgstr ""
+msgstr "年"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
-msgstr ""
+msgstr "永远生效"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
-msgstr ""
+msgstr "未知"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
-msgstr ""
+msgstr "先生"
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
-msgstr ""
+msgstr "女士"
-#: src/convert.c:129
+#: src/convert.c:142
msgid "(unknown)"
-msgstr ""
+msgstr "(未知)"
#: src/encryptdlg.c:152
msgid "Encrypt documents"
-msgstr ""
+msgstr "加密文档"
#: src/encryptdlg.c:169
msgid "_Public Keys"
-msgstr ""
+msgstr "公钥 (_P)"
#: src/encryptdlg.c:192 src/icons.c:166
msgid "_Sign"
-msgstr ""
+msgstr "签名 (_S)"
#: src/encryptdlg.c:198
msgid "Sign _as "
-msgstr ""
+msgstr "签名为 (_a)"
#: src/encryptdlg.c:228 src/filesigndlg.c:241
msgid "A_rmor"
-msgstr ""
+msgstr "纯文字 (_r)"
#: src/expirydlg.c:64
msgid "Please provide a correct date."
-msgstr ""
+msgstr "请提供有效日期"
#: src/expirydlg.c:108
msgid "Change expiry date"
-msgstr ""
+msgstr "更改有效日期"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
-msgstr ""
+msgstr "取消 (_C)"
#: src/expirydlg.c:124
msgid "_never expire"
-msgstr ""
+msgstr "永远生效 (_n)"
#: src/expirydlg.c:129
msgid "_expire on:"
-msgstr ""
+msgstr "失效期为 (_e)"
#: src/fileman.c:518
msgid "Close all files"
-msgstr ""
+msgstr "关闭所有文件"
#: src/fileman.c:520
msgid "Sign the selected file"
-msgstr ""
+msgstr "签名已选择文件"
#: src/fileman.c:522
msgid "Check signatures of selected file"
-msgstr ""
+msgstr "检查已选择文件的签名"
#: src/fileman.c:524
msgid "Encrypt the selected file"
-msgstr ""
+msgstr "加密已选择文件"
#: src/fileman.c:526
msgid "Decrypt the selected file"
-msgstr ""
+msgstr "解密已选择文件"
#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
-msgstr ""
+msgstr "关闭窗口"
#: src/fileman.c:534
msgid "Select all files"
-msgstr ""
+msgstr "选择所有文件"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
-msgstr ""
+msgstr "文件"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
msgid "File Manager"
-msgstr ""
+msgstr "文件管理器"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
-msgstr ""
+msgstr "这个文件已打开。"
#: src/filesigndlg.c:171
msgid "Sign documents"
-msgstr ""
+msgstr "签名文档"
#: src/filesigndlg.c:180
msgid "<b>Sign _as</b>"
-msgstr ""
+msgstr "<b>签名为 (_a)</b>"
#: src/filesigndlg.c:201
msgid "<b>Signing Mode</b>"
-msgstr ""
+msgstr "<b>签名模式</b>"
#: src/filesigndlg.c:211
msgid "Si_gn and compress"
-msgstr ""
+msgstr "签名及压缩 (_g)"
#: src/filesigndlg.c:217
msgid "Clear_text signature"
-msgstr ""
+msgstr "纯文字签名 (_C)"
#: src/filesigndlg.c:232
msgid "_Detached signature"
-msgstr ""
+msgstr "分离式签名 (_C)"
#: src/gpa.c:107
msgid "Output version information and exit"
-msgstr ""
+msgstr "显示版本数据并离开"
#: src/gpa.c:109
msgid "Open key manager (default)"
-msgstr ""
+msgstr "打开密钥编辑器 (预设)"
#: src/gpa.c:111
msgid "Open file manager"
-msgstr ""
+msgstr "打开文件管理器"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
msgid "Open the card manager"
-msgstr ""
+msgstr "打开卡片管理器"
#: src/gpa.c:117
msgid "Open clipboard"
-msgstr ""
+msgstr "打开剪切板"
#: src/gpa.c:119
msgid "Open the settings dialog"
-msgstr ""
+msgstr "打开设定对话框"
#: src/gpa.c:121
msgid "Only start the UI server"
-msgstr ""
+msgstr "只打开用户界面服务器"
#: src/gpa.c:123
msgid "Disable support for X.509"
-msgstr ""
+msgstr "禁用 X。509 支持"
#: src/gpa.c:125
msgid "Read options from file"
-msgstr ""
+msgstr "由文件中读取选项"
#: src/gpa.c:127
msgid "Do not connect to a running instance"
-msgstr ""
+msgstr "不要连接到运行中的实例"
#: src/gpa.c:438
msgid "[FILE...]"
-msgstr ""
+msgstr "[文件…]"
#: src/gpa.c:440
msgid "Graphical frontend to GnuPG"
-msgstr ""
+msgstr "GnuPG 图形化界面"
#: src/gpa.c:441
msgid "Please report bugs to <"
-msgstr ""
+msgstr "回报程序缺陷至 <"
-#: src/gpa.h:80
+#: src/gpa.h:84
msgid "_Windows"
-msgstr ""
+msgstr "窗口 (_W)"
-#: src/gpa.h:83
+#: src/gpa.h:87
msgid "Open the keyring editor"
-msgstr ""
+msgstr "打开钥圈编辑器"
-#: src/gpa.h:85
+#: src/gpa.h:89
msgid "Open the file manager"
-msgstr ""
+msgstr "打开文件管理器"
-#: src/gpa.h:87
+#: src/gpa.h:91
msgid "Open the clipboard"
-msgstr ""
+msgstr "打开剪切板"
-#: src/gpa.h:105
+#: src/gpa.h:109
msgid "Configure the application"
-msgstr ""
+msgstr "配置程序"
-#: src/gpa.h:108
+#: src/gpa.h:112
msgid "_Backend Preferences"
-msgstr ""
+msgstr "后端偏好设置 (_B)"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
-msgstr ""
+msgstr "配置后端程序"
#: src/gpabackupop.c:221
#, c-format
@@ -444,40 +446,46 @@ msgid ""
"This is sensitive information, and should be stored carefully\n"
"(for example, on a USB stick kept in a safe place)."
msgstr ""
+"密钥已被复制到新文件 :\n"
+"\n"
+"\t\"%s\"\n"
+"\n"
+"这是敏感数据，请小心保存这个文件\n"
+" (例如，储存在 U 盘中并放在安全地方中安置)。"
#: src/gpabackupop.c:236
msgid "An error ocurred during the backup operation."
-msgstr ""
+msgstr "备份时出错。"
#: src/gpabackupop.c:259
msgid "Backup key to file"
-msgstr ""
+msgstr "备份密钥到文件"
#: src/gpabackupop.c:271
#, c-format
msgid "Generating backup of key: 0x%s"
-msgstr ""
+msgstr "正在建立 0x%s 的备份"
#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
-msgstr ""
+msgstr "公钥已复制到剪贴板内。"
#: src/gpaexportfileop.c:139
msgid "Export public keys to file"
-msgstr ""
+msgstr "输出公钥为文件"
#: src/gpaexportfileop.c:148
msgid "_armor"
-msgstr ""
+msgstr "纯文字 (_r)"
#: src/gpaexportfileop.c:180
#, c-format
msgid "The keys have been exported to %s."
-msgstr ""
+msgstr "密钥已被导出到 %s。"
#: src/gpaexportop.c:219
msgid "Only keys of the same procotol may be exported as a collection."
-msgstr ""
+msgstr "只有相同协议"
#: src/gpaexportserverop.c:146
#, c-format
@@ -485,111 +493,115 @@ msgid ""
"The selected key(s) will be sent to a public key\n"
"server (\"%s\")."
msgstr ""
+"被选择的公钥会寄到公钥服务器\n"
+" (\"%s\")。"
#: src/gpaexportserverop.c:154
msgid "Are you sure you want to distribute this key?"
-msgstr ""
+msgstr "您确定要分发这密钥？"
#: src/gpaexportserverop.c:233
msgid "Error sending key(s) to the server."
-msgstr ""
+msgstr "寄出公钥到服务器出错"
#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
-msgstr ""
+msgstr "公钥已被传到服务器。"
#: src/gpafiledecryptop.c:155
msgid "Decrypting..."
-msgstr ""
+msgstr "解密中…"
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, c-format
msgid "\"%s\" contained no OpenPGP data."
-msgstr ""
+msgstr "文件 \"%s\" 不含 OpenPGP 数据。"
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
-msgstr ""
+msgstr "文件 \"%s\" 不含 OpenPGP 数据。"
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, c-format
msgid "\"%s\" contained no valid encrypted data."
-msgstr ""
+msgstr "文件 \"%s\" 不含有效的加密数据。"
-#: src/gpafiledecryptop.c:522
-#, c-format
-msgid "The file \"%s\" contained no validencrypted data."
-msgstr ""
+#: src/gpafiledecryptop.c:528
+#, fuzzy, c-format
+msgid "The file \"%s\" contained no valid encrypted data."
+msgstr "文件 \"%s\" 不含有效的加密数据。"
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
-msgstr ""
+msgstr "密码错误！"
#: src/gpafileencryptop.c:155
msgid "Encrypting..."
-msgstr ""
+msgstr "加密中…"
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
-msgstr ""
+msgstr "未知的密钥"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
msgid "You are going to encrypt a document using the following key:"
-msgstr ""
+msgstr "您正使用以下的密钥加密这个文件："
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
-msgstr ""
+msgstr "不过，密钥并不属于对方的"
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
-msgstr ""
+msgstr "您确定要使用这个密钥 ？"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
-msgstr ""
+msgstr "吊销密钥"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
-msgstr ""
+msgstr "关闭 (_C)"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
msgid "The following key has been revoked by its owner:"
-msgstr ""
+msgstr "这把密钥已被持有者取消:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
-msgstr ""
+msgstr "而且不可以使用作为加密之用。"
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
-msgstr ""
+msgstr "这密钥会在 %s 失效 :"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
"OpenPGP and X.509 certificates. Please make sure to select only certificates "
"of the same type."
msgstr ""
+"选择的密钥并非同一种。也就是说，你混合了 OpenPGP 和 X。509 证书。请确保只选择"
+"同一类型的证书。"
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
-msgstr ""
+msgstr "没有选择用来签名的密钥"
#: src/gpafilesignop.c:156
msgid "Signing..."
-msgstr ""
+msgstr "签名中…"
#: src/gpafileverifyop.c:104
msgid "Verifying..."
-msgstr ""
+msgstr "验证中…"
#: src/gpafileverifyop.c:177
#, c-format
@@ -599,14 +611,17 @@ msgid ""
"\n"
"The file found is: %s"
msgstr ""
+"GPA 找到了个文件，可能是 %s 的签名。你要转而验证它吗？\n"
+"\n"
+"找到的文件是：%s"
#: src/gpagenkeyadvop.c:80
msgid "Generating Key..."
-msgstr ""
+msgstr "建立新密钥…"
#: src/gpaimportfileop.c:130
msgid "Import keys from file"
-msgstr ""
+msgstr "由文件中导入公钥"
#: src/gpaimportserverop.c:156
#, c-format
@@ -614,219 +629,224 @@ msgid ""
"More than %d keys match your search pattern.\n"
"Use the long keyid or a fingerprint for a better match"
msgstr ""
+"超过 %d 个密钥符合你的搜索特征。\n"
+"使用长密钥 ID 或指纹来获得更好的匹配"
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
-msgstr ""
+msgstr "找不到密钥。"
#: src/gpakeyexpireop.c:244
msgid ""
"Invalid time given.\n"
"(you may not set the expiration time to the past.)"
msgstr ""
+"提供的时间无效。\n"
+"（你不可以把过期日期调到以前。）"
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr ""
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+msgid "Created"
+msgstr "建立于"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr "创建日期是证书被创建的日期。"
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
-msgstr ""
+msgstr "用户名称"
#: src/gpakeysignop.c:193
msgid "No private key for signing."
-msgstr ""
+msgstr "没有选择用作签名的私钥。"
#: src/gpakeysignop.c:244
msgid "This key has expired! Unable to sign."
-msgstr ""
+msgstr "这公钥已过期！ 不能用作签名。"
#: src/gpakeysignop.c:248
msgid "This key has already been signed with your own!"
-msgstr ""
+msgstr "这公钥已被你自己签名了！"
#: src/gpakeysignop.c:253
msgid "You haven't selected a default key to sign with!"
-msgstr ""
+msgstr "没有选择预设签名的密钥！"
#: src/gparecvkeydlg.c:107
msgid "Which key do you want to import?"
-msgstr ""
+msgstr "选择要导入的密钥。"
#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
-msgstr ""
+msgstr "选择要导入的密钥（必须提供密钥的序号）。"
#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
-msgstr ""
+msgstr "密钥序号: (_I)"
#: src/gpastreamdecryptop.c:155
msgid "Decrypting message ..."
-msgstr ""
+msgstr "解密中…"
#: src/gpastreamdecryptop.c:344 src/gpastreamverifyop.c:356
msgid "Document"
-msgstr ""
+msgstr "文档"
#: src/gpastreamencryptop.c:229
msgid "Encrypting message ..."
-msgstr ""
+msgstr "加密中…"
#: src/gpastreamencryptop.c:385
msgid "Message encryption"
-msgstr ""
+msgstr "消息加密"
#: src/gpastreamsignop.c:176
msgid "Signing message ..."
-msgstr ""
+msgstr "签名中…"
#: src/gpastreamsignop.c:363
msgid "Message signing"
-msgstr ""
+msgstr "消息签名"
#: src/gpastreamverifyop.c:156
msgid "Verifying message ..."
-msgstr ""
+msgstr "验证中…"
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
-msgstr ""
+msgstr "子钥序号"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
-msgstr ""
+msgstr "状态"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
msgid "Algo"
-msgstr ""
+msgstr "加密算法"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
-msgstr ""
+msgstr "大小"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-msgid "Created"
-msgstr ""
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
msgid "Expires"
-msgstr ""
+msgstr "有效至"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
-msgstr ""
+msgstr "S"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
-msgstr ""
+msgstr "可签名"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
-msgstr ""
+msgstr "C"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
-msgstr ""
+msgstr "可验证"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
-msgstr ""
+msgstr "E"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
-msgstr ""
+msgstr "可加密"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
-msgstr ""
+msgstr "A"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
-msgstr ""
+msgstr "可发放"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
-msgstr ""
+msgstr "T"
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
-msgstr ""
+msgstr "私钥已存储在卡上。"
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
-msgstr ""
+msgstr "卡序列号"
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
-msgstr ""
+msgstr "卡序列号"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
-msgstr ""
+msgstr "已吊销"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
-msgstr ""
+msgstr "已过期"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
-msgstr ""
+msgstr "已失效"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
-msgstr ""
+msgstr "未签名"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
-msgstr ""
+msgstr "有效"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
-msgstr ""
+msgstr "用户名称 :"
#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
-msgstr ""
+msgstr "用户名称 :"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
-msgstr ""
+msgstr "密钥 ID:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
-msgstr ""
+msgstr "指纹:"
#: src/gpawidgets.c:195
msgid "Expiration"
-msgstr ""
+msgstr "有效期"
#: src/gpawidgets.c:202
msgid "_indefinitely valid"
-msgstr ""
+msgstr "不确认有效 (_i)"
#: src/gpawidgets.c:210
msgid "expire _after"
-msgstr ""
+msgstr "失效自 (_a)"
#: src/gpawidgets.c:230
msgid "expire o_n:"
-msgstr ""
+msgstr "失效期为 (_n):"
#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
msgstr ""
+"！执行错误！\n"
+"非法的有效期插入模式。"
#: src/gpadatebutton.c:87
msgid "(not set)"
-msgstr ""
+msgstr "(未设置)"
#: src/gpgmeedit.c:1273
msgid ""
@@ -844,6 +864,12 @@ msgid ""
"\n"
"The application will be terminated"
msgstr ""
+"GPGME 程序库的严重错误 \n"
+"(在 %s 行 %i 中发生):\n"
+"\n"
+"\t%s\n"
+"\n"
+"程序将被终止"
#: src/gpgmetools.c:104
#, c-format
@@ -856,15 +882,32 @@ msgid ""
"This is either an installation problem or a bug in %s.\n"
"%s will now try to recover from this error."
msgstr ""
+"GPGME 程序库传回未预料的错误，\n"
+"在 %s:%d。内容:\n"
+"\n"
+"\t%s\n"
+"\n"
+"这有可能是 %s 程序或安装上的问题。\n"
+"%s 现在尝试从错误中回复。"
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
"Do you want to overwrite it?"
msgstr ""
+"文件 %s 已存在。\n"
+"要进行覆写吗？"
+
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+msgid "_Open"
+msgstr ""
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -872,212 +915,221 @@ msgid ""
"************************************************************************\n"
"\n"
msgstr ""
+"****************************************\n"
+"* 警告: 这个文件是密钥的备份。 *\n"
+"* 请保存在安全的地方 *\n"
+"****************************************\n"
+"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
msgstr ""
+"已备份的钥对在文件的是 :\n"
+"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
-msgstr ""
+msgstr "未知"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
-msgstr ""
+msgstr "永不"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
-msgstr ""
+msgstr "部份"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
-msgstr ""
+msgstr "完全"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
-msgstr ""
+msgstr "永远"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
-msgstr ""
+msgstr "不全"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
-msgstr ""
+msgstr "完全合法的"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
-msgstr ""
+msgstr "输入以下密钥的密码:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
-msgstr ""
+msgstr "密码错误，请再尝试 :"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
-msgstr ""
+msgstr "输入密码"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
-msgstr ""
+msgstr "[无]"
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
-msgstr ""
+msgstr "[未知用户ID]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
-msgstr ""
+msgstr "损坏"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
-msgstr ""
+msgstr "通用"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
-msgstr ""
+msgstr "私用"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
-msgstr ""
+msgstr "临时"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
-msgstr ""
+msgstr "确定"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, c-format
msgid "Bad signature by %s: %s"
-msgstr ""
+msgstr "已损坏的签名，来自于 %s: %s"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, c-format
msgid "Bad signature by %s"
-msgstr ""
+msgstr "已损坏的签名，来自于 %s"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
-msgstr ""
+msgstr "已损坏的签名，来自未知密钥 %s: %s"
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
-msgstr ""
+msgstr "已损坏的签名，来自未知密钥 %s"
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
-msgstr ""
+msgstr "已损坏的签名，来自未知密钥: %s"
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
-msgstr ""
+msgstr "已损坏的签名，来自未知密钥"
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, c-format
msgid "Good signature by %s: %s"
-msgstr ""
+msgstr "完好的签名，来自于 %s: %s"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, c-format
msgid "Good signature by %s"
-msgstr ""
+msgstr "完好的签名，来自于 %s"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
-msgstr ""
+msgstr "完好的签名，来自未知密钥 %s: %s"
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
-msgstr ""
+msgstr "完好的签名，来自未知密钥 %s"
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
-msgstr ""
+msgstr "完好的签名，来自未知密钥: %s"
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
-msgstr ""
+msgstr "完好的签名，来自未知密钥"
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, c-format
msgid "Uncertain signature by %s: %s"
-msgstr ""
+msgstr "不确定的签名，来自 %s: %s"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, c-format
msgid "Uncertain signature by %s"
-msgstr ""
+msgstr "不确定的签名，来自 %s"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, c-format
msgid "Uncertain signature by unknown key %s: %s"
-msgstr ""
+msgstr "不确定的签名，来自未知密钥 %s: %s"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, c-format
msgid "Uncertain signature by unknown key %s"
-msgstr ""
+msgstr "不确定的签名，来自未知密钥 %s"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, c-format
msgid "Uncertain signature by unknown key: %s"
-msgstr ""
+msgstr "不确定的签名，来自未知密钥: %s"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
-msgstr ""
+msgstr "不确定的签名，来自未知密钥"
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
-msgstr ""
+msgstr "密钥可被用作验证，签名及加密。"
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
-msgstr ""
+msgstr "密钥可被用作验证及签名，并不允许用在加密上。"
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
-msgstr ""
+msgstr "密钥可用作验证及加密。"
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
-msgstr ""
+msgstr "密钥只可用作验证。"
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
-msgstr ""
+msgstr "密钥只可以被用作签名及加密。并不允许用在验证用途。"
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
-msgstr ""
+msgstr "密钥只可用作签名。"
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
-msgstr ""
+msgstr "密钥只可用作加密。"
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
-msgstr ""
+msgstr "密钥是不可使用的。"
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
+"读取了 %u 个文件\n"
+"其中有 %u 个出错"
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1087,104 +1139,118 @@ msgid ""
"%i secret keys imported\n"
"%i secret keys unchanged"
msgstr ""
+"%i 公钥被读取\n"
+"%i 公钥已导入\n"
+"%i 公钥未改变\n"
+"%i 私钥被读取\n"
+"%i 私钥已导入\n"
+"%i 私钥已导入"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
-msgstr ""
+msgstr "一个必要的引擎组件未安装。"
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
-msgstr ""
+msgstr "调用密码学引擎程序失败。"
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
-msgstr ""
+msgstr "你必须输入一个名字。"
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
-msgstr ""
+msgstr "姓名含有无效的字符。"
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
-msgstr ""
+msgstr "姓名不可以用数字开头。"
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
-msgstr ""
+msgstr "姓名太短。"
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
-msgstr ""
+msgstr "电子邮件地址无效。"
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
-msgstr ""
+msgstr "注释含有无效的字符。"
#: src/helpmenu.c:89
msgid "GPA is the GNU Privacy Assistant."
-msgstr ""
+msgstr "GPA 是指 GNU Privacy Assistant。"
#: src/helpmenu.c:94
msgid "About GPA"
-msgstr ""
+msgstr "关于 GPA"
#. TRANSLATORS: The translation of this string should
#. be your name and mail
#: src/helpmenu.c:107
msgid "translator-credits"
msgstr ""
+"zh_CN\tMingye Wang <arthur200126 at gmail.com>\n"
+"\tAOSC Chinese Simplified <aosc at members.fsf.org>\n"
+"\n"
+"Initially based on the work of:zh_TW\tShell Hung <shell at linux.org.hk>\n"
+"\tHong Kong Linux User Group <info at linux.org.hk>\n"
+"\n"
+"With the help of:\n"
+"OpenCC, an accurate Chinese Convertor: https://github.com/BYVoid/OpenCC"
#: src/helpmenu.h:29
msgid "_Help"
-msgstr ""
+msgstr "求助 (_H)"
#: src/helpmenu.h:32
msgid "Open the GPA manual"
-msgstr ""
+msgstr "打开 GPA 手册"
#: src/helpmenu.h:35
msgid "About this application"
-msgstr ""
+msgstr "关于本程序"
#: src/icons.c:167
msgid "_Verify"
-msgstr ""
+msgstr "验证 (_V)"
#: src/icons.c:168
msgid "_Encrypt"
-msgstr ""
+msgstr "加密 (_E)"
#: src/icons.c:169
msgid "_Decrypt"
-msgstr ""
+msgstr "解密 (_D)"
#: src/icons.c:170
msgid "_Brief"
-msgstr ""
+msgstr "摘要 (_B)"
#: src/icons.c:171
msgid "_Detailed"
-msgstr ""
+msgstr "详情 (_D)"
#: src/icons.c:172
msgid "_Keyring Manager"
-msgstr ""
+msgstr "钥圈管理器 (_K)"
#: src/icons.c:173
msgid "_Clipboard"
-msgstr ""
+msgstr "剪切板 (_C)"
#: src/icons.c:174
msgid "_File Manager"
-msgstr ""
+msgstr "文件管理器 (_F)"
#: src/icons.c:175
msgid "_Card Manager"
-msgstr ""
+msgstr "卡片管理器 (_C)"
#: src/keydeletedlg.c:41
msgid "Removing Secret Key"
-msgstr ""
+msgstr "移除私钥"
#: src/keydeletedlg.c:55
msgid ""
@@ -1193,20 +1259,24 @@ msgid ""
"\n"
"Are you really sure you want to delete it?"
msgstr ""
+"如果您删除这个密钥，您将不能读取由这个密钥加密\n"
+"的文件。\n"
+"\n"
+"要确定删除吗 ？"
#: src/keydeletedlg.c:91
msgid "Remove Key"
-msgstr ""
+msgstr "移除密钥"
#: src/keydeletedlg.c:104
msgid "You have selected the following key for removal:"
-msgstr ""
+msgstr "您选择移除以下的密钥:"
#: src/keydeletedlg.c:114
msgid ""
"This key has a secret key. Deleting this key cannot be undone, unless you "
"have a backup copy."
-msgstr ""
+msgstr "这密钥包含私钥。删除后不可复原，除非您有备份。"
#: src/keydeletedlg.c:123
msgid ""
@@ -1214,88 +1284,89 @@ msgid ""
"although you may be able to get a new copy from the owner or from a key "
"server."
msgstr ""
+"这是公钥。删除后不能轻易复原，尽管您可以从拥有人或公钥服务器中取得新公钥。"
#: src/keydeletedlg.c:132
msgid "Are you sure you want to delete this key?"
-msgstr ""
+msgstr "您确定要删除这密钥？"
#: src/keyeditdlg.c:148
msgid "Edit Key"
-msgstr ""
+msgstr "修改密钥"
#: src/keyeditdlg.c:163
msgid "Change _passphrase"
-msgstr ""
+msgstr "更改密码 (_P)"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
-msgstr ""
+msgstr "有效日期"
#: src/keyeditdlg.c:183
msgid "Change _expiration"
-msgstr ""
+msgstr "改变有效日期 (_E)"
#: src/keygendlg.c:40
msgid "RSA"
-msgstr ""
+msgstr "RSA"
#: src/keygendlg.c:41
msgid "RSA (sign only)"
-msgstr ""
+msgstr "RSA (仅用于签名)"
#: src/keygendlg.c:42
msgid "DSA"
-msgstr ""
+msgstr "DSA"
#: src/keygendlg.c:43
msgid "DSA (sign only)"
-msgstr ""
+msgstr "DSA (仅用于签名)"
#: src/keygendlg.c:134
msgid "You must enter a key size."
-msgstr ""
+msgstr "你必须输入一个密钥大小。"
#: src/keygendlg.c:188
msgid "Generate card key"
-msgstr ""
+msgstr "建立卡密钥"
#: src/keygendlg.c:188 src/keygenwizard.c:387 src/keygenwizard.c:400
#: src/keygenwizard.c:410 src/keygenwizard.c:421 src/keygenwizard.c:438
#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
-msgstr ""
+msgstr "建立新密钥"
#: src/keygendlg.c:209
msgid "_Algorithm: "
-msgstr ""
+msgstr "加密算法 (_A):"
#: src/keygendlg.c:235
msgid "_Key size (bits): "
-msgstr ""
+msgstr "密钥大小 (位):"
#: src/keygendlg.c:260
msgid "User ID: "
-msgstr ""
+msgstr "用户ID (_U):"
#: src/keygendlg.c:276
msgid "_Name: "
-msgstr ""
+msgstr "姓名 (_N):"
#: src/keygendlg.c:289
msgid "_Email: "
-msgstr ""
+msgstr "电邮 (_E):"
#: src/keygendlg.c:302
msgid "_Comment: "
-msgstr ""
+msgstr "备注 (_C):"
#: src/keygendlg.c:315
msgid "_Expires: "
-msgstr ""
+msgstr "有效期至 (_E):"
#: src/keygendlg.c:327
msgid "Backup: "
-msgstr ""
+msgstr "备份密钥"
#: src/keygendlg.c:339
msgid ""
@@ -1303,6 +1374,8 @@ msgid ""
"and then loaded into the card. This is recommended so that encrypted "
"messages can be decrypted even if the card has a malfunction."
msgstr ""
+"如果选中此密钥在生成之后会先存进一个文件再存入卡中。这是推荐选项，因为这样使"
+"得消息即使在卡出错时也可解密。"
#: src/keygenwizard.c:175
msgid ""
@@ -1311,10 +1384,13 @@ msgid ""
"Your name will be part of the new key to make it easier for others to "
"identify keys."
msgstr ""
+"请输入您的全名。\n"
+"\n"
+"这个名字会是密钥的一部份，使其他人容易辨认您的密钥。"
#: src/keygenwizard.c:178
msgid "Your Name:"
-msgstr ""
+msgstr "您的名字:"
#: src/keygenwizard.c:212
msgid ""
@@ -1324,10 +1400,14 @@ msgid ""
"to identify keys. If you have several email addresses, you can add further "
"email addresses later."
msgstr ""
+"请输入您的电邮。\n"
+"\n"
+"您的电邮地址会是钥的一部份使，其他人容易辨认您。如果您有多个电邮地址，您可以"
+"在日后再增加。"
#: src/keygenwizard.c:216
msgid "Your Email Address:"
-msgstr ""
+msgstr "您的电邮地址:"
#: src/keygenwizard.c:235
msgid ""
@@ -1336,14 +1416,17 @@ msgid ""
"\n"
"Do you want to create a backup copy?"
msgstr ""
+"当钥被建立后，建议您可以制作一个备份。\n"
+"\n"
+"您是否想制作一个备份？"
#: src/keygenwizard.c:243
msgid "Create _backup copy"
-msgstr ""
+msgstr "建立备份 (_b)"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
-msgstr ""
+msgstr "往后才进行 (_l)"
#: src/keygenwizard.c:277
msgid ""
@@ -1351,6 +1434,9 @@ msgid ""
"\n"
"Even on fast computers this may take a while. Please be patient."
msgstr ""
+"新的钥正在建立中\n"
+"\n"
+"在更快的电脑上也可能要等侯一段时间。请等侯…"
#: src/keygenwizard.c:289
#, c-format
@@ -1360,331 +1446,336 @@ msgid ""
"You have successfully generated a key. The key is indefinitely valid and has "
"a length of %d bits."
msgstr ""
+"恭喜！\n"
+"\n"
+"新的密钥已建立。此密钥不确认地有效，长度 %d 位。"
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
msgstr ""
+"GnuPG 正在重建数据库。\n"
+"可能要用上几秒。"
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
-msgstr ""
-
-#: src/keylist.c:631
-msgid "The key ID is a short number to identify a certificate."
-msgstr ""
+msgstr "此列列出证书类型。P 表示 OpenPGP，X 表示 X.509 (S/MIME)。"
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
-msgstr ""
+msgstr "有效日期是证书最后有效的日期。"
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
-msgstr ""
+msgstr "拥有者信任"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
+"拥有者信任由你设置，描述你信任证书拥有者正确地证明其他证书的能力的程度。它只"
+"对 OpenPGP 有意义。"
-#: src/keylist.c:677
+#: src/keylist.c:659
msgid "Validity"
-msgstr ""
+msgstr "有效性"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
+"有效性表明信任系统对这个证书的信任程序，也就是确认这个所指明的用户就是那位用"
+"户的程度。"
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
-msgstr ""
+msgstr "用户名指的是名字，常常也是证书的电邮地址。"
#: src/keymanager.c:451
msgid "No keys selected for signing."
-msgstr ""
+msgstr "没有选择作签名的密钥。"
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
-msgstr ""
+msgstr "您并没有私钥，建议您现在建立或是往后才建立？"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
-msgstr ""
+msgstr "现在建立钥 (_G)"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
-msgstr ""
+msgstr "您并没有私钥，建议您现在建立或是往后才建立？"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
-msgstr ""
+msgstr "现在进行备份 (_G)"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
msgid "_Keys"
-msgstr ""
+msgstr "密钥 (_K)"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
msgid "_Server"
-msgstr ""
+msgstr "服务器 (_S)"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
-msgstr ""
+msgstr "选择所有证书"
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
-msgstr ""
+msgstr "刷新钥匙圈"
-#: src/keymanager.c:950
+#: src/keymanager.c:953
msgid "_New key..."
-msgstr ""
+msgstr "建立新密钥… (_N)"
-#: src/keymanager.c:951
+#: src/keymanager.c:954
msgid "Generate a new key"
-msgstr ""
+msgstr "生成新密钥"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
msgid "_Delete keys"
-msgstr ""
+msgstr "删除密钥 (_D)"
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
-msgstr ""
+msgstr "移除已选择的密钥"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
msgid "_Sign Keys..."
-msgstr ""
+msgstr "签名公钥… (_S)"
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
-msgstr ""
+msgstr "签名已选择的密钥"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
msgid "Set _Owner Trust..."
-msgstr ""
+msgstr "设定信任度… (_O)"
-#: src/keymanager.c:957
+#: src/keymanager.c:960
msgid "Set owner trust of the selected key"
-msgstr ""
+msgstr "设定已选密钥的信任度"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
msgid "_Edit Private Key..."
-msgstr ""
+msgstr "修改私钥… (_E)"
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
-msgstr ""
+msgstr "修改已选择的私钥"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
msgid "_Import Keys..."
-msgstr ""
+msgstr "导入密钥 (_I)…"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
-msgstr ""
+msgstr "导入密钥"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
msgid "E_xport Keys..."
-msgstr ""
+msgstr "导出密钥… (_X)"
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
-msgstr ""
+msgstr "导出密钥"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
msgid "_Backup..."
-msgstr ""
+msgstr "备份… (_B)"
-#: src/keymanager.c:967
+#: src/keymanager.c:970
msgid "Backup key"
-msgstr ""
+msgstr "备份密钥"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
msgid "_Retrieve Keys..."
-msgstr ""
+msgstr "下载公钥… (_R)"
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
-msgstr ""
+msgstr "从服务器下载公钥"
-#: src/keymanager.c:974
+#: src/keymanager.c:977
msgid "Re_fresh Keys"
-msgstr ""
+msgstr "刷新密钥 (_R)"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
msgid "Refresh keys from server"
-msgstr ""
+msgstr "从服务器刷新密钥"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
msgid "_Send Keys..."
-msgstr ""
+msgstr "上传公钥... (_S)"
-#: src/keymanager.c:978
+#: src/keymanager.c:981
msgid "Send keys to server"
-msgstr ""
+msgstr "寄出公钥到服务器"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
-msgstr ""
+msgstr "显示密钥清单摘要"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
-msgstr ""
+msgstr "显示密钥详情"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
-msgstr ""
+msgstr "修改"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
msgid "Delete"
-msgstr ""
+msgstr "删除"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
-msgstr ""
+msgstr "签名"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
-msgstr ""
+msgstr "输出"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
-msgstr ""
+msgstr "导入"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
msgid "Selected default key:"
-msgstr ""
+msgstr "选择预设密钥:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
-msgstr ""
+msgstr "没有在首选项中选择预设密钥。"
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
msgid "Key Manager"
-msgstr ""
+msgstr "密钥管理器"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
msgid "The key has both a smartcard based private part and a public part"
-msgstr ""
+msgstr "这是有卡上的私人及公共部份的完钥"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
-msgstr ""
+msgstr "这是有私人及公共部份的完钥"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
-msgstr ""
+msgstr "这密钥只有公共部份"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
-msgstr ""
+msgstr "%s %u 位"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
-msgstr ""
+msgstr "没有选择密钥"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d 密钥被选择"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
+#, fuzzy
msgid "User name:"
-msgstr ""
+msgstr "用户名称 :"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
-msgstr ""
+msgstr "有效期至:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
-msgstr ""
+msgstr "拥有者信任:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
msgid "Key validity:"
-msgstr ""
+msgstr "有效性:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
msgid "Key type:"
-msgstr ""
+msgstr "密钥种类:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
-msgstr ""
+msgstr "建立在 :"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
-msgstr ""
+msgstr "详情"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
-msgstr ""
+msgstr "在用户名称显示签名:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Chain"
-msgstr ""
+msgstr "信任链"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
-msgstr ""
+msgstr "签名"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
-msgstr ""
+msgstr "所有签名"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
-msgstr ""
+msgstr "子钥"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Key"
+msgstr "密钥"
+
+#: src/gpa-key-details.c:547
+msgid "Tofu"
msgstr ""
#: src/keysigndlg.c:59
msgid "Sign Key"
-msgstr ""
+msgstr "签名密钥"
#: src/keysigndlg.c:72
msgid "Do you want to sign the following key?"
-msgstr ""
+msgstr "您希望签名以下的密钥 ？"
#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
-msgstr ""
+msgstr "检查密钥的名称及指纹以确定没有错误。"
#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
-msgstr ""
+msgstr "所有在这个钥下的用户都作签名。"
#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
-msgstr ""
+msgstr "这密钥会以您的私钥签名。"
#: src/keysigndlg.c:140
msgid "Sign only _locally"
-msgstr ""
+msgstr "只是本地上的签名 (_l)"
#: src/keytable.c:221
msgid ""
@@ -1701,33 +1792,35 @@ msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
msgstr ""
+"已选作为预设的私钥并不能使用。\n"
+"GPA 会尝试自动选择其他私钥。"
#: src/ownertrustdlg.c:106
msgid "Change key ownertrust"
-msgstr ""
+msgstr "改变信任度"
#: src/ownertrustdlg.c:130
msgid "_Unknown"
-msgstr ""
+msgstr "未知 (_U)"
#: src/ownertrustdlg.c:135
msgid ""
"You don't know how much to trust this user to verify other people's keys.\n"
-msgstr ""
+msgstr "不知道信任这公钥的信任程度。\n"
#: src/ownertrustdlg.c:145
msgid "_Never"
-msgstr ""
+msgstr "永不信任 (_N)"
#: src/ownertrustdlg.c:150
msgid ""
"You don't trust this user at all to verify the validity of other people's "
"keys at all.\n"
-msgstr ""
+msgstr "完全不信任所有这个用户的数据\n"
#: src/ownertrustdlg.c:160
msgid "_Marginal"
-msgstr ""
+msgstr "部份信任 (_M)"
#: src/ownertrustdlg.c:165
msgid ""
@@ -1737,10 +1830,13 @@ msgid ""
"by this user valid if it is also signed by at least other two marginally "
"trusted users with valid keys\n"
msgstr ""
+"您不信任这个用户有能力验证其他人的公钥。\n"
+"但是这个用户的公钥是合法的，如果这个用户的公钥被两人以前所签名，您会信任这个"
+"公钥\n"
#: src/ownertrustdlg.c:182
msgid "_Full"
-msgstr ""
+msgstr "完全信任 (_F)"
#: src/ownertrustdlg.c:187
msgid ""
@@ -1748,10 +1844,12 @@ msgid ""
"so much, that you'll consider valid any key signed by him/her, provided this "
"user's key is valid.\n"
msgstr ""
+"您信任这个用户有能力验证其他人的公钥。并且您会认为所有由这个公钥所签名的文件"
+"都会是合法及有效的。\n"
#: src/ownertrustdlg.c:200
msgid "U_ltimate"
-msgstr ""
+msgstr "永远信任 (_L)"
#: src/ownertrustdlg.c:205
msgid ""
@@ -1761,18 +1859,25 @@ msgid ""
"(Warning: This is intended to be used for keys you own. Don't use it with "
"other people's keys unless you really know what you are doing)\n"
msgstr ""
+"您全完信任这个用户的能力及其公钥，并信任一切由这个用户签名的所有文件。\n"
+"\n"
+"(警告: 除非必要，请不要与其他公钥同时使用这个用户的公钥)\n"
#: src/passwddlg.c:45
msgid ""
"In \"Passphrase\" and \"Repeat passphrase\",\n"
"you must enter the same passphrase."
msgstr ""
+"在 \"密码\"及\"重复密码\"，\n"
+"您需要输入相同的密码。"
#: src/passwddlg.c:52
msgid ""
"You did not enter a passphrase.\n"
"It is needed to protect your private key."
msgstr ""
+"您并没有输入密码。\n"
+"这个密码是需要用作保护密钥的。"
#: src/passwddlg.c:65
msgid ""
@@ -1781,30 +1886,34 @@ msgid ""
"\n"
"Please enter a new passphrase."
msgstr ""
+"警告: 您所输入的密码并不是\n"
+"最安全的密码。\n"
+"\n"
+"请输入新的密码。"
#: src/passwddlg.c:70
msgid "_Enter new passphrase"
-msgstr ""
+msgstr "输入新密码 (_E)"
#: src/passwddlg.c:71
msgid "Take this one _anyway"
-msgstr ""
+msgstr "强行使用这个密码 (_A)"
#: src/passwddlg.c:96
msgid "Choose new passphrase"
-msgstr ""
+msgstr "输入新密码"
#: src/passwddlg.c:111
msgid "Passphrase: "
-msgstr ""
+msgstr "密码 :"
#: src/passwddlg.c:120
msgid "Repeat Passphrase: "
-msgstr ""
+msgstr "重复密码 :"
#: src/recipientdlg.c:165
msgid "Recipient"
-msgstr ""
+msgstr "收件人"
#: src/recipientdlg.c:166
msgid ""
@@ -1822,6 +1931,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "密钥 ID"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -1833,12 +1947,16 @@ msgid ""
"You need to select a key for each recipient.\n"
"To select a key right-click on the respective line."
msgstr ""
+"你需要给每个收件人指派密钥。\n"
+"要选择一个密钥，在对应的行上右键。"
#: src/recipientdlg.c:314
msgid ""
"You need to select exactly one key for each recipient.\n"
"To select a key right-click on the respective line."
msgstr ""
+"你需要给每个收件人指派并只指派一个密钥。\n"
+"要选择一个密钥，在对应的行上右键。"
#: src/recipientdlg.c:321
msgid ""
@@ -1846,114 +1964,116 @@ msgid ""
"can't be used. Please decide on one protocol by clicking one of the above "
"radio buttons."
msgstr ""
+"尽管你选择了每位收件人的密钥，无法使用一个一致的加密协议。请选择通过按单选按"
+"钮选择一个协议。"
#: src/recipientdlg.c:327
msgid "Using OpenPGP for encryption."
-msgstr ""
+msgstr "使用 OpenPGP 来加密。"
#: src/recipientdlg.c:332
msgid "Using S/MIME for encryption."
-msgstr ""
+msgstr "使用 S/MIME 来加密。"
#: src/recipientdlg.c:336
msgid "No recipients - encryption is not possible"
-msgstr ""
+msgstr "无收件人 - 不可加密"
#: src/recipientdlg.c:422
msgid "[Ambiguous keys. Right-click to select]"
-msgstr ""
+msgstr "[模糊的密钥。右击以选择]"
#: src/recipientdlg.c:424
msgid "[Ambiguous PGP key. Right-click to select]"
-msgstr ""
+msgstr "[模糊的 PGP 密钥。右击以选择]"
#: src/recipientdlg.c:426
msgid "[Ambiguous X.509 key. Right-click to select]"
-msgstr ""
+msgstr "[模糊的 X.509 密钥。右击以选择]"
#: src/recipientdlg.c:439
msgid "[Right-click to select]"
-msgstr ""
+msgstr "[右击以选择]"
#: src/recipientdlg.c:824
msgid "Select _PGP key..."
-msgstr ""
+msgstr "选择 _PGP 密钥…"
#: src/recipientdlg.c:826
msgid "Select _S\\/MIME key..."
-msgstr ""
+msgstr "选择 _S\\/MIME 密钥…"
#: src/recipientdlg.c:828
msgid "Toggle _Ignore flag"
-msgstr ""
+msgstr "改变忽略参数 (_I)"
#: src/recipientdlg.c:941
msgid "Select keys for recipients"
-msgstr ""
+msgstr "为收件人选择密钥"
#: src/recipientdlg.c:958
msgid "_Recipient list"
-msgstr ""
+msgstr "收件人列表 (_R)"
#: src/recipientdlg.c:981
msgid "Use _PGP"
-msgstr ""
+msgstr "使用 _PGP"
#: src/recipientdlg.c:984
msgid "Use _X.509"
-msgstr ""
+msgstr "使用 _X.509"
#: src/recipientdlg.c:987
msgid "_Auto selection"
-msgstr ""
+msgstr "自动选择 (_A)"
#: src/selectkeydlg.c:178
msgid "Select a key"
-msgstr ""
+msgstr "选择一个密钥"
#: src/server-access.c:298
msgid "No error"
-msgstr ""
+msgstr "没有错误"
#: src/server-access.c:301
msgid "Internal error"
-msgstr ""
+msgstr "内部错误"
#: src/server-access.c:304
msgid "Operation not supported"
-msgstr ""
+msgstr "操作不支持"
#: src/server-access.c:307
msgid "Version mismatch"
-msgstr ""
+msgstr "版本不对"
#: src/server-access.c:310
msgid "Internal keyserver error"
-msgstr ""
+msgstr "内部公钥服务器错误"
#: src/server-access.c:313
msgid "Out of memory"
-msgstr ""
+msgstr "记忆体不足"
#: src/server-access.c:316
msgid "Key not found"
-msgstr ""
+msgstr "找不到公钥"
#: src/server-access.c:319
msgid "Key already exists on server"
-msgstr ""
+msgstr "已寄到服务器。"
#: src/server-access.c:322
msgid "Key incomplete"
-msgstr ""
+msgstr "钥对不完整"
#: src/server-access.c:325
msgid "Could not contact keyserver"
-msgstr ""
+msgstr "找不到公钥服务器"
#: src/server-access.c:328
msgid "Unknown Error"
-msgstr ""
+msgstr "未知的错误"
#: src/server-access.c:364
#, c-format
@@ -1961,6 +2081,8 @@ msgid ""
"Connecting to server \"%s\".\n"
"Please wait."
msgstr ""
+"正在联络服务器 \"%s\" 中\n"
+"请等候…"
#: src/server-access.c:387 src/server-access.c:407
#, c-format
@@ -1969,68 +2091,73 @@ msgid ""
"\n"
"%s"
msgstr ""
+"联络服务器时发生错误:\n"
+"\n"
+"%s"
#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
msgstr ""
+"没有与服务器通讯协定使用的\n"
+"外挂模组"
#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
-msgstr ""
+msgstr "服务器并无效"
#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
-msgstr ""
+msgstr "本地"
#: src/settingsdlg.c:136
msgid "Local, Keyserver"
-msgstr ""
+msgstr "本地，服务器"
#: src/settingsdlg.c:138
msgid "Local, PKA"
-msgstr ""
+msgstr "本地，PKA"
#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
-msgstr ""
+msgstr "本地，PKA，服务器"
#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
-msgstr ""
+msgstr "本地，服务器，PKA"
#: src/settingsdlg.c:143
msgid "Local, kDNS"
-msgstr ""
+msgstr "本地，kDNS"
#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
-msgstr ""
+msgstr "本地，kDNS，服务器"
#: src/settingsdlg.c:147
msgid "PKA"
-msgstr ""
+msgstr "本地，PKA，服务器"
#: src/settingsdlg.c:148
msgid "kDNS"
-msgstr ""
+msgstr "本地，kDNS，服务器"
#: src/settingsdlg.c:149
msgid "Custom"
-msgstr ""
+msgstr "自定义"
#: src/settingsdlg.c:221
msgid "<b>User interface</b>"
-msgstr ""
+msgstr "<b>用户界面</b>"
#: src/settingsdlg.c:228
msgid "Use _advanced mode"
-msgstr ""
+msgstr "使用进阶模式 (_A):"
#: src/settingsdlg.c:234
msgid "Show advanced _options"
-msgstr ""
+msgstr "显示高级选项 (_O)"
#: src/settingsdlg.c:285
msgid ""
@@ -2040,26 +2167,30 @@ msgid ""
"\n"
"Please consider creating your own key and select it then."
msgstr ""
+"未选择预设密钥，这可能在签名或加密时导致问题。例如稍后你可能不能阅读你自己所"
+"写为他人加密的邮件。\n"
+"\n"
+"请考虑创建自己的密钥并选中。"
#: src/settingsdlg.c:291
msgid "Continue without a default key"
-msgstr ""
+msgstr "不选择预设密钥就继续"
#: src/settingsdlg.c:293
msgid "Let me select a default key"
-msgstr ""
+msgstr "让我选择一个预设密钥"
#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
-msgstr ""
+msgstr "<b>预设密钥 (_K)</b>"
#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
-msgstr ""
+msgstr "<b>预设公钥服务器</b>"
#: src/settingsdlg.c:630
msgid "<b>Auto key _locate</b>"
-msgstr ""
+msgstr "<b>自动寻找密钥 (_L)</b>"
#: src/settingsdlg.c:640
msgid ""
@@ -2077,85 +2208,97 @@ msgid ""
" Custom\n"
" - Configured in the backend dialog.\n"
msgstr ""
+"通过邮件地址寻找密钥的方式：\n"
+"所有可用方式会被逐个尝试，直到匹配的密钥找到。支持的方式有：\n"
+"本地\n"
+" - 使用本地钥匙圈。\n"
+"公钥服务器\n"
+" - 使用默认公钥服务器。\n"
+"PKA\n"
+" - 使用公钥组织。\n"
+"kDNS\n"
+" - 对以下的 DNS 使用 kDNS。\n"
+"自定义\n"
+" - 可在后端对话框配置。\n"
#: src/settingsdlg.c:657
msgid "Method:"
-msgstr ""
+msgstr "方法:"
#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
-msgstr ""
+msgstr "用于 kDNS 的 DNS 地址。"
#: src/settingsdlg.c:676
msgid "kDNS Server:"
-msgstr ""
+msgstr "kDNS 服务器:"
#: src/settingsdlg.c:779
msgid "The URL given for the keyserver is not valid."
-msgstr ""
+msgstr "公钥服务器 URL 无效。"
#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
-msgstr ""
+msgstr "用于自动寻找密钥的数据无效。"
#: src/settingsdlg.c:929
msgid "Settings"
-msgstr ""
+msgstr "设定"
#: src/siglist.c:157
msgid "Level"
-msgstr ""
+msgstr "程度"
#: src/verifydlg.c:116
msgid "Verify documents"
-msgstr ""
+msgstr "验证文档"
#: src/verifydlg.c:235
msgid "Expired Key"
-msgstr ""
+msgstr "已过期的公钥"
#: src/verifydlg.c:243
msgid "Key NOT valid"
-msgstr ""
+msgstr "公钥无效"
#: src/verifydlg.c:354
msgid "Description"
-msgstr ""
+msgstr "描述"
#: src/verifydlg.c:378
#, c-format
msgid "Verified data in file: %s"
-msgstr ""
+msgstr "验证文件中的数据: %s"
#: src/verifydlg.c:383
#, c-format
msgid "Signature: %s"
-msgstr ""
+msgstr "签名: %s"
#: src/verifydlg.c:389
msgid "Signatures:"
-msgstr ""
+msgstr "签名"
#: src/cardman.c:167 src/cardman.c:929
msgid "Card Manager"
-msgstr ""
+msgstr "卡片管理器"
#: src/cardman.c:188
#, c-format
msgid "%s card detected."
-msgstr ""
+msgstr "找到 %s 卡。"
#: src/cardman.c:195
msgid "Checking for card..."
-msgstr ""
+msgstr "检查卡…"
#: src/cardman.c:369
msgid "No card found."
-msgstr ""
+msgstr "找不到卡。"
#: src/cardman.c:375
msgid "The selected card application is currently not available."
-msgstr ""
+msgstr "卡应用不可用。"
#: src/cardman.c:376
msgid ""
@@ -2168,43 +2311,43 @@ msgstr ""
#: src/cardman.c:386
msgid "The selected card application is not available."
-msgstr ""
+msgstr "卡应用不可用。"
#: src/cardman.c:399
msgid "Error accessing the card."
-msgstr ""
+msgstr "访问此卡时出错。"
#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
-msgstr ""
+msgstr "访问卡出错。"
#: src/cardman.c:429
msgid "No card"
-msgstr ""
+msgstr "无卡"
#: src/cardman.c:651
msgid "_Card"
-msgstr ""
+msgstr "智能卡 (_C)"
#: src/cardman.c:661
msgid "Reload card information"
-msgstr ""
+msgstr "重新加载卡信息"
#: src/cardman.c:663
msgid "Generate new key on card"
-msgstr ""
+msgstr "建立新密钥到卡上"
#: src/cardman.c:793
msgid "This card application is not yet supported."
-msgstr ""
+msgstr "不支持此卡应用。"
#: src/cardman.c:937
msgid "Application selection:"
-msgstr ""
+msgstr "应用选择："
#: src/cardman.c:941
msgid "Auto"
-msgstr ""
+msgstr "自动"
#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
@@ -2237,19 +2380,19 @@ msgstr ""
#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
-msgstr ""
+msgstr "重置 PIN"
#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
-msgstr ""
+msgstr "改变 PIN"
#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
-msgstr ""
+msgstr "改变 PUK"
#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
-msgstr ""
+msgstr "重置 PUK"
#: src/cm-openpgp.c:685
#, c-format
@@ -2260,15 +2403,15 @@ msgstr ""
#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
-msgstr ""
+msgstr "目前只允许使用 ASCII 字符。"
#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
-msgstr ""
+msgstr "不能使用字符“<”。"
#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
-msgstr ""
+msgstr "不允许出现两个空格。"
#: src/cm-openpgp.c:744
msgid ""
@@ -2278,11 +2421,11 @@ msgstr ""
#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
msgid "Saving the field failed."
-msgstr ""
+msgstr "保持失败。"
#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
-msgstr ""
+msgstr "语音首选项字符串长度无效。"
#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
@@ -2315,7 +2458,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2336,7 +2479,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2391,27 +2534,27 @@ msgstr ""
#: src/cm-openpgp.c:1334
msgid "Fetch Key"
-msgstr ""
+msgstr " 获取密钥"
#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
msgid "<b>General</b>"
-msgstr ""
+msgstr "<b>通用</b>"
#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
-msgstr ""
+msgstr "序列号:"
#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
-msgstr ""
+msgstr "卡版本:"
#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
-msgstr ""
+msgstr "生产商:"
#: src/cm-openpgp.c:1438
msgid "<b>Personal</b>"
-msgstr ""
+msgstr "<b>个人</b>"
#: src/cm-openpgp.c:1452
msgid "Salutation:"
@@ -2419,67 +2562,67 @@ msgstr ""
#: src/cm-openpgp.c:1457
msgid "First name:"
-msgstr ""
+msgstr "名:"
#: src/cm-openpgp.c:1462
msgid "Last name:"
-msgstr ""
+msgstr "姓:"
#: src/cm-openpgp.c:1467
msgid "Language:"
-msgstr ""
+msgstr "首选语言："
#: src/cm-openpgp.c:1472
msgid "Login data:"
-msgstr ""
+msgstr "登录数据(帐号名)："
#: src/cm-openpgp.c:1477
msgid "Public key URL:"
-msgstr ""
+msgstr "获取公钥的 URL："
#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
msgid "<b>Keys</b>"
-msgstr ""
+msgstr "<b>密钥</b>"
#: src/cm-openpgp.c:1502
msgid "Signature key:"
-msgstr ""
+msgstr "签名密钥:"
#: src/cm-openpgp.c:1506
msgid "Encryption key:"
-msgstr ""
+msgstr "加密密钥:"
#: src/cm-openpgp.c:1510
msgid "Authentication key:"
-msgstr ""
+msgstr "认证密钥:"
#: src/cm-openpgp.c:1514
msgid "Signature counter:"
-msgstr ""
+msgstr "签名计数:"
#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
-msgstr ""
+msgstr "<b>PIN</b>"
#: src/cm-openpgp.c:1534
msgid "Force signature PIN:"
-msgstr ""
+msgstr "PIN 签名是否必须:"
#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
-msgstr ""
+msgstr "PIN 重试计数:"
#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
-msgstr ""
+msgstr "管理员 PIN 重试计数:"
#: src/cm-netkey.c:142
msgid "blocked"
-msgstr ""
+msgstr "已屏蔽"
#: src/cm-netkey.c:374
msgid "Learn keys"
-msgstr ""
+msgstr "学习密钥"
#: src/cm-netkey.c:376
msgid ""
@@ -2496,7 +2639,7 @@ msgstr ""
#: src/cm-netkey.c:596
msgid "Learning keys ..."
-msgstr ""
+msgstr "密钥学习中…"
#: src/cm-netkey.c:639
#, c-format
@@ -2589,11 +2732,11 @@ msgstr ""
#: src/cm-netkey.c:924
msgid "Set initial PIN"
-msgstr ""
+msgstr "设置初始 PIN"
#: src/cm-netkey.c:945
msgid "scanning ..."
-msgstr ""
+msgstr "扫描中…"
#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
@@ -2610,3 +2753,6 @@ msgid ""
"the application selector button to switch to another application available "
"on this card."
msgstr ""
+
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "密钥 ID 是一串用来辨别证书的短数字。"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 2658988..0dee7ff 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f8f2847..96d4315 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa-0.7.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2015-09-09 11:21+0200\n"
+"POT-Creation-Date: 2016-11-19 12:04+0100\n"
"PO-Revision-Date: 2003-10-20 11:55+0200\n"
"Last-Translator: Shell Hung <shell at linux.org.hk>\n"
"Language-Team: Hong Kong Linux User Group <info at linux.org.hk>\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:928
#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/�ɮ�"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:929
#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
@@ -90,7 +90,7 @@ msgstr "
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:939
#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -109,12 +109,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "�[�K�w����ɮ�"
-#: src/clipboard.c:795 src/keymanager.c:940
+#: src/clipboard.c:795 src/keymanager.c:943
#, fuzzy
msgid "Copy the selection"
msgstr "�[�K�w����ɮ�"
-#: src/clipboard.c:797 src/keymanager.c:942
+#: src/clipboard.c:797 src/keymanager.c:945
msgid "Paste the clipboard"
msgstr ""
@@ -132,11 +132,11 @@ msgstr ""
msgid "Keyring"
msgstr "�_��s�边"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
+#: src/clipboard.c:917 src/keymanager.c:1136 src/cardman.c:745
msgid "Files"
msgstr "�ɮ�"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1139
msgid "Card"
msgstr ""
@@ -214,13 +214,13 @@ msgid "Configure backend to use a keyserver?"
msgstr ""
#: src/confdialog.c:1592 src/gpaexportserverop.c:158
-#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/gpafileencryptop.c:482 src/gpafileverifyop.c:183 src/gpgmetools.c:183
#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
msgid "_Yes"
msgstr "�O (&Y)"
#: src/confdialog.c:1593 src/gpaexportserverop.c:159
-#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/gpafileencryptop.c:483 src/gpafileverifyop.c:184 src/gpgmetools.c:184
#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
msgid "_No"
msgstr "�_ (&N)"
@@ -245,23 +245,23 @@ msgstr "
msgid "years"
msgstr "�~"
-#: src/convert.c:95
+#: src/convert.c:107
msgid "never expires"
msgstr "�û��ͮ�"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
+#: src/convert.c:128 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "�����W"
-#: src/convert.c:123
+#: src/convert.c:136
msgid "Mr."
msgstr ""
-#: src/convert.c:125
+#: src/convert.c:138
msgid "Ms."
msgstr ""
-#: src/convert.c:129
+#: src/convert.c:142
#, fuzzy
msgid "(unknown)"
msgstr "�����W"
@@ -295,7 +295,7 @@ msgstr "
msgid "Change expiry date"
msgstr "��靈�Ĥ��"
-#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138 src/gpgmetools.c:201
msgid "_Cancel"
msgstr ""
@@ -336,16 +336,16 @@ msgstr ""
msgid "Select all files"
msgstr "�����Ҧ��ɮ�"
-#: src/fileman.c:738
+#: src/fileman.c:737
msgid "File"
msgstr "�ɮ�"
-#: src/fileman.c:802 src/fileman.c:825
+#: src/fileman.c:801 src/fileman.c:824
#, fuzzy
msgid "File Manager"
msgstr "�ɮz��"
-#: src/fileman.c:901
+#: src/fileman.c:900
msgid "The file is already open."
msgstr "�o���ɮפw�g�}��."
@@ -393,7 +393,7 @@ msgstr "
msgid "Open file manager"
msgstr "�}���ɮz��"
-#: src/gpa.c:114 src/gpa.h:91
+#: src/gpa.c:114 src/gpa.h:95
#, fuzzy
msgid "Open the card manager"
msgstr "�}���ɮz��"
@@ -439,37 +439,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "�^������ <"
-#: src/gpa.h:80
+#: src/gpa.h:84
#, fuzzy
msgid "_Windows"
msgstr "/����"
-#: src/gpa.h:83
+#: src/gpa.h:87
#, fuzzy
msgid "Open the keyring editor"
msgstr "�}���_��s�边 (�w�])"
-#: src/gpa.h:85
+#: src/gpa.h:89
#, fuzzy
msgid "Open the file manager"
msgstr "�}���ɮz��"
-#: src/gpa.h:87
+#: src/gpa.h:91
#, fuzzy
msgid "Open the clipboard"
msgstr "�}���ɮz��"
-#: src/gpa.h:105
+#: src/gpa.h:109
#, fuzzy
msgid "Configure the application"
msgstr "�[�K�w����ɮ�"
-#: src/gpa.h:108
+#: src/gpa.h:112
#, fuzzy
msgid "_Backend Preferences"
msgstr "/�s��/�]�w (&E)"
-#: src/gpa.h:109
+#: src/gpa.h:113
msgid "Configure the backend programs"
msgstr ""
@@ -552,28 +552,28 @@ msgstr "
msgid "Decrypting..."
msgstr "�ѱK��..."
-#: src/gpafiledecryptop.c:509 src/gpafileverifyop.c:482
+#: src/gpafiledecryptop.c:515 src/gpafileverifyop.c:482
#, fuzzy, c-format
msgid "\"%s\" contained no OpenPGP data."
msgstr "�ɮ� \"%s\" �S�����T�� OpenPGP ���."
-#: src/gpafiledecryptop.c:510 src/gpafileverifyop.c:483
+#: src/gpafiledecryptop.c:516 src/gpafileverifyop.c:483
#, fuzzy, c-format
msgid "The file \"%s\" contained no OpenPGPdata."
msgstr "�ɮ� \"%s\" �S�����T�� OpenPGP ���."
-#: src/gpafiledecryptop.c:520
+#: src/gpafiledecryptop.c:526
#, fuzzy, c-format
msgid "\"%s\" contained no valid encrypted data."
msgstr "�ɮ� \"%s\" �S�����T���[�K���."
-#: src/gpafiledecryptop.c:522
+#: src/gpafiledecryptop.c:528
#, fuzzy, c-format
-msgid "The file \"%s\" contained no validencrypted data."
+msgid "The file \"%s\" contained no valid encrypted data."
msgstr "�ɮ� \"%s\" �S�����T���[�K���."
-#: src/gpafiledecryptop.c:531 src/gpafileencryptop.c:768
-#: src/gpafilesignop.c:522 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
+#: src/gpafiledecryptop.c:537 src/gpafileencryptop.c:775
+#: src/gpafilesignop.c:528 src/gpafileverifyop.c:493 src/gpakeyexpireop.c:240
#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:240 src/gpastreamsignop.c:425
msgid "Wrong passphrase!"
msgstr "�K�X���~!"
@@ -582,47 +582,47 @@ msgstr "
msgid "Encrypting..."
msgstr "�[�K��..."
-#: src/gpafileencryptop.c:474 src/verifydlg.c:225
+#: src/gpafileencryptop.c:480 src/verifydlg.c:225
msgid "Unknown Key"
msgstr "���������_"
-#: src/gpafileencryptop.c:490
+#: src/gpafileencryptop.c:496
#, fuzzy
msgid "You are going to encrypt a document using the following key:"
msgstr "�z���ϥΥH�U���K�_�[�K�o���ɮ�:"
-#: src/gpafileencryptop.c:496
+#: src/gpafileencryptop.c:502
msgid "However, it is not certain that the key belongs to that person."
msgstr "���L, �K�_�ä��ݩ��誺"
-#: src/gpafileencryptop.c:502
+#: src/gpafileencryptop.c:508
msgid "Do you <b>really</b> want to use this key?"
msgstr "�z�T�w�n�ϥγo�ӱK�_ ?"
-#: src/gpafileencryptop.c:523 src/gpafileencryptop.c:563 src/verifydlg.c:230
+#: src/gpafileencryptop.c:529 src/gpafileencryptop.c:569 src/verifydlg.c:230
msgid "Revoked Key"
msgstr "�����K�_"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/gpafileencryptop.c:531 src/gpafileencryptop.c:571 src/keyeditdlg.c:150
#: src/verifydlg.c:115
msgid "_Close"
msgstr "���� (&C)"
-#: src/gpafileencryptop.c:538
+#: src/gpafileencryptop.c:544
#, fuzzy
msgid "The following key has been revoked by its owner:"
msgstr "�o���_�w�Q�������F:"
-#: src/gpafileencryptop.c:543 src/gpafileencryptop.c:586
+#: src/gpafileencryptop.c:549 src/gpafileencryptop.c:593
msgid "And can not be used for encryption."
msgstr "�ӥB���i�H�ϥΧ@���[�K����."
-#: src/gpafileencryptop.c:578
+#: src/gpafileencryptop.c:585
#, c-format
msgid "The following key expired on %s:"
msgstr "�o�K�_�|�b %s ���� :"
-#: src/gpafileencryptop.c:617 src/gpafilesignop.c:445
+#: src/gpafileencryptop.c:624 src/gpafilesignop.c:451
#: src/gpastreamsignop.c:278
msgid ""
"The selected certificates are not all of the same type. That is, you mixed "
@@ -630,7 +630,7 @@ msgid ""
"of the same type."
msgstr ""
-#: src/gpafileencryptop.c:692 src/gpafilesignop.c:431
+#: src/gpafileencryptop.c:699 src/gpafilesignop.c:437
#: src/gpastreamsignop.c:264
msgid "You didn't select any key for signing"
msgstr "�S�����ñ�p���ɮ�"
@@ -668,7 +668,7 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
-#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1292
msgid "No keys were found."
msgstr "�䤣��K�_."
@@ -678,12 +678,16 @@ msgid ""
"(you may not set the expiration time to the past.)"
msgstr ""
-#: src/gpakeyselector.c:86 src/keylist.c:630 src/recipientdlg.c:191
-#: src/siglist.c:123 src/siglist.c:143 src/verifydlg.c:336
-msgid "Key ID"
-msgstr "�K�_ID"
+#: src/gpakeyselector.c:91 src/gpasubkeylist.c:119 src/keylist.c:622
+#, fuzzy
+msgid "Created"
+msgstr "�إߦb :"
+
+#: src/gpakeyselector.c:92 src/keylist.c:623
+msgid "The Creation Date is the date the certificate was created."
+msgstr ""
-#: src/gpakeyselector.c:95 src/keylist.c:691 src/siglist.c:129
+#: src/gpakeyselector.c:99 src/keylist.c:673 src/siglist.c:129
#: src/siglist.c:172 src/verifydlg.c:348
msgid "User Name"
msgstr "�Ϊ̦W��"
@@ -751,103 +755,98 @@ msgstr ""
msgid "Verifying message ..."
msgstr "���Ҥ�..."
-#: src/gpasubkeylist.c:90
+#: src/gpasubkeylist.c:92
msgid "Subkey ID"
msgstr "�l�_�Ǹ�"
-#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:98 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "���A"
-#: src/gpasubkeylist.c:102
+#: src/gpasubkeylist.c:104
#, fuzzy
msgid "Algo"
msgstr "�[�K�⦡"
-#: src/gpasubkeylist.c:110
+#: src/gpasubkeylist.c:112
msgid "Size"
msgstr "�j�p"
-#: src/gpasubkeylist.c:117 src/keylist.c:640
-#, fuzzy
-msgid "Created"
-msgstr "�إߦb :"
-
-#: src/gpasubkeylist.c:124
+#: src/gpasubkeylist.c:126
#, fuzzy
msgid "Expires"
msgstr "�w�g�L��"
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:133
+#: src/gpasubkeylist.c:135
msgid "Can sign"
msgstr "���\ñ�p"
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:139
+#: src/gpasubkeylist.c:141
msgid "Can certify"
msgstr "���\����"
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:145
+#: src/gpasubkeylist.c:147
msgid "Can encrypt"
msgstr "���\�[�K"
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:151
+#: src/gpasubkeylist.c:153
msgid "Can authenticate"
msgstr "���\�o��"
-#: src/gpasubkeylist.c:157
+#: src/gpasubkeylist.c:159
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:158
+#: src/gpasubkeylist.c:160
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:164
+#: src/gpasubkeylist.c:166
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:165
+#: src/gpasubkeylist.c:167
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
-#: src/gpgmetools.c:1042
+#: src/gpasubkeylist.c:183 src/gpgmetools.c:739 src/gpgmetools.c:956
+#: src/gpgmetools.c:1075
msgid "Revoked"
msgstr "����"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:187 src/gpgmetools.c:741 src/gpgmetools.c:1071
msgid "Expired"
msgstr "�w�g�L��"
-#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:191 src/gpgmetools.c:743
msgid "Disabled"
msgstr "�w�g����"
-#: src/gpasubkeylist.c:193
+#: src/gpasubkeylist.c:195
msgid "Unsigned"
msgstr "�S��ñ�p"
-#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:199 src/gpgmetools.c:1062 src/verifydlg.c:215
msgid "Valid"
msgstr "���T"
-#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/gpawidgets.c:75 src/gpgmetools.c:787 src/gpgmetools.c:794
#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "�Ϊ̦W�� :"
@@ -856,12 +855,12 @@ msgstr "
msgid "User Names:"
msgstr "�Ϊ̦W�� :"
-#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:309
+#: src/gpawidgets.c:81 src/gpgmetools.c:788 src/gpgmetools.c:795
+#: src/gpa-key-details.c:316
msgid "Key ID:"
msgstr "�K�_ ID:"
-#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+#: src/gpawidgets.c:91 src/gpa-key-details.c:314 src/keysigndlg.c:109
msgid "Fingerprint:"
msgstr "����:"
@@ -934,7 +933,7 @@ msgstr ""
"\n"
"�o���i��O GPA �{�������D.nGPA �{�b���ձq���~���^�_."
-#: src/gpgmetools.c:172
+#: src/gpgmetools.c:180
#, c-format
msgid ""
"The file %s already exists.\n"
@@ -943,7 +942,16 @@ msgstr ""
"�ɮ� %s �w�g�s�b.\n"
"�n�i���мg��?"
-#: src/gpgmetools.c:581
+#: src/gpgmetools.c:185
+msgid "_Use a different filename"
+msgstr ""
+
+#: src/gpgmetools.c:202
+#, fuzzy
+msgid "_Open"
+msgstr "/�ɮ�/�}�� (&O)"
+
+#: src/gpgmetools.c:614
msgid ""
"************************************************************************\n"
"* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -957,7 +965,7 @@ msgstr ""
"****************************************\n"
"\n"
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:620
msgid ""
"The key backed up in this file is:\n"
"\n"
@@ -965,205 +973,205 @@ msgstr ""
"�w�ƥ����_��b�ɮת��O :\n"
"\n"
-#: src/gpgmetools.c:674 src/gpgmetools.c:697 src/gpgmetools.c:714
-#: src/gpgmetools.c:1034 src/gpgmetools.c:1067
+#: src/gpgmetools.c:707 src/gpgmetools.c:730 src/gpgmetools.c:747
+#: src/gpgmetools.c:1067 src/gpgmetools.c:1100
msgid "Unknown"
msgstr "�����W"
-#: src/gpgmetools.c:677
+#: src/gpgmetools.c:710
msgid "Never"
msgstr "��H��"
-#: src/gpgmetools.c:680
+#: src/gpgmetools.c:713
msgid "Marginal"
msgstr "�����H��"
-#: src/gpgmetools.c:683
+#: src/gpgmetools.c:716
msgid "Full"
msgstr "�����H��"
-#: src/gpgmetools.c:686
+#: src/gpgmetools.c:719
msgid "Ultimate"
msgstr "�û��H��"
-#: src/gpgmetools.c:712
+#: src/gpgmetools.c:745
msgid "Incomplete"
msgstr "�����㪺"
-#: src/gpgmetools.c:718
+#: src/gpgmetools.c:751
msgid "Fully Valid"
msgstr "�����X�k��"
-#: src/gpgmetools.c:752
+#: src/gpgmetools.c:785
msgid "Please enter the passphrase for the following key:"
msgstr "��J�H�U�K�_���K�X:"
-#: src/gpgmetools.c:760
+#: src/gpgmetools.c:793
msgid "Wrong passphrase, please try again:"
msgstr "�K�X���~, �ЦA���� :"
-#: src/gpgmetools.c:785
+#: src/gpgmetools.c:818
msgid "Enter Passphrase"
msgstr "��J�K�X"
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:945
msgid "[None]"
msgstr ""
-#: src/gpgmetools.c:1006 src/verifydlg.c:279
+#: src/gpgmetools.c:1039 src/verifydlg.c:279
msgid "[Unknown user ID]"
msgstr "[���W��ID]"
-#: src/gpgmetools.c:1032 src/verifydlg.c:220
+#: src/gpgmetools.c:1065 src/verifydlg.c:220
msgid "Bad"
msgstr "���X�k��"
-#: src/gpgmetools.c:1055
+#: src/gpgmetools.c:1088
msgid "Generic"
msgstr "�q��"
-#: src/gpgmetools.c:1058
+#: src/gpgmetools.c:1091
msgid "Persona"
msgstr "�p��"
-#: src/gpgmetools.c:1061
+#: src/gpgmetools.c:1094
msgid "Casual"
msgstr "�{��"
-#: src/gpgmetools.c:1064
+#: src/gpgmetools.c:1097
msgid "Positive"
msgstr "�T�w"
-#: src/gpgmetools.c:1101
+#: src/gpgmetools.c:1134
#, fuzzy, c-format
msgid "Bad signature by %s: %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1104
+#: src/gpgmetools.c:1137
#, fuzzy, c-format
msgid "Bad signature by %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1107
+#: src/gpgmetools.c:1140
#, c-format
msgid "Bad signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1110
+#: src/gpgmetools.c:1143
#, c-format
msgid "Bad signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1113
+#: src/gpgmetools.c:1146
#, c-format
msgid "Bad signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1116
+#: src/gpgmetools.c:1149
msgid "Bad signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1121
+#: src/gpgmetools.c:1154
#, fuzzy, c-format
msgid "Good signature by %s: %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1124
+#: src/gpgmetools.c:1157
#, fuzzy, c-format
msgid "Good signature by %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1127
+#: src/gpgmetools.c:1160
#, c-format
msgid "Good signature by unknown key %s: %s"
msgstr ""
-#: src/gpgmetools.c:1130
+#: src/gpgmetools.c:1163
#, c-format
msgid "Good signature by unknown key %s"
msgstr ""
-#: src/gpgmetools.c:1133
+#: src/gpgmetools.c:1166
#, c-format
msgid "Good signature by unknown key: %s"
msgstr ""
-#: src/gpgmetools.c:1136
+#: src/gpgmetools.c:1169
msgid "Good signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1141
+#: src/gpgmetools.c:1174
#, fuzzy, c-format
msgid "Uncertain signature by %s: %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1144
+#: src/gpgmetools.c:1177
#, fuzzy, c-format
msgid "Uncertain signature by %s"
msgstr "�Ҧ�ñ�p"
-#: src/gpgmetools.c:1147
+#: src/gpgmetools.c:1180
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s: %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1150
+#: src/gpgmetools.c:1183
#, fuzzy, c-format
msgid "Uncertain signature by unknown key %s"
msgstr "�Ҧ�ñ�p"
-#: src/gpgmetools.c:1153
+#: src/gpgmetools.c:1186
#, fuzzy, c-format
msgid "Uncertain signature by unknown key: %s"
msgstr "ñ�p"
-#: src/gpgmetools.c:1156
+#: src/gpgmetools.c:1189
msgid "Uncertain signature by unknown key"
msgstr ""
-#: src/gpgmetools.c:1185
+#: src/gpgmetools.c:1218
msgid "The key can be used for certification, signing and encryption."
msgstr "�K�_�i�Q�Χ@����, ñ�p�Υ[�K."
-#: src/gpgmetools.c:1188
+#: src/gpgmetools.c:1221
msgid ""
"The key can be used for certification and signing, but not for encryption."
msgstr "�K�_�i�Q�Χ@���Ҥ�ñ�p, �ä����\�Φb�[�K�W."
-#: src/gpgmetools.c:1194
+#: src/gpgmetools.c:1227
msgid "The key can be used for certification and encryption."
msgstr "�K�_�i�Χ@���ҤΥ[�K."
-#: src/gpgmetools.c:1197
+#: src/gpgmetools.c:1230
msgid "The key can be used only for certification."
msgstr "�K�_�u�i�Χ@����."
-#: src/gpgmetools.c:1205
+#: src/gpgmetools.c:1238
msgid ""
"The key can be used only for signing and encryption, but not for "
"certification."
msgstr "�K�_�u�i�H�Q�Χ@ñ�p�Υ[�K.�ä����\�Φb���ҥγ~."
-#: src/gpgmetools.c:1208
+#: src/gpgmetools.c:1241
msgid "The key can be used only for signing."
msgstr "�K�_�u�i�Χ@ñ�p."
-#: src/gpgmetools.c:1213
+#: src/gpgmetools.c:1246
msgid "The key can be used only for encryption."
msgstr "�K�_�u�i�Χ@�[�K."
-#: src/gpgmetools.c:1216
+#: src/gpgmetools.c:1249
msgid "This key is useless."
msgstr "�K�_�O���i�ϥΪ�."
-#: src/gpgmetools.c:1249
+#: src/gpgmetools.c:1282
#, c-format
msgid ""
"%u file(s) read\n"
"%u file(s) with errors"
msgstr ""
-#: src/gpgmetools.c:1264
+#: src/gpgmetools.c:1297
#, c-format
msgid ""
"%i public keys read\n"
@@ -1180,35 +1188,35 @@ msgstr ""
"%i �p�_�w�פJ\n"
"%i �p�_�w�פJ"
-#: src/gpgmetools.c:1579
+#: src/gpgmetools.c:1612
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1623
+#: src/gpgmetools.c:1656
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1694
+#: src/gpgmetools.c:1727
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1696
+#: src/gpgmetools.c:1729
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1698
+#: src/gpgmetools.c:1731
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1700
+#: src/gpgmetools.c:1733
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1772
+#: src/gpgmetools.c:1805
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1786
+#: src/gpgmetools.c:1819
msgid "Invalid character in comments."
msgstr ""
@@ -1337,7 +1345,7 @@ msgstr "
msgid "Change _passphrase"
msgstr "���K�X (&P)"
-#: src/keyeditdlg.c:169 src/keylist.c:653
+#: src/keyeditdlg.c:169 src/keylist.c:635
msgid "Expiry Date"
msgstr "���Ĥ��"
@@ -1466,7 +1474,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "�إ߳ƥ� (&b)"
-#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
+#: src/keygenwizard.c:248 src/keymanager.c:782 src/keymanager.c:808
msgid "Do it _later"
msgstr "����~�i�� (&l)"
@@ -1492,7 +1500,7 @@ msgstr ""
"\n"
"�s���_�w�g�إ�. �o�_�w�Q�{���Ψ䭫��1024 bits."
-#: src/keylist.c:364
+#: src/keylist.c:362
msgid ""
"GnuPG is rebuilding the trust database.\n"
"This might take a few seconds."
@@ -1500,48 +1508,39 @@ msgstr ""
"GnuPG ���b���ظ�Ʈw.\n"
"�Э@�ߵ���..."
-#: src/keylist.c:622
+#: src/keylist.c:614
msgid ""
"This columns lists the type of the certificate. A 'P' denotes OpenPGP and a "
"'X' denotes X.509 (S/MIME)."
msgstr ""
-#: src/keylist.c:631
-#, fuzzy
-msgid "The key ID is a short number to identify a certificate."
-msgstr "�K�_�u�i�Χ@����."
-
-#: src/keylist.c:641
-msgid "The Creation Date is the date the certificate was created."
-msgstr ""
-
-#: src/keylist.c:654
+#: src/keylist.c:636
msgid "The Expiry Date is the date until the certificate is valid."
msgstr ""
-#: src/keylist.c:664 src/ownertrustdlg.c:122
+#: src/keylist.c:646 src/ownertrustdlg.c:122
msgid "Owner Trust"
msgstr "�۫H�֦���"
-#: src/keylist.c:665
+#: src/keylist.c:647
msgid ""
"The Owner Trust has been set by you and describes how far you trust the "
"holder of the certificate to correctly sign (certify) other certificates. "
"It is only meaningful for OpenPGP."
msgstr ""
-#: src/keylist.c:677
+#: src/keylist.c:659
#, fuzzy
msgid "Validity"
msgstr "�J�Ҥ��_"
-#: src/keylist.c:678
+#: src/keylist.c:660
msgid ""
"The Validity describes the trust level the system has in this certificate. "
"That is how sure it is that the named user is actually that user."
msgstr ""
-#: src/keylist.c:692
+#: src/keylist.c:674
msgid ""
"The User Name is the name and often also the email address of the "
"certificate."
@@ -1551,277 +1550,281 @@ msgstr ""
msgid "No keys selected for signing."
msgstr "�S����ܧ@ñ�p���K�_."
-#: src/keymanager.c:774
+#: src/keymanager.c:777
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
msgstr "�z�èS���p�_, ��ij�z�{�b�إߩάO����~�إ�?"
-#: src/keymanager.c:778
+#: src/keymanager.c:781
msgid "_Generate key now"
msgstr "�{�b�إ��_ (&G)"
-#: src/keymanager.c:799
+#: src/keymanager.c:802
msgid ""
"You do not have a backup copy of your private key yet. Do you want to backup "
"your key now (recommended) or do it later?"
msgstr "�z�èS���p�_, ��ij�z�{�b�إߩάO����~�إ�?"
-#: src/keymanager.c:804
+#: src/keymanager.c:807
msgid "_Backup key now"
msgstr "�{�b�i��ƥ� (&G)"
-#: src/keymanager.c:927
+#: src/keymanager.c:930
#, fuzzy
msgid "_Keys"
msgstr "/�_��"
-#: src/keymanager.c:929
+#: src/keymanager.c:932
#, fuzzy
msgid "_Server"
msgstr "/���A��"
-#: src/keymanager.c:944
+#: src/keymanager.c:947
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:949
+#: src/keymanager.c:952
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:950
+#: src/keymanager.c:953
#, fuzzy
msgid "_New key..."
msgstr "/�_��/�إ߷s�_... (&N)"
-#: src/keymanager.c:951
+#: src/keymanager.c:954
#, fuzzy
msgid "Generate a new key"
msgstr "�إ߷s�_"
-#: src/keymanager.c:952
+#: src/keymanager.c:955
#, fuzzy
msgid "_Delete keys"
msgstr "/�R���K�_... (&D)"
-#: src/keymanager.c:953
+#: src/keymanager.c:956
msgid "Remove the selected key"
msgstr "�����w��ܪ��K�_"
-#: src/keymanager.c:954
+#: src/keymanager.c:957
#, fuzzy
msgid "_Sign Keys..."
msgstr "/ñ�p���_... (&S)"
-#: src/keymanager.c:955
+#: src/keymanager.c:958
msgid "Sign the selected key"
msgstr "ñ�p�w��ܪ��K�_"
-#: src/keymanager.c:956
+#: src/keymanager.c:959
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/�]�w�H���... (&O)"
-#: src/keymanager.c:957
+#: src/keymanager.c:960
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "�����w��ܪ��K�_"
-#: src/keymanager.c:959
+#: src/keymanager.c:962
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/�ק�p�_... (&E)"
-#: src/keymanager.c:960
+#: src/keymanager.c:963
msgid "Edit the selected private key"
msgstr "�ק�w��ܪ��K�_"
-#: src/keymanager.c:962
+#: src/keymanager.c:965
#, fuzzy
msgid "_Import Keys..."
msgstr "�פJ�K�_"
-#: src/keymanager.c:963
+#: src/keymanager.c:966
msgid "Import Keys"
msgstr "�פJ�K�_"
-#: src/keymanager.c:964
+#: src/keymanager.c:967
#, fuzzy
msgid "E_xport Keys..."
msgstr "/�ץX�_��... (&X)"
-#: src/keymanager.c:965
+#: src/keymanager.c:968
msgid "Export Keys"
msgstr "��X�K�_"
-#: src/keymanager.c:966
+#: src/keymanager.c:969
#, fuzzy
msgid "_Backup..."
msgstr "/�ƥ�... (&B)"
-#: src/keymanager.c:967
+#: src/keymanager.c:970
#, fuzzy
msgid "Backup key"
msgstr "�ƥ��K�_"
-#: src/keymanager.c:971
+#: src/keymanager.c:974
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/���A��/�U�����_... (&R)"
-#: src/keymanager.c:972
+#: src/keymanager.c:975
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:974
+#: src/keymanager.c:977
#, fuzzy
msgid "Re_fresh Keys"
msgstr "�����K�_"
-#: src/keymanager.c:975
+#: src/keymanager.c:978
#, fuzzy
msgid "Refresh keys from server"
msgstr "�H�X���_����A��... (&N)"
-#: src/keymanager.c:977
+#: src/keymanager.c:980
#, fuzzy
msgid "_Send Keys..."
msgstr "/ñ�p���_... (&S)"
-#: src/keymanager.c:978
+#: src/keymanager.c:981
#, fuzzy
msgid "Send keys to server"
msgstr "�H�X���_����A��... (&N)"
-#: src/keymanager.c:985
+#: src/keymanager.c:988
msgid "Show Brief Keylist"
msgstr "��ܱK�_�M��K�n"
-#: src/keymanager.c:987
+#: src/keymanager.c:990
msgid "Show Key Details"
msgstr "��ܱK�_�Ա�"
-#: src/keymanager.c:1123
+#: src/keymanager.c:1126
msgid "Edit"
msgstr "�ק�"
-#: src/keymanager.c:1125
+#: src/keymanager.c:1128
#, fuzzy
msgid "Delete"
msgstr "/�s��/������� (&A)"
-#: src/keymanager.c:1127
+#: src/keymanager.c:1130
msgid "Sign"
msgstr "ñ�p"
-#: src/keymanager.c:1129
+#: src/keymanager.c:1132
msgid "Export"
msgstr "��X"
-#: src/keymanager.c:1131
+#: src/keymanager.c:1134
msgid "Import"
msgstr "�פJ"
-#: src/keymanager.c:1273
+#: src/keymanager.c:1276
#, fuzzy
msgid "Selected default key:"
msgstr "��ܹw�]�K�_:"
-#: src/keymanager.c:1283
+#: src/keymanager.c:1286
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1373 src/keymanager.c:1401
+#: src/keymanager.c:1376 src/keymanager.c:1404
#, fuzzy
msgid "Key Manager"
msgstr "�ɮz��"
-#: src/gpa-key-details.c:132
+#: src/gpa-key-details.c:137
#, fuzzy
msgid "The key has both a smartcard based private part and a public part"
msgstr "�o�O���p�H���@���������_"
-#: src/gpa-key-details.c:136
+#: src/gpa-key-details.c:141
msgid "The key has both a private and a public part"
msgstr "�o�O���p�H���@���������_"
-#: src/gpa-key-details.c:140
+#: src/gpa-key-details.c:145
msgid "The key has only a public part"
msgstr "�o�K�_�u�����@����"
-#: src/gpa-key-details.c:182
+#: src/gpa-key-details.c:187
#, c-format
msgid "%s %u bits"
msgstr "%s %u ��"
-#: src/gpa-key-details.c:222
+#: src/gpa-key-details.c:227
msgid "No keys selected"
msgstr "�S����ܱK�_"
-#: src/gpa-key-details.c:225
+#: src/gpa-key-details.c:230
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d �K�_�Q���"
msgstr[1] "%d �K�_�Q���"
-#: src/gpa-key-details.c:307
+#: src/gpa-key-details.c:312
#, fuzzy
msgid "User name:"
msgstr "�Ϊ̦W�� :"
-#: src/gpa-key-details.c:313
+#: src/gpa-key-details.c:318
msgid "Expires at:"
msgstr "���Ĵ���:"
-#: src/gpa-key-details.c:315
+#: src/gpa-key-details.c:320
msgid "Owner Trust:"
msgstr "�֦��̫H��:"
-#: src/gpa-key-details.c:317
+#: src/gpa-key-details.c:322
#, fuzzy
msgid "Key validity:"
msgstr "�{�����_:"
-#: src/gpa-key-details.c:319
+#: src/gpa-key-details.c:324
#, fuzzy
msgid "Key type:"
msgstr "�K�_����:"
-#: src/gpa-key-details.c:321
+#: src/gpa-key-details.c:326
msgid "Created at:"
msgstr "�إߦb :"
-#: src/gpa-key-details.c:324
+#: src/gpa-key-details.c:329
msgid "Details"
msgstr "�Ա�"
-#: src/gpa-key-details.c:370
+#: src/gpa-key-details.c:375
msgid "Show signatures on user name:"
msgstr "�b�Ϊ̦W�����ñ�p:"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
#, fuzzy
msgid "Chain"
msgstr "���\ñ�p"
-#: src/gpa-key-details.c:406
+#: src/gpa-key-details.c:411
msgid "Signatures"
msgstr "ñ�p"
-#: src/gpa-key-details.c:428
+#: src/gpa-key-details.c:433
msgid "All signatures"
msgstr "�Ҧ�ñ�p"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
msgid "Subkeys"
msgstr "�l�_"
-#: src/gpa-key-details.c:490
+#: src/gpa-key-details.c:495
#, fuzzy
msgid "Key"
msgstr "/�_��"
+#: src/gpa-key-details.c:547
+msgid "Tofu"
+msgstr ""
+
#: src/keysigndlg.c:59
msgid "Sign Key"
msgstr "ñ�p�K�_"
@@ -2002,6 +2005,11 @@ msgid ""
"been found."
msgstr ""
+#: src/recipientdlg.c:191 src/siglist.c:123 src/siglist.c:143
+#: src/verifydlg.c:336
+msgid "Key ID"
+msgstr "�K�_ID"
+
#: src/recipientdlg.c:192
msgid ""
"Shows the key ID of the selected key or an indication that a key needs to be "
@@ -2523,7 +2531,7 @@ msgid ""
"\n"
"Entering a wrong value for the PIN decrements the retry counter. If the "
"retry counters of the PIN and of the Reset Code are both down to zero, the "
-"PIN can still be reseted by using the Admin-PIN.\n"
+"PIN can still be reset by using the Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value <i>123456</i>. However, "
"the issuer of your card might have initialized the card with a different "
@@ -2544,7 +2552,7 @@ msgstr ""
#: src/cm-openpgp.c:1123
msgid ""
-"<b>Reseting the PIN or the Reset Code</b>\n"
+"<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are both down to "
"zero, it is only possible to reset them if you have access to the Admin-"
@@ -2833,6 +2841,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "The key ID is a short number to identify a certificate."
+#~ msgstr "�K�_�u�i�Χ@����."
+
+#, fuzzy
#~ msgid "Error"
#~ msgstr "GPA ���~"
@@ -2909,9 +2921,6 @@ msgstr ""
#~ msgid "/File/C_lear"
#~ msgstr "/�ɮ�/�M�� (&C)"
-#~ msgid "/File/_Open"
-#~ msgstr "/�ɮ�/�}�� (&O)"
-
#, fuzzy
#~ msgid "/File/Save _As"
#~ msgstr "/�ɮ�/���� (&C)"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a2ab71..4957b66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,6 +119,7 @@ gpa_SOURCES = \
selectkeydlg.c selectkeydlg.h \
keymanager.c keymanager.h \
gpa-key-details.c gpa-key-details.h \
+ gpa-tofu-list.c gpa-tofu-list.h \
ownertrustdlg.c ownertrustdlg.h \
keysigndlg.c keysigndlg.h \
keygendlg.c keygendlg.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index 86d9d78..9e227b1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -137,49 +137,49 @@ am__gpa_SOURCES_DIST = get-path.h get-path.c gpa.c gpa.h i18n.h \
filesigndlg.c filesigndlg.h encryptdlg.c encryptdlg.h \
verifydlg.c verifydlg.h recipientdlg.c recipientdlg.h \
selectkeydlg.c selectkeydlg.h keymanager.c keymanager.h \
- gpa-key-details.c gpa-key-details.h ownertrustdlg.c \
- ownertrustdlg.h keysigndlg.c keysigndlg.h keygendlg.c \
- keygendlg.h keygenwizard.c keygenwizard.h qdchkpwd.c \
- qdchkpwd.h keyeditdlg.c keyeditdlg.h expirydlg.c expirydlg.h \
- keydeletedlg.c keydeletedlg.h keylist.c keylist.h siglist.c \
- siglist.h gpasubkeylist.c gpasubkeylist.h certchain.c \
- certchain.h gpl-text.c gpl-text.h keyserver.c keyserver.h \
- hidewnd.c hidewnd.h keytable.c keytable.h gpgmetools.h \
- gpgmetools.c gpgmeedit.h gpgmeedit.c server-access.h \
- server-access.c gpaimportserverop.c gpaimportbykeyidop.c \
- gpaexportserverop.c settingsdlg.h settingsdlg.c passwddlg.h \
- passwddlg.c gpacontext.h gpacontext.c gpaprogressdlg.h \
- gpaprogressdlg.c gpaprogressbar.h gpaprogressbar.c \
- gparecvkeydlg.h gparecvkeydlg.c gpaoperation.h gpaoperation.c \
- gpastreamop.h gpastreamop.c gpastreamencryptop.h \
- gpastreamencryptop.c gpastreamsignop.h gpastreamsignop.c \
- gpastreamverifyop.h gpastreamverifyop.c gpastreamdecryptop.h \
- gpastreamdecryptop.c gpafileop.h gpafileop.c \
- gpafiledecryptop.h gpafiledecryptop.c gpafileencryptop.h \
- gpafileencryptop.c gpafilesignop.h gpafilesignop.c \
- gpafileverifyop.h gpafileverifyop.c gpafileimportop.h \
- gpafileimportop.c gpakeyop.h gpakeyop.c gpakeydeleteop.h \
- gpakeydeleteop.c gpakeysignop.h gpakeysignop.c gpakeytrustop.h \
- gpakeytrustop.c gpakeyexpireop.h gpakeyexpireop.c \
- gpakeypasswdop.h gpakeypasswdop.c gpaexportop.h gpaexportop.c \
- gpaexportfileop.h gpaexportfileop.c gpaexportclipop.h \
- gpaexportclipop.c gpaexportserverop.h gpaimportop.h \
- gpaimportop.c gpaimportfileop.h gpaimportfileop.c \
- gpaimportclipop.h gpaimportclipop.c gpaimportserverop.h \
- gpaimportbykeyidop.h gpagenkeyop.h gpagenkeyop.c \
- gpagenkeyadvop.h gpagenkeyadvop.c gpagenkeysimpleop.h \
- gpagenkeysimpleop.c gpagenkeycardop.h gpagenkeycardop.c \
- gpabackupop.h gpabackupop.c gpakeyselector.h gpakeyselector.c \
- gpapinchange.h gpapinchange.c gpadatebutton.c gpadatebutton.h \
- gpadatebox.c gpadatebox.h server.c filewatch.c options.c \
- confdialog.h confdialog.c gpa-marshal.c gpa-marshal.h \
- strlist.h strlist.c gpg-stuff.h gpg-stuff.c format-dn.c \
- format-dn.h convert.c convert.h membuf.c membuf.h parsetlv.c \
- parsetlv.h filetype.c filetype.h utils.c w32reg.h w32reg.c \
- w32-afunix.h w32-afunix.c cardman.c cardman.h cm-object.c \
- cm-object.h cm-openpgp.c cm-openpgp.h cm-geldkarte.c \
- cm-geldkarte.h cm-netkey.c cm-netkey.h cm-dinsig.c cm-dinsig.h \
- cm-unknown.c cm-unknown.h
+ gpa-key-details.c gpa-key-details.h gpa-tofu-list.c \
+ gpa-tofu-list.h ownertrustdlg.c ownertrustdlg.h keysigndlg.c \
+ keysigndlg.h keygendlg.c keygendlg.h keygenwizard.c \
+ keygenwizard.h qdchkpwd.c qdchkpwd.h keyeditdlg.c keyeditdlg.h \
+ expirydlg.c expirydlg.h keydeletedlg.c keydeletedlg.h \
+ keylist.c keylist.h siglist.c siglist.h gpasubkeylist.c \
+ gpasubkeylist.h certchain.c certchain.h gpl-text.c gpl-text.h \
+ keyserver.c keyserver.h hidewnd.c hidewnd.h keytable.c \
+ keytable.h gpgmetools.h gpgmetools.c gpgmeedit.h gpgmeedit.c \
+ server-access.h server-access.c gpaimportserverop.c \
+ gpaimportbykeyidop.c gpaexportserverop.c settingsdlg.h \
+ settingsdlg.c passwddlg.h passwddlg.c gpacontext.h \
+ gpacontext.c gpaprogressdlg.h gpaprogressdlg.c \
+ gpaprogressbar.h gpaprogressbar.c gparecvkeydlg.h \
+ gparecvkeydlg.c gpaoperation.h gpaoperation.c gpastreamop.h \
+ gpastreamop.c gpastreamencryptop.h gpastreamencryptop.c \
+ gpastreamsignop.h gpastreamsignop.c gpastreamverifyop.h \
+ gpastreamverifyop.c gpastreamdecryptop.h gpastreamdecryptop.c \
+ gpafileop.h gpafileop.c gpafiledecryptop.h gpafiledecryptop.c \
+ gpafileencryptop.h gpafileencryptop.c gpafilesignop.h \
+ gpafilesignop.c gpafileverifyop.h gpafileverifyop.c \
+ gpafileimportop.h gpafileimportop.c gpakeyop.h gpakeyop.c \
+ gpakeydeleteop.h gpakeydeleteop.c gpakeysignop.h \
+ gpakeysignop.c gpakeytrustop.h gpakeytrustop.c \
+ gpakeyexpireop.h gpakeyexpireop.c gpakeypasswdop.h \
+ gpakeypasswdop.c gpaexportop.h gpaexportop.c gpaexportfileop.h \
+ gpaexportfileop.c gpaexportclipop.h gpaexportclipop.c \
+ gpaexportserverop.h gpaimportop.h gpaimportop.c \
+ gpaimportfileop.h gpaimportfileop.c gpaimportclipop.h \
+ gpaimportclipop.c gpaimportserverop.h gpaimportbykeyidop.h \
+ gpagenkeyop.h gpagenkeyop.c gpagenkeyadvop.h gpagenkeyadvop.c \
+ gpagenkeysimpleop.h gpagenkeysimpleop.c gpagenkeycardop.h \
+ gpagenkeycardop.c gpabackupop.h gpabackupop.c gpakeyselector.h \
+ gpakeyselector.c gpapinchange.h gpapinchange.c gpadatebutton.c \
+ gpadatebutton.h gpadatebox.c gpadatebox.h server.c filewatch.c \
+ options.c confdialog.h confdialog.c gpa-marshal.c \
+ gpa-marshal.h strlist.h strlist.c gpg-stuff.h gpg-stuff.c \
+ format-dn.c format-dn.h convert.c convert.h membuf.c membuf.h \
+ parsetlv.c parsetlv.h filetype.c filetype.h utils.c w32reg.h \
+ w32reg.c w32-afunix.h w32-afunix.c cardman.c cardman.h \
+ cm-object.c cm-object.h cm-openpgp.c cm-openpgp.h \
+ cm-geldkarte.c cm-geldkarte.h cm-netkey.c cm-netkey.h \
+ cm-dinsig.c cm-dinsig.h cm-unknown.c cm-unknown.h
@ENABLE_KEYSERVER_SUPPORT_TRUE at am__objects_1 = \
@ENABLE_KEYSERVER_SUPPORT_TRUE@ server-access.$(OBJEXT) \
@ENABLE_KEYSERVER_SUPPORT_TRUE@ gpaimportserverop.$(OBJEXT) \
@@ -201,37 +201,38 @@ am_gpa_OBJECTS = get-path.$(OBJEXT) gpa.$(OBJEXT) \
encryptdlg.$(OBJEXT) verifydlg.$(OBJEXT) \
recipientdlg.$(OBJEXT) selectkeydlg.$(OBJEXT) \
keymanager.$(OBJEXT) gpa-key-details.$(OBJEXT) \
- ownertrustdlg.$(OBJEXT) keysigndlg.$(OBJEXT) \
- keygendlg.$(OBJEXT) keygenwizard.$(OBJEXT) qdchkpwd.$(OBJEXT) \
- keyeditdlg.$(OBJEXT) expirydlg.$(OBJEXT) \
- keydeletedlg.$(OBJEXT) keylist.$(OBJEXT) siglist.$(OBJEXT) \
- gpasubkeylist.$(OBJEXT) certchain.$(OBJEXT) gpl-text.$(OBJEXT) \
- keyserver.$(OBJEXT) hidewnd.$(OBJEXT) keytable.$(OBJEXT) \
- gpgmetools.$(OBJEXT) gpgmeedit.$(OBJEXT) $(am__objects_1) \
- settingsdlg.$(OBJEXT) passwddlg.$(OBJEXT) gpacontext.$(OBJEXT) \
- gpaprogressdlg.$(OBJEXT) gpaprogressbar.$(OBJEXT) \
- gparecvkeydlg.$(OBJEXT) gpaoperation.$(OBJEXT) \
- gpastreamop.$(OBJEXT) gpastreamencryptop.$(OBJEXT) \
- gpastreamsignop.$(OBJEXT) gpastreamverifyop.$(OBJEXT) \
- gpastreamdecryptop.$(OBJEXT) gpafileop.$(OBJEXT) \
- gpafiledecryptop.$(OBJEXT) gpafileencryptop.$(OBJEXT) \
- gpafilesignop.$(OBJEXT) gpafileverifyop.$(OBJEXT) \
- gpafileimportop.$(OBJEXT) gpakeyop.$(OBJEXT) \
- gpakeydeleteop.$(OBJEXT) gpakeysignop.$(OBJEXT) \
- gpakeytrustop.$(OBJEXT) gpakeyexpireop.$(OBJEXT) \
- gpakeypasswdop.$(OBJEXT) gpaexportop.$(OBJEXT) \
- gpaexportfileop.$(OBJEXT) gpaexportclipop.$(OBJEXT) \
- gpaimportop.$(OBJEXT) gpaimportfileop.$(OBJEXT) \
- gpaimportclipop.$(OBJEXT) gpagenkeyop.$(OBJEXT) \
- gpagenkeyadvop.$(OBJEXT) gpagenkeysimpleop.$(OBJEXT) \
- gpagenkeycardop.$(OBJEXT) gpabackupop.$(OBJEXT) \
- gpakeyselector.$(OBJEXT) gpapinchange.$(OBJEXT) \
- gpadatebutton.$(OBJEXT) gpadatebox.$(OBJEXT) server.$(OBJEXT) \
- filewatch.$(OBJEXT) options.$(OBJEXT) confdialog.$(OBJEXT) \
- gpa-marshal.$(OBJEXT) strlist.$(OBJEXT) gpg-stuff.$(OBJEXT) \
- format-dn.$(OBJEXT) convert.$(OBJEXT) membuf.$(OBJEXT) \
- parsetlv.$(OBJEXT) filetype.$(OBJEXT) utils.$(OBJEXT) \
- $(am__objects_2) $(am__objects_3)
+ gpa-tofu-list.$(OBJEXT) ownertrustdlg.$(OBJEXT) \
+ keysigndlg.$(OBJEXT) keygendlg.$(OBJEXT) \
+ keygenwizard.$(OBJEXT) qdchkpwd.$(OBJEXT) keyeditdlg.$(OBJEXT) \
+ expirydlg.$(OBJEXT) keydeletedlg.$(OBJEXT) keylist.$(OBJEXT) \
+ siglist.$(OBJEXT) gpasubkeylist.$(OBJEXT) certchain.$(OBJEXT) \
+ gpl-text.$(OBJEXT) keyserver.$(OBJEXT) hidewnd.$(OBJEXT) \
+ keytable.$(OBJEXT) gpgmetools.$(OBJEXT) gpgmeedit.$(OBJEXT) \
+ $(am__objects_1) settingsdlg.$(OBJEXT) passwddlg.$(OBJEXT) \
+ gpacontext.$(OBJEXT) gpaprogressdlg.$(OBJEXT) \
+ gpaprogressbar.$(OBJEXT) gparecvkeydlg.$(OBJEXT) \
+ gpaoperation.$(OBJEXT) gpastreamop.$(OBJEXT) \
+ gpastreamencryptop.$(OBJEXT) gpastreamsignop.$(OBJEXT) \
+ gpastreamverifyop.$(OBJEXT) gpastreamdecryptop.$(OBJEXT) \
+ gpafileop.$(OBJEXT) gpafiledecryptop.$(OBJEXT) \
+ gpafileencryptop.$(OBJEXT) gpafilesignop.$(OBJEXT) \
+ gpafileverifyop.$(OBJEXT) gpafileimportop.$(OBJEXT) \
+ gpakeyop.$(OBJEXT) gpakeydeleteop.$(OBJEXT) \
+ gpakeysignop.$(OBJEXT) gpakeytrustop.$(OBJEXT) \
+ gpakeyexpireop.$(OBJEXT) gpakeypasswdop.$(OBJEXT) \
+ gpaexportop.$(OBJEXT) gpaexportfileop.$(OBJEXT) \
+ gpaexportclipop.$(OBJEXT) gpaimportop.$(OBJEXT) \
+ gpaimportfileop.$(OBJEXT) gpaimportclipop.$(OBJEXT) \
+ gpagenkeyop.$(OBJEXT) gpagenkeyadvop.$(OBJEXT) \
+ gpagenkeysimpleop.$(OBJEXT) gpagenkeycardop.$(OBJEXT) \
+ gpabackupop.$(OBJEXT) gpakeyselector.$(OBJEXT) \
+ gpapinchange.$(OBJEXT) gpadatebutton.$(OBJEXT) \
+ gpadatebox.$(OBJEXT) server.$(OBJEXT) filewatch.$(OBJEXT) \
+ options.$(OBJEXT) confdialog.$(OBJEXT) gpa-marshal.$(OBJEXT) \
+ strlist.$(OBJEXT) gpg-stuff.$(OBJEXT) format-dn.$(OBJEXT) \
+ convert.$(OBJEXT) membuf.$(OBJEXT) parsetlv.$(OBJEXT) \
+ filetype.$(OBJEXT) utils.$(OBJEXT) $(am__objects_2) \
+ $(am__objects_3)
gpa_OBJECTS = $(am_gpa_OBJECTS)
gpa_LDADD = $(LDADD)
gpa_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpa_LDFLAGS) $(LDFLAGS) -o \
@@ -403,6 +404,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
@@ -524,6 +527,7 @@ gpa_SOURCES = \
selectkeydlg.c selectkeydlg.h \
keymanager.c keymanager.h \
gpa-key-details.c gpa-key-details.h \
+ gpa-tofu-list.c gpa-tofu-list.h \
ownertrustdlg.c ownertrustdlg.h \
keysigndlg.c keysigndlg.h \
keygendlg.c keygendlg.h \
@@ -723,6 +727,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get-path.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpa-key-details.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpa-marshal.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpa-tofu-list.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpa.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpabackupop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpacontext.Po at am__quote@
diff --git a/src/cm-openpgp.c b/src/cm-openpgp.c
index 55a3081..0c81bf7 100644
--- a/src/cm-openpgp.c
+++ b/src/cm-openpgp.c
@@ -1102,7 +1102,7 @@ change_pin (GpaCMOpenpgp *card, int pinno)
"Entering a wrong value for the PIN "
"decrements the retry counter. If the retry counters "
"of the PIN and of the Reset Code are both down "
- "to zero, the PIN can still be reseted by using the "
+ "to zero, the PIN can still be reset by using the "
"Admin-PIN.\n"
"\n"
"A fresh standard card has set the PIN to the value "
@@ -1120,7 +1120,7 @@ change_pin (GpaCMOpenpgp *card, int pinno)
"value of the PIN and then to enter a new value for the "
"Reset Code and repeat that new value at another prompt.");
else if (reset_mode && pinno < 2)
- string = _("<b>Reseting the PIN or the Reset Code</b>\n"
+ string = _("<b>Resetting the PIN or the Reset Code</b>\n"
"\n"
"If the retry counters of the PIN and of the Reset Code are "
"both down to zero, it is only possible to reset them if you "
diff --git a/src/convert.c b/src/convert.c
index 9a37ffa..280c5b8 100644
--- a/src/convert.c
+++ b/src/convert.c
@@ -72,32 +72,45 @@ gpa_time_unit_from_string (const char *string)
char *
-gpa_expiry_date_string (unsigned long expiry_time)
+gpa_date_string (unsigned long t)
{
gchar *result;
- GDate expiry_date;
+ GDate date;
- if (sizeof (time_t) <= 4 && expiry_time == (time_t)2145914603)
+ if (sizeof (time_t) <= 4 && t == (time_t)2145914603)
{
/* 2145914603 (2037-12-31 23:23:23) is used by GPGME to indicate
a time we can't represent. */
result = g_strdup (">= 2038");
}
- else if ( expiry_time > 0 )
+ else if ( t > 0 )
{
- g_date_set_time_t (&expiry_date, (time_t) expiry_time);
+ g_date_set_time_t (&date, (time_t)t );
result = g_strdup_printf ("%04d-%02d-%02d",
- g_date_get_year (&expiry_date),
- g_date_get_month (&expiry_date),
- g_date_get_day (&expiry_date));
+ g_date_get_year (&date),
+ g_date_get_month (&date),
+ g_date_get_day (&date));
}
else
- result = g_strdup (_("never expires"));
+ result = g_strdup ("");
return result;
}
char *
+gpa_expiry_date_string (unsigned long expiry_time)
+{
+ char *p = gpa_date_string (expiry_time);
+ if (!*p)
+ {
+ g_free (p);
+ p = g_strdup (_("never expires"));
+ }
+ return p;
+}
+
+
+char *
gpa_creation_date_string (unsigned long creation_time)
{
gchar *result;
diff --git a/src/convert.h b/src/convert.h
index da304e0..6373417 100644
--- a/src/convert.h
+++ b/src/convert.h
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONVERT_H
@@ -22,6 +22,7 @@
const char *gpa_unit_expiry_time_string (int idx);
char gpa_time_unit_from_string (const char *string);
+char *gpa_date_string (unsigned long t);
char *gpa_expiry_date_string (unsigned long expiry_time);
char *gpa_creation_date_string (unsigned long creation_time);
const char *gpa_sex_char_to_string (char sex);
diff --git a/src/fileman.c b/src/fileman.c
index cd00d0c..10824d4 100644
--- a/src/fileman.c
+++ b/src/fileman.c
@@ -656,13 +656,12 @@ static gboolean
dnd_drop_handler (GtkWidget *widget, GdkDragContext *context,
gint x, gint y, guint tim, gpointer user_data)
{
- GdkAtom target_type;
+ GdkAtom target_type = gdk_atom_intern ("text/uri-list", FALSE);
/* If the source offers a target we request the data from her. */
- if (context->targets)
+ if (context->targets && g_list_find (context->targets,
+ GDK_ATOM_TO_POINTER (target_type)))
{
- target_type = GDK_POINTER_TO_ATOM
- (g_list_nth_data (context->targets, DND_TARGET_URI_LIST));
gtk_drag_get_data (widget, context, target_type, tim);
return TRUE;
diff --git a/src/gpa-key-details.c b/src/gpa-key-details.c
index abb3b1a..d48e2b0 100644
--- a/src/gpa-key-details.c
+++ b/src/gpa-key-details.c
@@ -37,6 +37,7 @@
#include "siglist.h"
#include "certchain.h"
#include "gpasubkeylist.h"
+#include "gpa-tofu-list.h"
#include "gpa-key-details.h"
#include "gtktools.h"
@@ -73,10 +74,14 @@ struct _GpaKeyDetails
GtkWidget *signatures_uids;
GtkWidget *certchain_list;
- /* The widgets in the subkeys list. */
+ /* The widgets in the subkeys page. */
GtkWidget *subkeys_page;
GtkWidget *subkeys_list;
+ /* The widgets in the TOFU page. */
+ GtkWidget *tofu_page;
+ GtkWidget *tofu_list;
+
/* The key currently shown or NULL. */
gpgme_key_t current_key;
@@ -159,13 +164,13 @@ details_page_fill_key (GpaKeyDetails *kdt, gpgme_key_t key)
gtk_label_set_text (GTK_LABEL (kdt->detail_name), text);
g_free (text);
- text = (gchar*) gpa_gpgme_key_get_short_keyid (key);
- gtk_label_set_text (GTK_LABEL (kdt->detail_key_id), text);
-
text = gpa_gpgme_key_format_fingerprint (key->subkeys->fpr);
gtk_label_set_text (GTK_LABEL (kdt->detail_fingerprint), text);
g_free (text);
+ text = (gchar*) gpa_gpgme_key_get_short_keyid (key);
+ gtk_label_set_text (GTK_LABEL (kdt->detail_key_id), text);
+
text = gpa_expiry_date_string (key->subkeys->expires);
gtk_label_set_text (GTK_LABEL (kdt->detail_expiry), text);
g_free (text);
@@ -305,10 +310,10 @@ construct_details_page (GpaKeyDetails *kdt)
(table, table_row++, "", TRUE);
kdt->detail_name = add_details_row
(table, table_row++, _("User name:"), TRUE);
- kdt->detail_key_id = add_details_row
- (table, table_row++, _("Key ID:"), TRUE);
kdt->detail_fingerprint = add_details_row
(table, table_row++, _("Fingerprint:"), TRUE);
+ kdt->detail_key_id = add_details_row
+ (table, table_row++, _("Key ID:"), TRUE);
kdt->detail_expiry = add_details_row
(table, table_row++, _("Expires at:"), FALSE);
kdt->detail_owner_trust = add_details_row
@@ -496,6 +501,57 @@ build_subkeys_page (GpaKeyDetails *kdt, gpgme_key_t key)
}
+/* Create and append new page with TOFU info for KEY. If KEY is NULL
+ remove an existing TOFU page. */
+static void
+build_tofu_page (GpaKeyDetails *kdt, gpgme_key_t key)
+{
+#ifdef ENABLE_TOFU_INFO
+ GtkWidget *vbox;
+ GtkWidget *scrolled;
+ GtkWidget *tofulist;
+ int pnum;
+
+ /* First remove an existing page. */
+ if (kdt->tofu_page)
+ {
+ pnum = gtk_notebook_page_num (GTK_NOTEBOOK (kdt), kdt->tofu_page);
+ if (pnum >= 0)
+ gtk_notebook_remove_page (GTK_NOTEBOOK (kdt), pnum);
+ kdt->tofu_page = NULL;
+ if (kdt->tofu_list)
+ {
+ g_object_unref (kdt->tofu_list);
+ kdt->tofu_list = NULL;
+ }
+ }
+ if (!key)
+ return;
+
+ /* Create a new page. */
+ vbox = gtk_vbox_new (FALSE, 5);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+ scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
+ GTK_SHADOW_IN);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0);
+ tofulist = gpa_tofu_list_new ();
+ gtk_container_add (GTK_CONTAINER (scrolled), tofulist);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
+ kdt->tofu_list = tofulist;
+ g_object_ref (kdt->tofu_list);
+ kdt->tofu_page = vbox;
+ gtk_notebook_append_page (GTK_NOTEBOOK (kdt), kdt->tofu_page,
+ gtk_label_new (_("Tofu")));
+
+ /* Fill this page. */
+ gpa_tofu_list_set_key (kdt->tofu_list, key);
+#endif /*ENABLE_TOFU_INFO*/
+}
+
+
/* Signal handler for the "changed_ui_mode" signal. */
static void
ui_mode_changed (GpaOptions *options, gpointer param)
@@ -512,6 +568,7 @@ ui_mode_changed (GpaOptions *options, gpointer param)
build_signatures_page (kdt, kdt->current_key);
build_subkeys_page (kdt, kdt->current_key);
}
+ build_tofu_page (kdt, kdt->current_key);
gtk_notebook_set_show_tabs
(GTK_NOTEBOOK (kdt), gtk_notebook_get_n_pages (GTK_NOTEBOOK (kdt)) > 1);
gtk_widget_show_all (GTK_WIDGET (kdt));
@@ -583,6 +640,11 @@ gpa_key_details_finalize (GObject *object)
g_object_unref (kdt->subkeys_list);
kdt->subkeys_list = NULL;
}
+ if (kdt->tofu_list)
+ {
+ g_object_unref (kdt->tofu_list);
+ kdt->tofu_list = NULL;
+ }
parent_class->finalize (object);
}
@@ -651,6 +713,10 @@ gpa_key_details_update (GtkWidget *keydetails, gpgme_key_t key, int keycount)
pnum = 1;
else if (widget == kdt->subkeys_page)
pnum = 2;
+#ifdef ENABLE_TOFU_INFO
+ else if (widget == kdt->tofu_page)
+ pnum = 3;
+#endif /*ENABLE_TOFU_INFO*/
else
pnum = 0;
}
@@ -686,8 +752,9 @@ gpa_key_details_update (GtkWidget *keydetails, gpgme_key_t key, int keycount)
{
details_page_fill_num_keys (kdt, keycount);
build_signatures_page (kdt, NULL);
- build_subkeys_page (kdt, NULL);
}
+ build_tofu_page (kdt, key);
+
gtk_notebook_set_show_tabs
(GTK_NOTEBOOK (kdt), gtk_notebook_get_n_pages (GTK_NOTEBOOK (kdt)) > 1);
@@ -698,6 +765,10 @@ gpa_key_details_update (GtkWidget *keydetails, gpgme_key_t key, int keycount)
pnum = gtk_notebook_page_num (GTK_NOTEBOOK (kdt), kdt->signatures_page);
else if (pnum == 2 && kdt->subkeys_page)
pnum = gtk_notebook_page_num (GTK_NOTEBOOK (kdt), kdt->subkeys_page);
+#ifdef ENABLE_TOFU_INFO
+ else if (pnum == 3 && kdt->tofu_page)
+ pnum = gtk_notebook_page_num (GTK_NOTEBOOK (kdt), kdt->tofu_page);
+#endif /*ENABLE_TOFU_INFO*/
else
pnum = 0;
gtk_notebook_set_current_page (GTK_NOTEBOOK (kdt), pnum);
diff --git a/src/gpa-marshal.c b/src/gpa-marshal.c
index e6baf92..6df5c27 100644
--- a/src/gpa-marshal.c
+++ b/src/gpa-marshal.c
@@ -62,9 +62,9 @@ gpa_marshal_INT__STRING_STRING (GClosure *closure,
gpointer arg_1,
gpointer arg_2,
gpointer data2);
- register GMarshalFunc_INT__STRING_STRING callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
+ GMarshalFunc_INT__STRING_STRING callback;
+ GCClosure *cc = (GCClosure*) closure;
+ gpointer data1, data2;
gint v_return;
g_return_if_fail (return_value != NULL);
diff --git a/src/gpa-tofu-list.c b/src/gpa-tofu-list.c
new file mode 100644
index 0000000..0ac153d
--- /dev/null
+++ b/src/gpa-tofu-list.c
@@ -0,0 +1,266 @@
+/* gpa-tofu-list.c - A list to show TOFU information.
+ * Copyright (C) 2016 g10 Code GmbH
+ *
+ * This file is part of GPA
+ *
+ * GPA is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include "gpa.h"
+#include "convert.h"
+#include "gtktools.h"
+#include "keytable.h"
+#include "gpa-tofu-list.h"
+
+#ifdef ENABLE_TOFU_INFO
+
+static gboolean tofu_list_query_tooltip_cb (GtkWidget *wdiget, int x, int y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip,
+ gpointer user_data);
+
+
+
+typedef enum
+{
+ TOFU_ADDRESS,
+ TOFU_VALIDITY,
+ TOFU_POLICY,
+ TOFU_COUNT,
+ TOFU_FIRSTSIGN,
+ TOFU_LASTSIGN,
+ TOFU_FIRSTENCR,
+ TOFU_LASTENCR,
+ TOFU_N_COLUMNS
+} SubkeyListColumn;
+
+
+/* Create a new subkey list. */
+GtkWidget *
+gpa_tofu_list_new (void)
+{
+ GtkListStore *store;
+ GtkWidget *list;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+
+ /* Init the model */
+ store = gtk_list_store_new (TOFU_N_COLUMNS,
+ G_TYPE_STRING, /* address */
+ G_TYPE_STRING, /* validity */
+ G_TYPE_STRING, /* policy */
+ G_TYPE_STRING, /* count */
+ G_TYPE_STRING, /* firstsign */
+ G_TYPE_STRING, /* lastsign */
+ G_TYPE_STRING, /* firstencr */
+ G_TYPE_STRING /* lastencr */
+ );
+
+ /* The view */
+ list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list), TRUE);
+
+ /* Add the columns */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_ADDRESS,
+ NULL);
+ gpa_set_column_title (column, _("Address"),
+ _("The mail address."));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_VALIDITY,
+ NULL);
+ gpa_set_column_title (column, _("Validity"),
+ _("The TOFU validity of the mail address:\n"
+ " Minimal = Only little history available\n"));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_POLICY,
+ NULL);
+ gpa_set_column_title (column, _("Policy"),
+ _("The TOFU policy set for this mail address."));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_COUNT,
+ NULL);
+ gpa_set_column_title (column, _("Count"),
+ _("The number of signatures seen for this address\n"
+ "and the number of encryption done to this address.")
+ );
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_FIRSTSIGN,
+ NULL);
+ gpa_set_column_title (column, _("First Sig"),
+ _("The date the first signature was verified."));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_LASTSIGN,
+ NULL);
+ gpa_set_column_title (column, _("Last Sig"),
+ _("The most recent date a signature was verified."));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_FIRSTENCR,
+ NULL);
+ gpa_set_column_title (column, _("First Enc"),
+ _("The date the first encrypted mail was sent."));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (NULL, renderer,
+ "text", TOFU_LASTENCR,
+ NULL);
+ gpa_set_column_title (column, _("Last Enc"),
+ _("The most recent date an encrypted mail was sent."));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+
+ g_object_set (list, "has-tooltip", TRUE, NULL);
+ g_signal_connect (list, "query-tooltip",
+ G_CALLBACK (tofu_list_query_tooltip_cb), list);
+
+ return list;
+}
+
+
+static const gchar *
+tofu_validity_str (gpgme_tofu_info_t tofu)
+{
+ switch (tofu->validity)
+ {
+ case 0: return _("Conflict");
+ case 1: return _("Unknown");
+ case 2: return _("Minimal");
+ case 3: return _("Basic");
+ case 4: return _("Full");
+ default: return "?";
+ }
+}
+
+
+static const gchar *
+tofu_policy_str (gpgme_tofu_info_t tofu)
+{
+ switch (tofu->policy)
+ {
+ case GPGME_TOFU_POLICY_NONE: return _("None");
+ case GPGME_TOFU_POLICY_AUTO: return _("Auto");
+ case GPGME_TOFU_POLICY_GOOD: return _("Good");
+ case GPGME_TOFU_POLICY_UNKNOWN: return _("Unknown");
+ case GPGME_TOFU_POLICY_BAD: return _("Bad");
+ case GPGME_TOFU_POLICY_ASK: return _("Ask");
+ }
+ return "?";
+}
+
+
+/* Set the key whose subkeys should be displayed. */
+void
+gpa_tofu_list_set_key (GtkWidget *list, gpgme_key_t key)
+{
+ GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model
+ (GTK_TREE_VIEW (list)));
+ GtkTreeIter iter;
+ gpgme_user_id_t uid;
+ gpgme_tofu_info_t tofu;
+ char *countstr, *firstsign, *lastsign, *firstencr, *lastencr;
+
+ /* Empty the list */
+ gtk_list_store_clear (store);
+
+ if (!key || !key->uids)
+ return;
+
+ for (uid = key->uids; uid; uid = uid->next)
+ {
+ if (!uid->address || !uid->tofu)
+ continue; /* No address or tofu info. */
+ tofu = uid->tofu;
+
+ /* Note that we do not need to filter ADDRESS like we do with
+ * user ids because GPGME checked that it is a valid mail
+ * address. */
+ countstr = g_strdup_printf ("%hu/%hu", tofu->signcount, tofu->encrcount);
+ firstsign = gpa_date_string (tofu->signfirst);
+ lastsign = gpa_date_string (tofu->signlast);
+ firstencr = gpa_date_string (tofu->encrfirst);
+ lastencr = gpa_date_string (tofu->encrlast);
+
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set
+ (store, &iter,
+ TOFU_ADDRESS, uid->address,
+ TOFU_VALIDITY, tofu_validity_str (tofu),
+ TOFU_POLICY, tofu_policy_str (tofu),
+ TOFU_COUNT, countstr,
+ TOFU_FIRSTSIGN,firstsign,
+ TOFU_LASTSIGN, lastsign,
+ TOFU_FIRSTENCR,firstencr,
+ TOFU_LASTENCR, lastencr,
+ -1);
+
+ g_free (countstr);
+ g_free (firstsign);
+ g_free (lastsign);
+ g_free (firstencr);
+ g_free (lastencr);
+ }
+
+}
+
+
+/* Tooltip display callback. */
+static gboolean
+tofu_list_query_tooltip_cb (GtkWidget *widget, int x, int y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip, gpointer user_data)
+{
+ GtkTreeView *tv = GTK_TREE_VIEW (widget);
+ GtkTreeViewColumn *column;
+ char *text;
+
+ (void)user_data;
+
+ if (!gtk_tree_view_get_tooltip_context (tv, &x, &y, keyboard_tip,
+ NULL, NULL, NULL))
+ return FALSE; /* Not at a row - do not show a tooltip. */
+ if (!gtk_tree_view_get_path_at_pos (tv, x, y, NULL, &column, NULL, NULL))
+ return FALSE;
+
+ widget = gtk_tree_view_column_get_widget (column);
+ text = widget? gtk_widget_get_tooltip_text (widget) : NULL;
+ if (!text)
+ return FALSE; /* No tooltip desired. */
+
+ gtk_tooltip_set_text (tooltip, text);
+ g_free (text);
+
+ return TRUE; /* Show tooltip. */
+}
+#endif /*ENABLE_TOFU_INFO*/
diff --git a/src/gpa-tofu-list.h b/src/gpa-tofu-list.h
new file mode 100644
index 0000000..f568eb7
--- /dev/null
+++ b/src/gpa-tofu-list.h
@@ -0,0 +1,31 @@
+/* gpa-tofu-list.h - A list to show TOFU information
+ * Copyright (C) 2016 g10 Code GmbH
+ *
+ * This file is part of GPA
+ *
+ * GPA is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GPA_TOFU_LIST_H
+#define GPA_TOFU_LIST_H
+
+#include <gtk/gtk.h>
+
+/* Create a new TOFU list. */
+GtkWidget * gpa_tofu_list_new (void);
+
+/* Set the key for which TOFU information shall be shown. */
+void gpa_tofu_list_set_key (GtkWidget *list, gpgme_key_t key);
+
+#endif /* GPA_TOFU_LIST_H */
diff --git a/src/gpa.c b/src/gpa.c
index 6dbc5cd..be8490d 100644
--- a/src/gpa.c
+++ b/src/gpa.c
@@ -87,7 +87,7 @@ static gpa_args_t args;
/* The copyright notice. */
static const char *copyright =
"Copyright (C) 2000-2002 Miguel Coca, G-N-U GmbH, Intevation GmbH.\n"
-"Copyright (C) 2005-2015 g10 Code GmbH.\n"
+"Copyright (C) 2005-2016 g10 Code GmbH.\n"
"This program comes with ABSOLUTELY NO WARRANTY.\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions. See the file COPYING for details.\n";
diff --git a/src/gpa.h b/src/gpa.h
index deebed1..57bddb8 100644
--- a/src/gpa.h
+++ b/src/gpa.h
@@ -46,6 +46,10 @@
#include "options.h" /* ditto */
+#if GPGME_VERSION_NUMBER >= 0x010700
+# define ENABLE_TOFU_INFO 1
+#endif
+
/* Global constants. */
#define GPA_MAX_UID_WIDTH 50 /* # of chars after wich a user id is
truncated in dialog boxes. */
diff --git a/src/gpafiledecryptop.c b/src/gpafiledecryptop.c
index 362d15d..c36da44 100644
--- a/src/gpafiledecryptop.c
+++ b/src/gpafiledecryptop.c
@@ -1,6 +1,6 @@
/* gpafiledecryptop.c - The GpaOperation object.
* Copyright (C) 2003 Miguel Coca.
- * Copyright (C) 2008 g10 Code GmbH.
+ * Copyright (C) 2008, 2015 g10 Code GmbH.
*
* This file is part of GPA
*
@@ -307,6 +307,7 @@ gpa_file_decrypt_operation_start (GpaFileDecryptOperation *op,
else
{
gchar *cipher_filename = file_item->filename_in;
+ char *filename_used;
file_item->filename_out = destination_filename (cipher_filename);
/* Open the files */
@@ -317,15 +318,20 @@ gpa_file_decrypt_operation_start (GpaFileDecryptOperation *op,
return gpg_error (GPG_ERR_GENERAL);
op->plain_fd = gpa_open_output (file_item->filename_out, &op->plain,
- GPA_OPERATION (op)->window);
+ GPA_OPERATION (op)->window,
+ &filename_used);
if (op->plain_fd == -1)
{
gpgme_data_release (op->cipher);
close (op->cipher_fd);
+ xfree (filename_used);
/* FIXME: Error value. */
return gpg_error (GPG_ERR_GENERAL);
}
+ xfree (file_item->filename_out);
+ file_item->filename_out = filename_used;
+
gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
is_cms_file (cipher_filename) ?
GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
@@ -519,7 +525,7 @@ gpa_file_decrypt_operation_done_error_cb (GpaContext *context, gpg_error_t err,
message = g_strdup_printf (file_item->direct_name
? _("\"%s\" contained no valid "
"encrypted data.")
- : _("The file \"%s\" contained no valid"
+ : _("The file \"%s\" contained no valid "
"encrypted data."),
file_item->direct_name
? file_item->direct_name
diff --git a/src/gpafileencryptop.c b/src/gpafileencryptop.c
index 4731fda..a76c4e0 100644
--- a/src/gpafileencryptop.c
+++ b/src/gpafileencryptop.c
@@ -1,6 +1,6 @@
/* gpafiledecryptop.c - The GpaOperation object.
* Copyright (C) 2003 Miguel Coca.
- * Copyright (C) 2008 g10 Code GmbH.
+ * Copyright (C) 2008, 2015 g10 Code GmbH.
*
* This file is part of GPA
*
@@ -310,6 +310,7 @@ gpa_file_encrypt_operation_start (GpaFileEncryptOperation *op,
else
{
gchar *plain_filename = file_item->filename_in;
+ char *filename_used;
file_item->filename_out = destination_filename
(plain_filename, gpgme_get_armor (GPA_OPERATION (op)->context->ctx));
@@ -321,15 +322,20 @@ gpa_file_encrypt_operation_start (GpaFileEncryptOperation *op,
return gpg_error (GPG_ERR_GENERAL);
op->cipher_fd = gpa_open_output (file_item->filename_out, &op->cipher,
- GPA_OPERATION (op)->window);
+ GPA_OPERATION (op)->window,
+ &filename_used);
if (op->cipher_fd == -1)
{
gpgme_data_release (op->plain);
close (op->plain_fd);
op->plain_fd = -1;
+ xfree (filename_used);
/* FIXME: Error value. */
return gpg_error (GPG_ERR_GENERAL);
}
+
+ xfree (file_item->filename_out);
+ file_item->filename_out = filename_used;
}
/* Start the operation. */
@@ -575,6 +581,7 @@ expired_key (gpgme_key_t key, GtkWidget *parent)
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox);
+ /* Fixme: We leak the date string. */
message = g_strdup_printf (_("The following key expired on %s:"),
gpa_expiry_date_string
(key->subkeys->expires));
diff --git a/src/gpafilesignop.c b/src/gpafilesignop.c
index 5ecef78..b926d17 100644
--- a/src/gpafilesignop.c
+++ b/src/gpafilesignop.c
@@ -1,6 +1,6 @@
/* gpafiledecryptop.c - The GpaOperation object.
* Copyright (C) 2003 Miguel Coca.
- * Copyright (C) 2008 g10 Code GmbH.
+ * Copyright (C) 2008, 2015 g10 Code GmbH.
*
* This file is part of GPA
*
@@ -285,6 +285,7 @@ gpa_file_sign_operation_start (GpaFileSignOperation *op,
else
{
gchar *plain_filename = file_item->filename_in;
+ char *filename_used;
file_item->filename_out = destination_filename
(plain_filename, gpgme_get_armor (GPA_OPERATION (op)->context->ctx),
@@ -298,14 +299,19 @@ gpa_file_sign_operation_start (GpaFileSignOperation *op,
return gpg_error (GPG_ERR_GENERAL);
op->sig_fd = gpa_open_output (file_item->filename_out, &op->sig,
- GPA_OPERATION (op)->window);
+ GPA_OPERATION (op)->window,
+ &filename_used);
if (op->sig_fd == -1)
{
gpgme_data_release (op->plain);
close (op->plain_fd);
+ xfree (filename_used);
/* FIXME: Error value. */
return gpg_error (GPG_ERR_GENERAL);
}
+
+ xfree (file_item->filename_out);
+ file_item->filename_out = filename_used;
}
/* Start the operation */
diff --git a/src/gpakeydeleteop.c b/src/gpakeydeleteop.c
index bebf079..c41c206 100644
--- a/src/gpakeydeleteop.c
+++ b/src/gpakeydeleteop.c
@@ -35,10 +35,10 @@
/* Internal functions */
static gboolean gpa_key_delete_operation_idle_cb (gpointer data);
-static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
+static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
gpg_error_t err,
GpaKeyDeleteOperation *op);
-static void gpa_key_delete_operation_done_cb (GpaContext *context,
+static void gpa_key_delete_operation_done_cb (GpaContext *context,
gpg_error_t err,
GpaKeyDeleteOperation *op);
@@ -48,7 +48,7 @@ static GObjectClass *parent_class = NULL;
static void
gpa_key_delete_operation_finalize (GObject *object)
-{
+{
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -88,7 +88,7 @@ static void
gpa_key_delete_operation_class_init (GpaKeyDeleteOperationClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gpa_key_delete_operation_constructor;
@@ -99,7 +99,7 @@ GType
gpa_key_delete_operation_get_type (void)
{
static GType key_delete_operation_type = 0;
-
+
if (!key_delete_operation_type)
{
static const GTypeInfo key_delete_operation_info =
@@ -114,12 +114,12 @@ gpa_key_delete_operation_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_key_delete_operation_init,
};
-
- key_delete_operation_type = g_type_register_static
+
+ key_delete_operation_type = g_type_register_static
(GPA_KEY_OPERATION_TYPE, "GpaKeyDeleteOperation",
&key_delete_operation_info, 0);
}
-
+
return key_delete_operation_type;
}
@@ -131,7 +131,7 @@ GpaKeyDeleteOperation*
gpa_key_delete_operation_new (GtkWidget *window, GList *keys)
{
GpaKeyDeleteOperation *op;
-
+
op = g_object_new (GPA_KEY_DELETE_OPERATION_TYPE,
"window", window,
"keys", keys,
@@ -144,7 +144,7 @@ gpa_key_delete_operation_new (GtkWidget *window, GList *keys)
static gpg_error_t
gpa_key_delete_operation_start (GpaKeyDeleteOperation *op)
-{
+{
gpg_error_t err;
gpgme_key_t key;
@@ -154,6 +154,7 @@ gpa_key_delete_operation_start (GpaKeyDeleteOperation *op)
if (! gpa_delete_dialog_run (GPA_OPERATION (op)->window, key))
return gpg_error (GPG_ERR_CANCELED);
+ gpgme_set_protocol (GPA_OPERATION (op)->context->ctx, key->protocol);
err = gpgme_op_delete_start (GPA_OPERATION(op)->context->ctx, key, TRUE);
if (err)
{
@@ -194,7 +195,7 @@ gpa_key_delete_operation_next (GpaKeyDeleteOperation *op)
g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
-static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
+static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
gpg_error_t err,
GpaKeyDeleteOperation *op)
{
@@ -210,7 +211,7 @@ static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
}
}
-static void gpa_key_delete_operation_done_cb (GpaContext *context,
+static void gpa_key_delete_operation_done_cb (GpaContext *context,
gpg_error_t err,
GpaKeyDeleteOperation *op)
{
diff --git a/src/gpakeyselector.c b/src/gpakeyselector.c
index b8f56a7..fbdf1fe 100644
--- a/src/gpakeyselector.c
+++ b/src/gpakeyselector.c
@@ -23,6 +23,8 @@
#include "gpa.h"
#include "gpakeyselector.h"
#include "keytable.h"
+#include "gtktools.h"
+#include "convert.h"
/* Callbacks */
@@ -35,7 +37,7 @@ static GObjectClass *parent_class = NULL;
static void
gpa_key_selector_finalize (GObject *object)
-{
+{
GpaKeySelector *sel = GPA_KEY_SELECTOR (object);
/* Dereference all keys in the list */
@@ -49,7 +51,7 @@ static void
gpa_key_selector_class_init (GpaKeySelectorClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gpa_key_selector_finalize;
@@ -57,7 +59,7 @@ gpa_key_selector_class_init (GpaKeySelectorClass *klass)
typedef enum
{
- GPA_KEY_SELECTOR_COLUMN_KEYID,
+ GPA_KEY_SELECTOR_COLUMN_CREATED,
GPA_KEY_SELECTOR_COLUMN_USERID,
GPA_KEY_SELECTOR_COLUMN_KEY,
GPA_KEY_SELECTOR_N_COLUMNS
@@ -69,7 +71,7 @@ gpa_key_selector_init (GpaKeySelector *selector)
GtkListStore *store;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- GtkTreeSelection *selection =
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (selector));
selector->secret = FALSE;
@@ -83,12 +85,14 @@ gpa_key_selector_init (GpaKeySelector *selector)
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (selector), TRUE);
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Key ID"), renderer,
- "text",
- GPA_KEY_SELECTOR_COLUMN_KEYID,
- NULL);
+ column = gtk_tree_view_column_new_with_attributes
+ (NULL, renderer, "text", GPA_KEY_SELECTOR_COLUMN_CREATED, NULL);
+ gpa_set_column_title
+ (column, _("Created"),
+ _("The Creation Date is the date the certificate was created."));
gtk_tree_view_append_column (GTK_TREE_VIEW (selector), column);
- gtk_tree_view_column_set_sort_column_id (column, GPA_KEY_SELECTOR_COLUMN_KEYID);
+ gtk_tree_view_column_set_sort_column_id
+ (column, GPA_KEY_SELECTOR_COLUMN_CREATED);
gtk_tree_view_column_set_sort_indicator (column, TRUE);
renderer = gtk_cell_renderer_text_new ();
@@ -107,7 +111,7 @@ GType
gpa_key_selector_get_type (void)
{
static GType key_selector_type = 0;
-
+
if (!key_selector_type)
{
static const GTypeInfo key_selector_info =
@@ -122,12 +126,12 @@ gpa_key_selector_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_key_selector_init,
};
-
+
key_selector_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
"GpaKeySelector",
&key_selector_info, 0);
}
-
+
return key_selector_type;
}
@@ -152,13 +156,13 @@ gpa_key_selector_new (gboolean secret, gboolean only_usable_keys)
* shouldn't matter much.
*/
gpa_keytable_force_reload (gpa_keytable_get_secret_instance (),
- gpa_key_selector_next_key,
+ gpa_key_selector_next_key,
gpa_key_selector_done, sel);
}
else
{
gpa_keytable_list_keys (gpa_keytable_get_public_instance (),
- gpa_key_selector_next_key,
+ gpa_key_selector_next_key,
gpa_key_selector_done, sel);
}
@@ -170,7 +174,7 @@ gpa_key_selector_new (gboolean secret, gboolean only_usable_keys)
GList *
gpa_key_selector_get_selected_keys (GpaKeySelector * selector)
{
- GtkTreeSelection *selection =
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (selector));
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
GList *list = gtk_tree_selection_get_selected_rows (selection, &model);
@@ -194,43 +198,43 @@ gpa_key_selector_get_selected_keys (GpaKeySelector * selector)
g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
g_list_free (list);
-
+
return keys;
}
-gboolean
+gboolean
gpa_key_selector_has_selection (GpaKeySelector * selector)
{
- int selected = gtk_tree_selection_count_selected_rows
+ int selected = gtk_tree_selection_count_selected_rows
(gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)));
return (selected > 0);
}
/* Internal */
-void
+void
gpa_key_selector_next_key (gpgme_key_t key, gpointer data)
{
GpaKeySelector *selector = data;
GtkListStore *store;
GtkTreeIter iter;
- const gchar *keyid;
+ gchar *created;
gchar *userid;
if (key && selector->only_usable_keys
&& (key->revoked || key->disabled || key->expired || key->invalid))
return;
-
+
selector->keys = g_list_prepend (selector->keys, key);
store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (selector)));
- /* The Key ID */
- keyid = gpa_gpgme_key_get_short_keyid (key);
+ /* The Creation date */
+ created = gpa_creation_date_string (key->subkeys->timestamp);
/* The user ID */
userid = gpa_gpgme_key_get_userid (key->uids);
/* Append it to the list */
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- GPA_KEY_SELECTOR_COLUMN_KEYID, keyid,
+ GPA_KEY_SELECTOR_COLUMN_CREATED, created,
GPA_KEY_SELECTOR_COLUMN_USERID, userid,
GPA_KEY_SELECTOR_COLUMN_KEY, key, -1);
/* If this is a secret key selector, select the default key */
@@ -239,21 +243,22 @@ gpa_key_selector_next_key (gpgme_key_t key, gpointer data)
const char *key_fpr = key->subkeys->fpr;
gpgme_key_t akey;
const char *default_key;
-
+
akey = gpa_options_get_default_key (gpa_options_get_instance());
default_key = akey? akey->subkeys->fpr : NULL;
- if (default_key && g_str_equal (key_fpr, default_key))
+ if (default_key && g_str_equal (key_fpr, default_key))
{
- gtk_tree_selection_select_iter
+ gtk_tree_selection_select_iter
(gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)),&iter);
}
}
/* Clean up */
g_free (userid);
+ g_free (created);
}
-void
+void
gpa_key_selector_done (gpointer data)
{
GpaKeySelector *selector = data;
diff --git a/src/gpasubkeylist.c b/src/gpasubkeylist.c
index fccef74..9862521 100644
--- a/src/gpasubkeylist.c
+++ b/src/gpasubkeylist.c
@@ -68,7 +68,9 @@ gpa_subkey_list_new (void)
/* Init the model */
store = gtk_list_store_new (SUBKEY_N_COLUMNS,
+#if GPGME_VERSION_NUMBER < 0x010601 /* GPGME < 1.6.1 */
G_TYPE_STRING,
+#endif
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
diff --git a/src/gpgmeedit.c b/src/gpgmeedit.c
index 5f6768f..72b6832 100644
--- a/src/gpgmeedit.c
+++ b/src/gpgmeedit.c
@@ -211,26 +211,26 @@ edit_fnc (void *opaque, gpgme_status_code_t status,
struct edit_parms_s *parms = opaque;
char *result = NULL;
- /* Ignore these status lines, as they don't require any response */
- if (status == GPGME_STATUS_EOF
- || status == GPGME_STATUS_GOT_IT
- || status == GPGME_STATUS_NEED_PASSPHRASE
- || status == GPGME_STATUS_NEED_PASSPHRASE_SYM
- || status == GPGME_STATUS_GOOD_PASSPHRASE
- || status == GPGME_STATUS_BAD_PASSPHRASE
- || status == GPGME_STATUS_USERID_HINT
- || status == GPGME_STATUS_SIGEXPIRED
- || status == GPGME_STATUS_KEYEXPIRED
- || status == GPGME_STATUS_BACKUP_KEY_CREATED
- || status == GPGME_STATUS_CARDCTRL /* Issued by gpg1. */
- || status == GPGME_STATUS_SC_OP_SUCCESS
- || status == GPGME_STATUS_PINENTRY_LAUNCHED
- || status == GPGME_STATUS_PROGRESS)
+ /* Whitelist all status code we know about. */
+ switch (status)
{
+ case GPGME_STATUS_ALREADY_SIGNED:
+ case GPGME_STATUS_ERROR:
+ case GPGME_STATUS_GET_BOOL:
+ case GPGME_STATUS_GET_LINE:
+ case GPGME_STATUS_KEY_CREATED:
+ case GPGME_STATUS_NEED_PASSPHRASE_SYM:
+ case GPGME_STATUS_SC_OP_FAILURE:
+ break;
+
+ default:
+ /* We don't know and thus do not need this status code. */
return parms->err;
}
- else if (!parms->need_status_passphrase_sym
- && status == GPGME_STATUS_NEED_PASSPHRASE_SYM)
+
+
+ if (!parms->need_status_passphrase_sym
+ && status == GPGME_STATUS_NEED_PASSPHRASE_SYM)
{
return parms->err;
}
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index 83c4a69..cc45052 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -1,6 +1,6 @@
/* gpgmetools.h - Additional gpgme support functions for GPA.
Copyright (C) 2002 Miguel Coca.
- Copyright (C) 2005, 2008, 2009, 2012, 2014 g10 Code GmbH.
+ Copyright (C) 2005, 2008, 2009, 2012, 2014, 2015 g10 Code GmbH.
This file is part of GPA
@@ -160,28 +160,56 @@ dump_data_to_file (gpgme_data_t data, FILE *file)
}
-static gboolean
+static char *
check_overwriting (const char *filename, GtkWidget *parent)
{
- /* If the file exists, ask before overwriting. */
- if (g_file_test (filename, G_FILE_TEST_EXISTS))
- {
- GtkWidget *msgbox = gtk_message_dialog_new
- (GTK_WINDOW(parent), GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
- _("The file %s already exists.\n"
- "Do you want to overwrite it?"), filename);
- gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
- _("_Yes"), GTK_RESPONSE_YES,
- _("_No"), GTK_RESPONSE_NO, NULL);
- if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
- {
- gtk_widget_destroy (msgbox);
- return FALSE;
- }
- gtk_widget_destroy (msgbox);
+ GtkWidget *dialog;
+ int response;
+ GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE;
+ char *filename_used = xstrdup (filename);
+
+ while (1)
+ {
+ /* If the file exists, ask before overwriting. */
+ if (! g_file_test (filename_used, G_FILE_TEST_EXISTS))
+ return filename_used;
+
+ dialog = gtk_message_dialog_new
+ (GTK_WINDOW (parent), GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ _("The file %s already exists.\n"
+ "Do you want to overwrite it?"), filename_used);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ _("_Yes"), GTK_RESPONSE_YES,
+ _("_No"), GTK_RESPONSE_NO,
+ _("_Use a different filename"), 1,
+ NULL);
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ if (response == GTK_RESPONSE_YES)
+ return filename_used;
+ if (response == GTK_RESPONSE_NO)
+ {
+ xfree (filename_used);
+ return NULL;
+ }
+
+ /* Use a different filename. */
+ dialog = gtk_file_chooser_dialog_new
+ ("Open File", GTK_WINDOW (parent), action,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (response == GTK_RESPONSE_ACCEPT)
+ {
+ GtkFileChooser *chooser = GTK_FILE_CHOOSER (dialog);
+ filename_used = gtk_file_chooser_get_filename (chooser);
+ }
+
+ gtk_widget_destroy (dialog);
}
- return TRUE;
}
/* Not really a gpgme function, but needed in most places
@@ -190,20 +218,20 @@ check_overwriting (const char *filename, GtkWidget *parent)
NULL on failure, but you can assume the user has been informed of
the error (or maybe he just didn't want to overwrite!). */
FILE *
-gpa_fopen (const char *filename, GtkWidget *parent)
+gpa_fopen (const char *filename, GtkWidget *parent, char **filename_used)
{
FILE *target;
- if (!check_overwriting (filename, parent))
+ *filename_used = check_overwriting (filename, parent);
+ if (! *filename_used)
return NULL;
- target = g_fopen (filename, "w");
+ target = g_fopen (*filename_used, "w");
if (!target)
{
gchar *message;
- message = g_strdup_printf ("%s: %s", filename, strerror(errno));
+ message = g_strdup_printf ("%s: %s", *filename_used, strerror(errno));
gpa_window_error (message, parent);
g_free (message);
- return NULL;
}
return target;
}
@@ -237,12 +265,17 @@ gpa_open_output_direct (const char *filename, gpgme_data_t *data,
int
-gpa_open_output (const char *filename, gpgme_data_t *data, GtkWidget *parent)
+gpa_open_output (const char *filename, gpgme_data_t *data, GtkWidget *parent,
+ char **filename_used)
{
- if (! check_overwriting (filename, parent))
+ int res;
+
+ *filename_used = check_overwriting (filename, parent);
+ if (! *filename_used)
return -1;
- return gpa_open_output_direct (filename, data, parent);
+ res = gpa_open_output_direct (*filename_used, data, parent);
+ return res;
}
diff --git a/src/gpgmetools.h b/src/gpgmetools.h
index 1320f88..1cfeb3a 100644
--- a/src/gpgmetools.h
+++ b/src/gpgmetools.h
@@ -1,6 +1,7 @@
/* gpgmetools.h - additional gpgme support functions for GPA.
Copyright (C) 2002, Miguel Coca.
Copyright (C) 2005, 2008 g10 Code GmbH.
+ Copyright (C) 2015 g10 Code GmbH.
This file is part of GPA
@@ -114,8 +115,13 @@ void dump_data_to_file (gpgme_data_t data, FILE *file);
dump_data_to_file is used. Opens a file for writing, asking the
user to overwrite if it exists and reporting any errors. Returns
NULL on failure, but you can assume the user has been informed of
- the error (or maybe he just didn't want to overwrite!). */
-FILE *gpa_fopen (const char *filename, GtkWidget *parent);
+ the error (or maybe he just didn't want to overwrite!). The
+ filename of the file that is actually open (if FILENAME already
+ exists, then the user can choose a different file) is saved in
+ *FILENAME_USED. It must be xfreed. This is set even if this
+ function returns NULL! */
+FILE *gpa_fopen (const char *filename, GtkWidget *parent,
+ char **filename_used);
/* Do a gpgme_data_new_from_file and report any GPG_ERR_File_Error to
the user. */
@@ -125,11 +131,15 @@ gpg_error_t gpa_gpgme_data_new_from_file (gpgme_data_t *data,
/* Create a new gpgme_data_t from a file for writing, and return the
file descriptor for the file. Always reports all errors to the
- user. The _direct variant does not check for overwriting. */
+ user. The _direct variant does not check for overwriting. The
+ filename of the file that is actually open (if FILENAME already
+ exists, then the user can choose a different file) is saved in
+ *FILENAME_USED. It must be xfreed. This is set even if this
+ function returns NULL! */
int gpa_open_output_direct (const char *filename, gpgme_data_t *data,
GtkWidget *parent);
int gpa_open_output (const char *filename, gpgme_data_t *data,
- GtkWidget *parent);
+ GtkWidget *parent, char **filename_used);
/* Create a new gpgme_data_t from a file for reading, and return the
file descriptor for the file. Always reports all errors to the user. */
diff --git a/src/helpmenu.c b/src/helpmenu.c
index 55e1f54..7e1b1e8 100644
--- a/src/helpmenu.c
+++ b/src/helpmenu.c
@@ -72,7 +72,7 @@ gpa_help_about (GtkAction *action, GtkWindow *window)
static const gchar copyright[] =
"Copyright \xc2\xa9 2000-2002 G-N-U GmbH\n"
"Copyright \xc2\xa9 2002-2003 Miguel Coca\n"
- "Copyright \xc2\xa9 2005-2015 g10 Code GmbH";
+ "Copyright \xc2\xa9 2005-2016 g10 Code GmbH";
static const gchar website[] = "https://gnupg.org/related_software/gpa/";
static const gchar website_label[] = "www.gnupg.org";
char *comment;
diff --git a/src/keylist.c b/src/keylist.c
index 7a89d92..442da08 100644
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -55,7 +55,6 @@ typedef enum
/* These are the displayed columns */
GPA_KEYLIST_COLUMN_IMAGE,
GPA_KEYLIST_COLUMN_KEYTYPE,
- GPA_KEYLIST_COLUMN_KEYID,
GPA_KEYLIST_COLUMN_CREATED,
GPA_KEYLIST_COLUMN_EXPIRY,
GPA_KEYLIST_COLUMN_OWNERTRUST,
@@ -201,7 +200,6 @@ gpa_keylist_init (GTypeInstance *instance, void *class_ptr)
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
- G_TYPE_STRING,
G_TYPE_POINTER,
G_TYPE_INT,
G_TYPE_ULONG,
@@ -426,7 +424,7 @@ gpa_keylist_next (gpgme_key_t key, gpointer data)
GpaKeyList *list = data;
GtkListStore *store;
GtkTreeIter iter;
- const gchar *keyid, *ownertrust, *validity;
+ const gchar *ownertrust, *validity;
gchar *userid, *created, *expiry;
gboolean has_secret;
long int val_value;
@@ -472,7 +470,6 @@ gpa_keylist_next (gpgme_key_t key, gpointer data)
list->keys = g_list_append (list->keys, key);
store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (list)));
/* Get the column values */
- keyid = gpa_gpgme_key_get_short_keyid (key);
keytype = (key->protocol == GPGME_PROTOCOL_OpenPGP? "P" :
key->protocol == GPGME_PROTOCOL_CMS? "X" : "?");
created = gpa_creation_date_string (key->subkeys->timestamp);
@@ -507,7 +504,6 @@ gpa_keylist_next (gpgme_key_t key, gpointer data)
gtk_list_store_set (store, &iter,
GPA_KEYLIST_COLUMN_KEYTYPE, keytype,
- GPA_KEYLIST_COLUMN_KEYID, keyid,
GPA_KEYLIST_COLUMN_CREATED, created,
GPA_KEYLIST_COLUMN_EXPIRY, expiry,
GPA_KEYLIST_COLUMN_OWNERTRUST, ownertrust,
@@ -567,21 +563,17 @@ search_keylist_function (GtkTreeModel *model, gint column,
gpointer search_data)
{
gboolean result = TRUE;
- gchar *key_id, *user_id;
+ gchar *user_id;
gint search_len;
gtk_tree_model_get (model, iter,
- GPA_KEYLIST_COLUMN_KEYID, &key_id,
GPA_KEYLIST_COLUMN_USERID, &user_id, -1);
search_len = strlen (key_to_search_for);
- if (!g_ascii_strncasecmp (key_id, key_to_search_for, search_len))
- result=FALSE;
if (!g_ascii_strncasecmp (user_id, key_to_search_for, search_len))
result=FALSE;
- g_free (key_id);
g_free (user_id);
return result;
@@ -625,16 +617,6 @@ setup_columns (GpaKeyList *keylist, gboolean detailed)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes
- (NULL, renderer, "text", GPA_KEYLIST_COLUMN_KEYID, NULL);
- gpa_set_column_title
- (column, _("Key ID"),
- _("The key ID is a short number to identify a certificate."));
- gtk_tree_view_append_column (GTK_TREE_VIEW (keylist), column);
- gtk_tree_view_column_set_sort_column_id (column, GPA_KEYLIST_COLUMN_KEYID);
- gtk_tree_view_column_set_sort_indicator (column, TRUE);
-
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes
(NULL, renderer, "text", GPA_KEYLIST_COLUMN_CREATED, NULL);
gpa_set_column_title
(column, _("Created"),
diff --git a/src/keymanager.c b/src/keymanager.c
index 2cef4ab..d90fcc7 100644
--- a/src/keymanager.c
+++ b/src/keymanager.c
@@ -723,6 +723,9 @@ key_manager_selection_changed (GtkTreeSelection *treeselection,
is okay. */
gpgme_set_keylist_mode (self->ctx->ctx,
(old_mode
+#ifdef GPGME_KEYLIST_MODE_WITH_TOFU
+ | GPGME_KEYLIST_MODE_WITH_TOFU
+#endif
| GPGME_KEYLIST_MODE_SIGS
| GPGME_KEYLIST_MODE_VALIDATE));
gpgme_set_protocol (self->ctx->ctx, key->protocol);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpa.git
More information about the Pkg-gnupg-commit
mailing list