[Pkg-gnupg-commit] [gpa] 01/05: Imported Upstream version 0.9.6
Andreas Rönnquist
gusnan at moszumanska.debian.org
Sat Nov 22 13:24:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
gusnan pushed a commit to branch master
in repository gpa.
commit eda6998dff2f17f13461e72715d9466de51b6ef8
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date: Fri Nov 21 14:35:18 2014 +0100
Imported Upstream version 0.9.6
---
ChangeLog | 83 +++++++++++
Makefile.am | 1 -
Makefile.in | 4 +-
NEWS | 10 ++
VERSION | 2 +-
configure | 28 ++--
configure.ac | 4 +-
po/ar.gmo | Bin 29489 -> 29489 bytes
po/ar.po | 318 ++++++++++++++++++++++-------------------
po/cs.gmo | Bin 58707 -> 59269 bytes
po/cs.po | 342 +++++++++++++++++++++++---------------------
po/de.gmo | Bin 51607 -> 53510 bytes
po/de.po | 360 +++++++++++++++++++++++++----------------------
po/es.gmo | Bin 25696 -> 25696 bytes
po/es.po | 319 ++++++++++++++++++++++-------------------
po/fr.gmo | Bin 34355 -> 34355 bytes
po/fr.po | 317 ++++++++++++++++++++++-------------------
po/gpa.pot | 292 ++++++++++++++++++++------------------
po/ja.gmo | Bin 18651 -> 18622 bytes
po/ja.po | 313 +++++++++++++++++++++-------------------
po/nl.gmo | Bin 20235 -> 20208 bytes
po/nl.po | 315 ++++++++++++++++++++++-------------------
po/pl.gmo | Bin 20736 -> 20736 bytes
po/pl.po | 318 ++++++++++++++++++++++-------------------
po/pt_BR.gmo | Bin 17044 -> 17017 bytes
po/pt_BR.po | 316 ++++++++++++++++++++++-------------------
po/ru.gmo | Bin 31157 -> 31157 bytes
po/ru.po | 318 ++++++++++++++++++++++-------------------
po/sv.gmo | Bin 36309 -> 36309 bytes
po/sv.po | 320 ++++++++++++++++++++++-------------------
po/tr.gmo | Bin 20088 -> 20088 bytes
po/tr.po | 317 ++++++++++++++++++++++-------------------
po/zh_TW.gmo | Bin 16188 -> 16188 bytes
po/zh_TW.po | 315 ++++++++++++++++++++++-------------------
src/Makefile.am | 3 +
src/Makefile.in | 104 +++++++-------
src/cardman.c | 12 ++
src/gpaexportclipop.c | 4 +-
src/gpafileimportop.c | 311 ++++++++++++++++++++++++++++++++++++++++
src/gpafileimportop.h | 77 ++++++++++
src/gpaimportbykeyidop.c | 189 +++++++++++++++++++++++++
src/gpaimportbykeyidop.h | 77 ++++++++++
src/gpaimportclipop.c | 35 ++---
src/gpaimportfileop.c | 14 +-
src/gpaimportop.c | 83 +++++------
src/gpaimportop.h | 9 +-
src/gpaimportserverop.c | 125 +++++++++++++++-
src/gparecvkeydlg.c | 48 ++++---
src/gpgmetools.c | 69 ++++++++-
src/gpgmetools.h | 29 ++++
src/gtktools.c | 120 ++++++----------
src/gtktools.h | 14 +-
src/keymanager.c | 38 ++++-
src/server-access.c | 42 +++---
src/server.c | 47 +++----
src/settingsdlg.c | 58 +++++---
56 files changed, 3740 insertions(+), 2380 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4662548..c920f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,88 @@
+2014-11-21 Werner Koch <wk at gnupg.org>
+
+ Release 0.9.6.
+
+ Do not create gzipped tarball.
+ * Makefile.am (AUTOMAKE_OPTIONS): Remove.
+ * configure.ac (AM_INIT_AUTOMAKE): Add options here.
+
+ po: Auto-update.
+
+ Get rid of Gtk+ warning.
+ * src/server-access.c (wait_dialog): Remove GTK_DIALOG_NO_SEPARATOR.
+
+ Add a Refresh Key function to the key manager's context menu.
+ * src/gpaimportbykeyidop.c: New.
+ * src/gpaimportbykeyidop.h: New.
+ * src/keymanager.c (key_manager_refresh_keys): New.
+ (key_manager_action_new): Add ServerRefresh Action top the popup.
+
+2014-11-21 Zdeněk Hataš <zdenek.hatas at gmail.com>
+
+ po: Update Czech translation.
+
+2014-11-20 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Implement the IMPORT_FILES server command.
+ * src/server.c (cmd_file): Remove --continued stuff and add --clear.
+ (conn_ctrl_s): Remove field files_finished.
+ (impl_encrypt_sign_files): Adjust for this.
+ (impl_decrypt_verify_files): Ditto.
+
+ * src/server.c (impl_encrypt_sign_files): Add import feature.
+ (cmd_import_files): Implement.
+ * src/gpgmetools.h (gpa_import_result_s): New.
+ * src/gpgmetools.c (gpa_gpgme_update_import_results): New.
+ (gpa_gpgme_show_import_results): New.
+ * src/gpaimportop.c (key_import_results_dialog_run): Remove.
+ (gpa_import_operation_done_cb): Use new functions.
+ * src/gpafileimportop.c, src/gpafileimportop.h: New.
+
+2014-11-18 Werner Koch <wk at gnupg.org>
+
+ Make receiving keys from a keyserver work with GnuPG 2.1.
+ * src/gpaimportop.h (_GpaImportOperation): Add field source2.
+ (_GpaImportOperationClass): Change prototype of get_source and all
+ callers.
+ * src/gpaimportop.c (gpa_import_operation_finalize): Release source2
+ var.
+ (gpa_import_operation_idle_cb): Use import_keys if source2 is set.
+ (key_import_results_dialog_run): Use modern info functions.
+ * src/gpaimportserverop.c (MAX_KEYSEARCH_RESULTS): New.
+ (search_keys): New.
+ (gpa_import_server_operation_get_source): Make use of source2.
+
+ * src/gparecvkeydlg.c (gpa_receive_key_dialog_init): Change prompt for
+ gnupg 2.1.0.
+
+ Add functions gpa_show_info and gpa_show_warning.
+ * src/gtktools.c (gpa_show_info): New.
+ (gpa_show_warning): New.
+ (gpa_window_message, gpa_window_error): Make them wrappers fro the new
+ functions.
+
+ Do not show the keyserver setting with gnupg 2.1.0.
+ * src/settingsdlg.c (_SettingsDlg): Add field gnupg21.
+ (settings_dlg_init): Init new field.
+ (settings_dlg_constructor): Do not show the keyserver option with
+ gnupg 2.1.
+ (update_show_advanced_options): Skip the keyserver option with 2.1
+ (keyserver_selected_from_list_cb): Ditto.
+ (check_default_keyserver): Ditto.
+ (load_settings, save_settings): Ditto.
+
+2014-09-02 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Add a File/Close option to the card manager.
+ * src/cardman.c (file_close): New.
+ (cardman_action_new): Add menu item.
+
2014-09-01 Werner Koch <wk at gnupg.org>
+ Post release updates.
+
Release 0.9.5.
2014-07-01 Zdeněk Hataš <zdenek.hatas at gmail.com>
diff --git a/Makefile.am b/Makefile.am
index e24d01b..5aa9ade 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = m4 src po pixmaps doc
diff --git a/Makefile.in b/Makefile.in
index 7913829..fab4502 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,8 +188,8 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -330,7 +330,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = m4 src po pixmaps doc
EXTRA_DIST = \
autogen.sh autogen.rc TODO to-utf8 gpa.spec \
@@ -701,7 +700,6 @@ dist-zip: distdir
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
diff --git a/NEWS b/NEWS
index d866edd..b9129ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Noteworthy changes in version 0.9.6 (2014-11-21)
+------------------------------------------------
+
+ * Support keyserver operations for GnuPG 2.1.
+
+ * Implement the IMPORT_FILES server command.
+
+ * New "Refresh Key" action in the key manager's context menu.
+
+
Noteworthy changes in version 0.9.5 (2014-09-01)
------------------------------------------------
diff --git a/VERSION b/VERSION
index b0bb878..85b7c69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.5
+0.9.6
diff --git a/configure b/configure
index 1508655..972738b 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.5.
+# Generated by GNU Autoconf 2.69 for gpa 0.9.6.
#
# Report bugs to <http://bugs.gnupg.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gpa'
PACKAGE_TARNAME='gpa'
-PACKAGE_VERSION='0.9.5'
-PACKAGE_STRING='gpa 0.9.5'
+PACKAGE_VERSION='0.9.6'
+PACKAGE_STRING='gpa 0.9.6'
PACKAGE_BUGREPORT='http://bugs.gnupg.org'
PACKAGE_URL=''
@@ -1337,7 +1337,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.5 to adapt to many kinds of systems.
+\`configure' configures gpa 0.9.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1407,7 +1407,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gpa 0.9.5:";;
+ short | recursive ) echo "Configuration of gpa 0.9.6:";;
esac
cat <<\_ACEOF
@@ -1522,7 +1522,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gpa configure 0.9.5
+gpa configure 0.9.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1891,7 +1891,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.5, which was
+It was created by gpa $as_me 0.9.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2716,8 +2716,8 @@ fi
# Define the identity of the package.
- PACKAGE=$PACKAGE_NAME
- VERSION=$PACKAGE_VERSION
+ PACKAGE='gpa'
+ VERSION='0.9.6'
cat >>confdefs.h <<_ACEOF
@@ -2787,7 +2787,7 @@ have_libassuan=no
#
# Provide information about the build.
#
-BUILD_REVISION="b97770c"
+BUILD_REVISION="886e24f"
cat >>confdefs.h <<_ACEOF
@@ -2796,7 +2796,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}47479"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}34926"
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
@@ -9682,7 +9682,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.5, which was
+This file was extended by gpa $as_me 0.9.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9748,7 +9748,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.5
+gpa config.status 0.9.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -10739,6 +10739,6 @@ fi
echo "
GPA v${VERSION} has been configured as follows:
- Revision: b97770c (47479)
+ Revision: 886e24f (34926)
Platform: $host
"
diff --git a/configure.ac b/configure.ac
index d8babbc..97beedd 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.5])
+m4_define([mym4_version], [0.9.6])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
@@ -55,7 +55,7 @@ NEED_GPGME_VERSION=1.5.0
AC_CONFIG_AUX_DIR([build-aux])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(src/gpa.c)
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
diff --git a/po/ar.gmo b/po/ar.gmo
index 4b76512..3d46069 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 71f135f..5208324 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+0100\n"
"PO-Revision-Date: 2011-12-12 10:14+0100\n"
"Last-Translator: \n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -42,14 +42,14 @@ msgstr "احفظ باسم..."
msgid "Clipboard"
msgstr "الحافظة"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/_ملف"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/_تحرير"
@@ -91,8 +91,8 @@ msgstr "يظهِّر النصّ المحدد"
msgid "Close the buffer"
msgstr "يخلي البراح"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
msgid "Quit the program"
msgstr ""
@@ -109,11 +109,11 @@ msgstr ""
msgid "Cut the selection"
msgstr "يقص المحدد إلى الحافظة"
-#: src/clipboard.c:795 src/keymanager.c:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "ينسخ المحدد"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "يلصق ما في الحافظة"
@@ -126,15 +126,15 @@ msgstr "يظهِّر النصّ المحدد"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "حلقة مفاتيح"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "ملفات"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "الحافظة"
@@ -300,7 +300,7 @@ msgstr "يعمّي الملف المحدد"
msgid "Decrypt the selected file"
msgstr "يظهِّر الملف المحدد"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -467,7 +467,7 @@ msgstr "يحفظ نسخة احتياطية من المفتاح في ملفّ"
msgid "Generating backup of key: 0x%s"
msgstr "يجري حفظ المفتاح: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "تم نسخ المفاتيح إلى الحافظة."
@@ -569,8 +569,8 @@ msgstr "أتريد <b>حقا</b> استخدام هذا المفتاح؟"
msgid "Revoked Key"
msgstr "مفتاح منقوض"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "أ_غلق"
@@ -624,31 +624,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "يجري توليد المفتاح..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "استورد المفاتيح العلنية من ملفّ"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "لم توجد مفاتيح."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"قُرئت %i مفاتيح علنية\n"
-"استُورِدت %i مفاتيح علنية\n"
-"لم تتغير %i مفاتيح علنية\n"
-"قُرئت %i مفاتيح سرّية\n"
-"استُورِدت %i مفاتيح سرّية\n"
-"لم تتغير %i مفاتيح سرّية"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "لم توجد مفاتيح."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -684,11 +674,16 @@ msgstr "هذا المفتاح موقع بمفتاحك بالفِعل!"
msgid "You haven't selected a default key to sign with!"
msgstr "لم تختر مفتاح التوقيع البدئي."
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "أي المفاتيح تريد استيراده؟ (يجب تحديده بمعرِّف المفتاح)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "أي المفاتيح تريد استيراده؟ (يجب تحديده بمعرِّف المفتاح)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_مُعرِّف المفتاح:"
@@ -1127,49 +1122,63 @@ msgstr "يمكن استخدام المفتاح في التعمية فقط."
msgid "This key is useless."
msgstr "لا فائدة لهذا المفتاح."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%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
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
#, fuzzy
msgid "You must enter a name."
msgstr "يجب أن تُدخِل هوية مُستخدم."
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "عطل في GPA"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "رسالة GPA"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1334,7 +1343,7 @@ 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "ولّد مفتاحا"
@@ -1427,7 +1436,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "خُذ _نسخة احتياطية"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "_لاحقا"
@@ -1511,21 +1520,21 @@ msgid ""
"certificate."
msgstr "اسم المستخدم هو اسم وفي أحان كثيرة عنوان بريد الشهادة."
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "لم تُحدد أي مفاتيح للتعمية."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
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:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_ولِّد المفتاح الآن"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1533,160 +1542,170 @@ msgstr ""
"لم تتخذ نسخة احتياطية من مفتاحك السري بعد. أتريد أخذ نسخة احتياطية الآن "
"(محبذ) أم القيام بهذا لاحقا؟"
-#: src/keymanager.c:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "ا_حفظ المفتاح احتياطيا الآن"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/ال_مفاتيح"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/ال_خادوم"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "ينعش حلقة المفاتيح"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/المفاتيح/مفتاح _جديد"
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "ولّد مفتاحا"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/ا_حذف المفاتيح..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "احذف المفتاح المحدد"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/و_قّع المفاتيح..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "وقّع المفتاح المحدد"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/حدّد ال_ثقة في المالك..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "احذف المفتاح المحدد"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/حرّ_ر المفتاح السرّي..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "حرّر المفتاح السري المحدد"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "استورِد المفاتيح"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "استورِد المفاتيح"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/_صدّر المفاتيح..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "صدّر المفاتيح"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/احفظ ا_حتياطيا..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "ا_حفظ المفتاح احتياطيا الآن"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/الخادوم/المفاتيح ال_سرّية..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "أنعش حلقة المفاتيح"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/أر_سِل المفاتيح للخادوم..."
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/و_قّع المفاتيح..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "/أر_سِل المفاتيح للخادوم..."
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "يعرض قائمة مفاتيح موجزة"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "يعرض تفاصيل المفاتيح"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "حرّر"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
#, fuzzy
msgid "Delete"
msgstr "/تحرير/احذف"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "وقّع"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "صدّر"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "استورد"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "المفتاح المحدد بدئيا:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr "لم يحدد أي مفتاح بدئيا في التفضيلات."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "مدير الملفات"
@@ -2059,51 +2078,51 @@ msgstr "يقص المحدد إلى الحافظة"
msgid "Select a key"
msgstr "المفتاح المحدد بدئيا:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "لا أعطال"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "عطل داخلي"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "العمليّة غير مدعومة"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "يوجد عدم تطابق في الإصدارة"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "عطل داخلي في خادوم المفاتيح"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "نفدت الذاكرة"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "المفتاح غير موجود"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "المفتاح موجود مسبقا على الخادوم"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "المفتاح ناقص"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "تعذّر الاتصال بالخادوم"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "خطأ مجهول"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2112,7 +2131,7 @@ msgstr ""
"يجري الاتصال بالخادوم \"%s\".\n"
"من فضلك انتظر."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2123,73 +2142,73 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
msgstr "لا توجد ملحقة لبروتوكول خادوم المفاتيح الذي حددته."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "خادوم المفاتيح الذي حددته غير صالح"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "محليا"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "محليا"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "محليا"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "<b>استخدم الطَّور ال_متقدّم:</>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "<b>استخدم الطَّور ال_متقدّم:</>"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2198,29 +2217,29 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "المفتاح المحدد بدئيا:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>ال_مفتاح البدئي</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>_خادوم المفاتيح البدئي</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "<b>_خادوم المفاتيح البدئي</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2237,29 +2256,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/ال_خادوم"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "خادوم المفاتيح الذي حددته غير صالح"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "التضبيطات"
@@ -2298,7 +2317,7 @@ msgstr "التوقيع: %s"
msgid "Signatures:"
msgstr "التوقيعات:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "مدير الملفات"
@@ -2346,35 +2365,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "الحافظة"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "ولّد مفتاحا"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "العمليّة غير مدعومة"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "يقص المحدد إلى الحافظة"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2796,6 +2815,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "عطل في GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "رسالة GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "مساعد خصوصية جنو - الحافظة"
@@ -3163,6 +3190,3 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "مُفصَّلة"
-
-#~ msgid "refresh keyring"
-#~ msgstr "أنعش حلقة المفاتيح"
diff --git a/po/cs.gmo b/po/cs.gmo
index 0c06c31..7220407 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 1128a22..fb1b601 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
-"PO-Revision-Date: 2014-06-05 08:46+0100\n"
+"POT-Creation-Date: 2014-11-21 09:49+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"
"Language: cs\n"
@@ -41,13 +41,13 @@ msgstr "Uložit jako..."
msgid "Clipboard"
msgstr "Schránka"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
msgid "_File"
msgstr "_Soubor"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
msgid "_Edit"
msgstr "Úpr_avy"
@@ -83,8 +83,8 @@ 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:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "Kopírovat výběr"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "Vložit ze schránky"
@@ -116,15 +116,15 @@ msgstr "Smazat vybraný text"
msgid "Select the entire document"
msgstr "Vybrat celý dokument"
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "Klíčenka"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Soubory"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr "Karta"
@@ -288,7 +288,7 @@ msgstr "Zašifrovat vybraný soubor"
msgid "Decrypt the selected file"
msgstr "Dešifrovat vybraný soubor"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr "Zavřít okno"
@@ -357,9 +357,8 @@ msgid "Open the settings dialog"
msgstr "Otevřít dialog nastavení"
#: src/gpa.c:121
-#, fuzzy
msgid "Only start the UI server"
-msgstr "Povolit UI server"
+msgstr "Spustit pouze UI server"
#: src/gpa.c:123
msgid "Disable support for X.509"
@@ -371,7 +370,7 @@ msgstr "Číst možnosti ze souboru"
#: src/gpa.c:127
msgid "Do not connect to a running instance"
-msgstr ""
+msgstr "Nepřipojujte se k běžící instanci"
#: src/gpa.c:438
msgid "[FILE...]"
@@ -439,11 +438,11 @@ msgid "Backup key to file"
msgstr "Zálohovat klíč do souboru"
#: src/gpabackupop.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Generating backup of key: 0x%s"
-msgstr "Vytváří se zálohu klíče: %s"
+msgstr "Vytváří se zálohu klíče: 0x%s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Klíče byly zkopírovány do schránky."
@@ -545,8 +544,8 @@ msgstr "<b>Určitě</b> chcete použít tento klíč?"
msgid "Revoked Key"
msgstr "Zneplatněný klíč"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Zavřít"
@@ -603,30 +602,20 @@ msgstr ""
msgid "Generating Key..."
msgstr "Vytváří se klíč ..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
msgid "Import keys from file"
msgstr "Importovat klíče ze souboru"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Nebyly nalezeny žádné klíče."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i přečteno veřejných klíčů\n"
-"%i získáno veřejných klíčů\n"
-"%i nezměněných veřejných klíčů\n"
-"%i přečteno soukromých klíčů\n"
-"%i získáno soukromých klíčů\n"
-"%i nezměněných soukromých klíčů"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Nebyly nalezeny žádné klíče."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -660,11 +649,16 @@ msgstr "Tento klíč už jste sám podepsal!"
msgid "You haven't selected a default key to sign with!"
msgstr "Nebyl vybrán výchozí klíč pro podepisování!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "Který klíč chcete získat? (Musíte zadat ID klíče)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Který klíč chcete získat? (Musíte zadat ID klíče)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_ID klíče:"
@@ -705,7 +699,6 @@ msgid "Status"
msgstr "Stav"
#: src/gpasubkeylist.c:100
-#, fuzzy
msgid "Algo"
msgstr "Algoritmus"
@@ -714,18 +707,16 @@ msgid "Size"
msgstr "Velikost"
#: src/gpasubkeylist.c:113 src/keylist.c:640
-#, fuzzy
msgid "Created"
-msgstr "Vytvořen:"
+msgstr "Vytvořen"
#: src/gpasubkeylist.c:120
-#, fuzzy
msgid "Expires"
-msgstr "Vypršela platnost"
+msgstr "Vyprší platnost"
#: src/gpasubkeylist.c:129
msgid "S"
-msgstr ""
+msgstr "P"
#: src/gpasubkeylist.c:129
msgid "Can sign"
@@ -733,7 +724,7 @@ msgstr "Smí podepisovat"
#: src/gpasubkeylist.c:135
msgid "C"
-msgstr ""
+msgstr "C"
#: src/gpasubkeylist.c:135
msgid "Can certify"
@@ -741,7 +732,7 @@ msgstr "Smí certifikovat"
#: src/gpasubkeylist.c:141
msgid "E"
-msgstr ""
+msgstr "Š"
#: src/gpasubkeylist.c:141
msgid "Can encrypt"
@@ -749,7 +740,7 @@ msgstr "Smí šifrovat"
#: src/gpasubkeylist.c:147
msgid "A"
-msgstr ""
+msgstr "A"
#: src/gpasubkeylist.c:147
msgid "Can authenticate"
@@ -757,7 +748,7 @@ msgstr "Smí autentizovat"
#: src/gpasubkeylist.c:153
msgid "T"
-msgstr ""
+msgstr "K"
#: src/gpasubkeylist.c:154
msgid "Secret key stored on a smartcard."
@@ -1106,46 +1097,62 @@ msgstr "Tento klíč smí být použit pouze pro šifrování."
msgid "This key is useless."
msgstr "Tento klíč je nepoužitelný."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i přečteno veřejných klíčů\n"
+"%i získáno veřejných klíčů\n"
+"%i nezměněných veřejných klíčů\n"
+"%i přečteno soukromých klíčů\n"
+"%i získáno soukromých klíčů\n"
+"%i nezměněných soukromých klíčů"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr "Požadovaná komponenta stroje není instalovaná."
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr "Volání programu šifrovacího stroje selhalo."
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr "Musíte zadat jméno."
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr "Neplatný znak ve jménu."
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr "Jméno nemůže začínat číslicí."
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr "Jméno je příliš krátké."
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr "E-mailová adresa není platná."
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr "Neplatný znak v komentářích."
-#: src/gtktools.c:56
-msgid "Error"
-msgstr "Fehler"
-
-#: src/gtktools.c:97
-msgid "Message"
-msgstr "Zpráva"
-
#: src/helpmenu.c:89
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA je GNU Privacy Assistant"
@@ -1295,7 +1302,7 @@ msgstr "Vytvořit klíč karty"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Vytvořit klíč"
@@ -1388,7 +1395,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Vytvořit _záložní kopii"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "_Později"
@@ -1436,9 +1443,8 @@ 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
-#, fuzzy
msgid "The Creation Date is the date the certificate was created."
-msgstr "Datum vypršení je datum, do kterého je certifikát platný."
+msgstr "Datum vytvoření je datum, kdy byl certifikát vytvořen."
#: src/keylist.c:654
msgid "The Expiry Date is the date until the certificate is valid."
@@ -1478,11 +1484,11 @@ msgstr ""
"Uživatelské jméno je vlastní jméno a většinou také emailová adresa "
"certifikátu."
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Nebyl vybrán klíč pro podpis."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1490,11 +1496,11 @@ msgstr ""
"Ještě nemáte žádný soukromý klíč. Chcete jej vytvořit nyní (doporučeno), "
"nebo později?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_Vytvořit klíč nyní"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1502,143 +1508,153 @@ msgstr ""
"Nemáte záložní kopii soukromého klíče. Chcete ji vytvořit nyní (doporučeno), "
"nebo později?"
-#: src/keymanager.c:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "_Zálohovat klíč nyní"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
msgid "_Keys"
msgstr "_Klíče"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
msgid "_Server"
msgstr "_Server"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr "Vybrat všechny certifikáty"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Aktualizovat keyring"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
msgid "_New key..."
msgstr "_Nový klíč..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
msgid "Generate a new key"
msgstr "Vytvořit nový klíč"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
msgid "_Delete keys"
msgstr "Smazat klíče"
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Odstranit vybraný klíč"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
msgid "_Sign Keys..."
msgstr "Podep_sat klíče..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Podepsat vybraný klíč"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
msgid "Set _Owner Trust..."
msgstr "Nastavit úr_oveň důvěry..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
msgid "Set owner trust of the selected key"
msgstr "Nastavit úroveň důvěry zvoleného klíče"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
msgid "_Edit Private Key..."
msgstr "Upravit _soukromý klíč..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Upravit vybraný soukromý klíč"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
msgid "_Import Keys..."
msgstr "_Importovat klíče..."
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importovat klíče"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
msgid "E_xport Keys..."
msgstr "E_xportovat klíče..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Exportovat klíče"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
msgid "_Backup..."
msgstr "_Zálohovat..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
msgid "Backup key"
msgstr "Zálohovat klíč"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
msgid "_Retrieve Keys..."
msgstr "_Získat klíče..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr "Získat klíče ze serveru"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Aktualizovat keyring"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Získat klíče ze serveru"
+
+#: src/keymanager.c:977
msgid "_Send Keys..."
msgstr "Ode_slat klíče..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
msgid "Send keys to server"
msgstr "Odeslat klíče na server..."
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Zobrazit stručný seznam klíčů"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Zobrazit podrobný seznam klíčů"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Upravit"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "Smazat"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Podepsat"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Exportovat"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Importovat"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "Zvolený výchozí klíč:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr "V předvolbách nebyl zvolen žádný výchozí klíč."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
msgid "Key Manager"
msgstr "Správce klíčů"
@@ -2019,52 +2035,52 @@ msgstr "_Automatický výběr"
msgid "Select a key"
msgstr "Vybrat klíč"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Bez chyb"
# gpapa.c: Keyserver-Fehlermeldungen
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Interní chyba"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Operace není podporována"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Neodpovídá verze"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Interní chyba serveru klíčů"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Došla paměť"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Klíč nebyl nalezen"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Klíč už na serveru existuje"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Nekompletní klíč"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Nemohu kontaktovat server klíčů"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Neznámá chyba"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2073,7 +2089,7 @@ msgstr ""
"Připojuji se k serveru \"%s\".\n"
"Čekejte prosím."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2084,7 +2100,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2092,63 +2108,63 @@ msgstr ""
"Není dostupný zásuvný modul protokolu\n"
"pro komunikaci se serverem klíčů."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Zadali jste neplatný server klíčů"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Lokální"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr "Lokální, server klíčů"
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
msgid "Local, PKA"
msgstr "Lokální, PKA"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr "Lokální, PKA, Server klíčů"
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr "Lokální, Server klíčů, PKA"
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
msgid "Local, kDNS"
msgstr "Lokální, kDNS"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr "Lokální, kDNS, Server klíčů"
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr "PKA"
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr "kDNS"
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr "Volitelný"
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
msgid "<b>User interface</b>"
msgstr "<b>Uživatelské rozhraní</b>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
msgid "Use _advanced mode"
msgstr "Použít _rozšířený mód"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr "Zobrazit rozšířené v_olby"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2162,27 +2178,27 @@ msgstr ""
"\n"
"Zvažte prosím vytvoření vlastního klíče a označte jej."
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr "Pokračovat bez výchozího klíče"
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
msgid "Let me select a default key"
msgstr "Dovolte mi zvolit výchozí klíč"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>Výchozí _klíč</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>Výchozí _server klíčů</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
msgid "<b>Auto key _locate</b>"
msgstr "<b>Automatické na_lezení klíče</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2212,27 +2228,27 @@ msgstr ""
" Vlastní\n"
" - Nastaveno v backendovém dialogu.\n"
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr "Metoda:"
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr "IP adresa jmenného serveru použitého pro metodu kDNS."
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
msgid "kDNS Server:"
msgstr "kDNS Server:"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
msgid "The URL given for the keyserver is not valid."
msgstr "Zadané URL serveru klíčů není platné."
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr "Data předaná pro \"Automatické nalezení klíče\" nejsou platná."
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Nastavení"
@@ -2270,7 +2286,7 @@ msgstr "Podpis: %s"
msgid "Signatures:"
msgstr "Podpisy:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
msgid "Card Manager"
msgstr "Správce karet"
@@ -2319,31 +2335,31 @@ msgstr "Chyba přístupu ke kartě"
msgid "No card"
msgstr "Žádná karta"
-#: src/cardman.c:638
+#: src/cardman.c:647
msgid "_Card"
msgstr "_Karta"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr "Obnovit informace o kartě"
-#: src/cardman.c:648
+#: src/cardman.c:659
msgid "Generate new key on card"
msgstr "Vytvořit nový klíč na kartě"
-#: src/cardman.c:777
+#: src/cardman.c:789
msgid "This card application is not yet supported."
msgstr "Tato aplikace karty není zatím podporována."
-#: src/cardman.c:921
+#: src/cardman.c:933
msgid "Application selection:"
msgstr "Volba aplikace: "
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr "Auto"
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr "Knihovna GPGME je příliš zastaralá aby podporovala čipové karty."
@@ -2880,6 +2896,12 @@ 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 "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Message"
+#~ msgstr "Zpráva"
+
#~ msgid "[S]"
#~ msgstr "[S]"
diff --git a/po/de.gmo b/po/de.gmo
index 12c3743..76ec5c3 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 07c6b8e..e8ec06d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
-"PO-Revision-Date: 2014-01-07 23:06+0100\n"
+"POT-Creation-Date: 2014-11-21 09:49+0100\n"
+"PO-Revision-Date: 2014-11-21 09:40+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -40,13 +40,13 @@ msgstr "Speichern unter..."
msgid "Clipboard"
msgstr "Zwischenablage"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
msgid "_File"
msgstr "_Datei"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
msgid "_Edit"
msgstr "_Bearbeiten"
@@ -82,8 +82,8 @@ msgstr "Text entschlüsseln"
msgid "Close the buffer"
msgstr "Das Fenster schliessen"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "Auswahl kopieren"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "Zwischenablage einfügen"
@@ -115,15 +115,15 @@ msgstr "Gewählten Text löschen"
msgid "Select the entire document"
msgstr "Das gesamte Dokument auswählen"
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "Schlüsselverwaltung"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Dateien"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr "Smartcard"
@@ -288,7 +288,7 @@ msgstr "Gewählte Datei verschlüsseln"
msgid "Decrypt the selected file"
msgstr "Gewählte Datei entschlüsseln"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr "Das Fenster schliessen"
@@ -357,9 +357,8 @@ msgid "Open the settings dialog"
msgstr "Öffne den Dialog für die Einstellungen"
#: src/gpa.c:121
-#, fuzzy
msgid "Only start the UI server"
-msgstr "Den UI Server aktivieren"
+msgstr "Nur den UI Server starten"
#: src/gpa.c:123
msgid "Disable support for X.509"
@@ -371,7 +370,7 @@ msgstr "Optionen aus einer Datei lesen"
#: src/gpa.c:127
msgid "Do not connect to a running instance"
-msgstr ""
+msgstr "Nicht mit einem laufenden GPA verbinden"
#: src/gpa.c:438
msgid "[FILE...]"
@@ -440,11 +439,11 @@ msgid "Backup key to file"
msgstr "_Sicherheitskopie des Schlüssels in Datei:"
#: src/gpabackupop.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Generating backup of key: 0x%s"
-msgstr "Sicherheitskopie von Schlüssel %s erstellen"
+msgstr "Sicherheitskopie von Schlüssel 0x%s wird erstellt"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Die Schlüssel wurden in die Zwischenablage kopiert."
@@ -463,7 +462,7 @@ msgstr "Die Schlüssel wurden exportiert nach %s."
#: src/gpaexportop.c:219
msgid "Only keys of the same procotol may be exported as a collection."
-msgstr ""
+msgstr "Nur Schlüssel eines Protokolls können zusammen exportiert werden"
#: src/gpaexportserverop.c:129
#, c-format
@@ -546,8 +545,8 @@ msgstr "Wollen Sie diesen Schlüssel <b>tatsächlich</b> benutzen?"
msgid "Revoked Key"
msgstr "Zurückgezogener Schlüssel"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Fenster schließen"
@@ -605,30 +604,23 @@ msgstr ""
msgid "Generating Key..."
msgstr "Schlüssel erzeugen..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
msgid "Import keys from file"
msgstr "Zertifikate aus Datei importieren"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Es wurde kein Schlüssel gefunden."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i öffentliche Schlüssel gelesen\n"
-"%i öffentliche Schlüssel importiert\n"
-"%i öffentliche Schlüssel unverändert\n"
-"%i geheime Schlüssel gelesen\n"
-"%i geheime Schlüssel importiert\n"
-"%i geheime Schlüssel unverändert"
+"Mehr als %d Schlüssel entsprechen Ihren Suchkriterien.\n"
+"Benutzen Sie die lange Schlüsselkennung oder den Fingerprint für eine "
+"verfeinerte Suche."
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Es wurde kein Schlüssel gefunden."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -664,11 +656,15 @@ msgstr "Dieser Schlüssel ist bereits mit Ihrem eigenen Schlüssel signiert."
msgid "You haven't selected a default key to sign with!"
msgstr "Kein Standardschlüssel zum Signieren ausgewählt."
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+msgid "Which key do you want to import?"
+msgstr "Welchen Schlüssel möchten Sie importieren?"
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Welchen Schlüssel möchten Sie importieren? (Schlüsselkennung angeben)"
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "Schlüssel_kennung:"
@@ -709,27 +705,24 @@ msgid "Status"
msgstr "Gültigkeit der Beglaubigung"
#: src/gpasubkeylist.c:100
-#, fuzzy
msgid "Algo"
-msgstr "_Verschlüsselungsalgorithmus"
+msgstr "Algo"
#: src/gpasubkeylist.c:107
msgid "Size"
msgstr "Größe"
#: src/gpasubkeylist.c:113 src/keylist.c:640
-#, fuzzy
msgid "Created"
-msgstr "Erstellen"
+msgstr "Erstellt"
#: src/gpasubkeylist.c:120
-#, fuzzy
msgid "Expires"
-msgstr "Abgelaufen"
+msgstr "Läuft ab"
#: src/gpasubkeylist.c:129
msgid "S"
-msgstr ""
+msgstr "S"
#: src/gpasubkeylist.c:129
msgid "Can sign"
@@ -737,7 +730,7 @@ msgstr "Zum Signieren verwendbar"
#: src/gpasubkeylist.c:135
msgid "C"
-msgstr ""
+msgstr "Z"
#: src/gpasubkeylist.c:135
msgid "Can certify"
@@ -745,7 +738,7 @@ msgstr "Zum Überprüfen verwendbar"
#: src/gpasubkeylist.c:141
msgid "E"
-msgstr ""
+msgstr "V"
#: src/gpasubkeylist.c:141
msgid "Can encrypt"
@@ -753,7 +746,7 @@ msgstr "Zum Verschlüsseln verwendbar"
#: src/gpasubkeylist.c:147
msgid "A"
-msgstr ""
+msgstr "A"
#: src/gpasubkeylist.c:147
msgid "Can authenticate"
@@ -761,7 +754,7 @@ msgstr "Zum Authentifizieren verwendbar"
#: src/gpasubkeylist.c:153
msgid "T"
-msgstr ""
+msgstr "T"
#: src/gpasubkeylist.c:154
msgid "Secret key stored on a smartcard."
@@ -1113,46 +1106,64 @@ msgstr "Der Schlüssel ist ausschließlich zum Verschlüsseln verwendbar."
msgid "This key is useless."
msgstr "Dieser Schlüssel ist nicht verwendbar."
-#: src/gpgmetools.c:1512
-msgid "A required engine component is not installed."
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
msgstr ""
+"%u Datei(en) gelesen\n"
+"%u Datei(en) mit Fehlern"
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i öffentliche Schlüssel gelesen\n"
+"%i öffentliche Schlüssel importiert\n"
+"%i öffentliche Schlüssel unverändert\n"
+"%i geheime Schlüssel gelesen\n"
+"%i geheime Schlüssel importiert\n"
+"%i geheime Schlüssel unverändert"
+
+#: src/gpgmetools.c:1579
+msgid "A required engine component is not installed."
+msgstr "Eine notwendige Krypto-Engine ist nicht installiert"
+
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr "Aufruf der Crypto-Engine fehlgeschlagen."
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr "Sie müssen einen Namen angeben."
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr "Ungültige Zeichen im Namen"
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr "Eine Ziffer am Anfang des Names ist nicht erlaubt."
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr "Der Name ist zu kurz."
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr "Die Email Adresse ist nicht gültig."
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr "Ungültige Zeichen im Kommentarfeld."
-#: src/gtktools.c:56
-msgid "Error"
-msgstr "Fehler"
-
-#: src/gtktools.c:97
-msgid "Message"
-msgstr "Meldung"
-
#: src/helpmenu.c:89
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA ist der GNU Privacy Assistant"
@@ -1303,7 +1314,7 @@ msgstr "Schlüssel auf der Karte erzeugen"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Schlüssel erzeugen"
@@ -1399,7 +1410,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "_Sicherheitskopie anlegen"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Später _erledigen"
@@ -1448,9 +1459,8 @@ msgstr ""
"Zertifikats."
#: src/keylist.c:641
-#, fuzzy
msgid "The Creation Date is the date the certificate was created."
-msgstr "Das Ablaufdatum ist das Datum bis zu dem das Zertifikat gültig ist."
+msgstr "Das Erstellungsdatum ist das Datum ab dem das Zertifikat gültig ist."
#: src/keylist.c:654
msgid "The Expiry Date is the date until the certificate is valid."
@@ -1492,11 +1502,11 @@ msgstr ""
"Der Benutzername is der im Zertifikat gespeicherte Name sowie die Email-"
"Adresse."
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Keine Schlüssel ausgewählt."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1504,11 +1514,11 @@ msgstr ""
"Sie haben noch keinen geheimen Schlüssel. Wollen Sie jetzt einen erzeugen "
"(empfohlen), oder dies später erledigen?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "Jetzt Schlüssel _erzeugen"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1516,143 +1526,151 @@ 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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "_Sicherheitskopie anlegen"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
msgid "_Keys"
msgstr "_Schlüssel"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
msgid "_Server"
msgstr "_Server"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr "Alle Zertifikate auswählen"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Schlüsselbund auffrischen"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
msgid "_New key..."
msgstr "_Neuer Schlüssel..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
msgid "Generate a new key"
msgstr "Schlüssel erzeugen"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
msgid "_Delete keys"
msgstr "Schlüssel _löschen"
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Gewählten Schlüssel entfernen"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
msgid "_Sign Keys..."
msgstr "Schlüssel _Signieren..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Gewählten Schlüssel signieren"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
msgid "Set _Owner Trust..."
msgstr "Schlüssel-_Vertrauen einstellen..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
msgid "Set owner trust of the selected key"
msgstr "Vertrauen des gewählten Schlüssels einstellen"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
msgid "_Edit Private Key..."
msgstr "G_eheimen Schlüssel bearbeiten..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Ausgewählten geheimen Schlüssel bearbeiten"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
msgid "_Import Keys..."
msgstr "Schlüssel importieren..."
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Schlüssel importieren"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
msgid "E_xport Keys..."
msgstr "Schlüssel e_xportieren..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Schlüssel exportieren"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
msgid "_Backup..."
msgstr "Sicherheitskopie _anlegen..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
msgid "Backup key"
msgstr "Sicherheitskopie des Schlüssels"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
msgid "_Retrieve Keys..."
msgstr "_Schlüssel erhalten..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr "Schlüssel _zum Key-Server senden"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+msgid "Re_fresh Keys"
+msgstr "Schlüssel auf_frischen"
+
+#: src/keymanager.c:975
+msgid "Refresh keys from server"
+msgstr "Schlüssel vom Key-Server auffrischen"
+
+#: src/keymanager.c:977
msgid "_Send Keys..."
msgstr "Schlüssel _Senden..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
msgid "Send keys to server"
msgstr "Schlüssel _zum Server senden ..."
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Schlüssel nur mit Benutzerkennung anzeigen"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Schlüssel mit Verfallsdatum und Vertrauenswerten anzeigen"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Ändern"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "Löschen"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Signieren"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Export"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Import"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "Standard-Schlüssel:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr "Kein Standard-Schlüssel in den Einstellungen ausgewählt."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1779,6 +1797,12 @@ msgid ""
"Please install a CMS engine or invoke this program\n"
"with the option --disable-x509 ."
msgstr ""
+"Anscheinend ist keine CMS Crypto-Engine installiert.\n"
+"\n"
+"Unterstütztung für X.509 wird vorerst ausgeschaltet.\n"
+"\n"
+"Bitte installieren Sie eine CMS Crypto-Engine oder starten\n"
+"Sie dieses Programm mit der Option --disable-x509 ."
#: src/options.c:329
msgid ""
@@ -2045,52 +2069,52 @@ msgstr "_Automatisch"
msgid "Select a key"
msgstr "Zertifikat auswählen"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Kein Fehler"
# gpapa.c: Keyserver-Fehlermeldungen
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Interner Fehler"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Diese Operation wird nicht unterstützt"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Versionen passen nicht zusammen."
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Interner Fehler des Schlüssel-Servers"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Nicht genügend Speicherplatz."
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Der Schlüssel wurde nicht gefunden."
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Der Schlüssel liegt auf dem Server bereits vor."
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Unvollständiger Schlüssel"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Keinve Verbindung zum Schlüssel-Server möglich."
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Unbekannter Fehler"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2099,7 +2123,7 @@ msgstr ""
"Verbindung zu Server \"%s\" wird aufgebaut.\n"
"Bitte warten."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2110,7 +2134,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2118,63 +2142,63 @@ msgstr ""
"Für das eingestellte Schlüssel-Server-Protokoll\n"
"ist kein Plugin verfügbar."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Der angegebene Schlüssel-Server ist nicht gültig."
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Lokal"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr "Lokal, Schlüssel-Server"
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
msgid "Local, PKA"
msgstr "Lokal, PKA"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr "Lokal, PKA, Schlüssel-Server"
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr "Lokal, Schlüssel-Server, PKA"
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
msgid "Local, kDNS"
msgstr "Lokal, kDNS"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr "Lokal, kDNS, Schlüssel-Server"
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr "PKA"
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr "kDNS"
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr "Spezialkonfiguration"
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
msgid "<b>User interface</b>"
msgstr "<b>Benutzerschnittstelle</b>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
msgid "Use _advanced mode"
msgstr "Einstellungen für _Fortgeschrittene verwenden"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr "Erweiterte Einstellmöglichkeiten anzeigen"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2189,27 +2213,27 @@ msgstr ""
"\n"
"Bitte erwägen Sie, einen eigenen Schlüssel zu erzeugen und auszuwählen."
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr "Ohne Standardschlüssel weitermachen"
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
msgid "Let me select a default key"
msgstr "Ich möchte einen Standard-Schlüssel auswählen"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>_Standard-Schlüssel</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>Standard-Schlüssel-Ser_ver</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
msgid "<b>Auto key _locate</b>"
msgstr "<b>Automatisches Auffinden von Schlüsseln</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2240,28 +2264,28 @@ msgstr ""
" Spezialkonfiguration\n"
" - Nur mit den Einstellungen zum Krypto Backend zu konfigurieren.\n"
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr "Methode:"
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr "Die IP Adresse des für die kDNS Methode zu verwendenden Servers."
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
msgid "kDNS Server:"
msgstr "kDNS Server"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
msgid "The URL given for the keyserver is not valid."
msgstr "Der angegebene Schlüssel-Server ist nicht gültig."
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
"Die Angaben für \"Automatisches Auffinden von Schlüsseln\" sind nicht gültig."
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Einstellungen"
@@ -2299,7 +2323,7 @@ msgstr "Signatur: %s"
msgid "Signatures:"
msgstr "Signaturen (Beglaubigungen)"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
msgid "Card Manager"
msgstr "Kartenverwaltung"
@@ -2350,31 +2374,31 @@ msgstr "Auf die Karte kann nicht zugegriffen werden"
msgid "No card"
msgstr "Keine Karte"
-#: src/cardman.c:638
+#: src/cardman.c:647
msgid "_Card"
msgstr "_Karte"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr "Karteninformationen auffrischen"
-#: src/cardman.c:648
+#: src/cardman.c:659
msgid "Generate new key on card"
msgstr "Neuen Schlüssel auf Karte erzeugen"
-#: src/cardman.c:777
+#: src/cardman.c:789
msgid "This card application is not yet supported."
msgstr "Diese Kartenanwendung wird noch nicht unterstützt."
-#: src/cardman.c:921
+#: src/cardman.c:933
msgid "Application selection:"
msgstr "Anwendungsauswahl:"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr "Auto"
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr "Die verwendete GPGME Bibliothek unterstützt noch keine Smartcards."
@@ -2816,6 +2840,12 @@ msgstr ""
"können jedoch mit dem Knopf zur Anwendungsauswahl auf eine andere, auf der "
"Karte verfügbare, Anwendung umschalten."
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Message"
+#~ msgstr "Meldung"
+
#~ msgid "[S]"
#~ msgstr "[S]"
@@ -2899,7 +2929,6 @@ msgstr ""
#~ msgid "Keyring Editor"
#~ msgstr "Schlüsselverwaltung"
-#, fuzzy
#~ msgid "Generate new key..."
#~ msgstr "Neuen Schlüssel erzeugen..."
@@ -3221,9 +3250,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detailliert"
-#~ msgid "refresh keyring"
-#~ msgstr "Schlüsselbund auffrischen"
-
#~ msgid "Key Validity"
#~ msgstr "Gültigkeit des Schlüssels"
diff --git a/po/es.gmo b/po/es.gmo
index 2495219..c959441 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index a8f2892..d157613 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+0100\n"
"PO-Revision-Date: 2008-03-11 09:35+0100\n"
"Last-Translator: \n"
"Language-Team: Spanish <es at li.org>\n"
@@ -45,14 +45,14 @@ msgstr "Guardar Como..."
msgid "Clipboard"
msgstr "Portapapeles"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/_Archivo"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/_Editar"
@@ -94,8 +94,8 @@ msgstr "Descifrar el texto seleccionado"
msgid "Close the buffer"
msgstr "Limpiar buffer"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "Copiar la selección"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "Pegar el portapapeles"
@@ -129,15 +129,15 @@ msgstr "Descifrar el texto seleccionado"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "Anillo de claves"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Archivos"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "Portapapeles"
@@ -303,7 +303,7 @@ msgstr "Cifrar el archivo seleccionado"
msgid "Decrypt the selected file"
msgstr "Descifrar el archivo seleccionado"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -470,7 +470,7 @@ msgstr "Archivo de copia de seguridad:"
msgid "Generating backup of key: 0x%s"
msgstr "Haciendo copia de seguridad de la clave: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Las claves se han copiado al portapapeles."
@@ -573,8 +573,8 @@ msgstr "¿Está <b>seguro</b> de que quiere usar esa clave?"
msgid "Revoked Key"
msgstr "Clave Revocada"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Cerrar"
@@ -629,31 +629,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Generando Clave..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Importar claves públicas de fichero"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "No se encontró ninguna clave."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i claves públicas leídas\n"
-"%i claves públicas importadas\n"
-"%i claces públicas sin cambios\n"
-"%i claves secretas leídas\n"
-"%i claves secretas importadas\n"
-"%i claves secretas sin cambios"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "No se encontró ninguna clave."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -689,12 +679,18 @@ msgstr "¡Esta clave ya ha sido firmada con la suya!"
msgid "You haven't selected a default key to sign with!"
msgstr "¡No ha seleccionado una clave por defecto con la que firmar!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"¿Qué clave desea importar? (La clave debe especificarse por su ID de clave)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"¿Qué clave desea importar? (La clave debe especificarse por su ID de clave)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_ID de Clave:"
@@ -1137,49 +1133,63 @@ msgstr "Esta clave puede utilizarse tan sólo para cifrado."
msgid "This key is useless."
msgstr "Esta clave no vale para nada."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i claves públicas leídas\n"
+"%i claves públicas importadas\n"
+"%i claces públicas sin cambios\n"
+"%i claves secretas leídas\n"
+"%i claves secretas importadas\n"
+"%i claves secretas sin cambios"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
#, fuzzy
msgid "You must enter a name."
msgstr "Tienes que introducir un Identificador de Usuario (User ID)"
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "Error de GPA"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "Mensaje de GPA"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1345,7 +1355,7 @@ msgstr "Generar clave"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Generar clave"
@@ -1442,7 +1452,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Crear copia de _seguridad"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Hacerlo más _tarde"
@@ -1536,11 +1546,11 @@ msgstr ""
"El Nombre de Usuario es el nombre y a menudo también el correo electrónico "
"del certificado."
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "No hay ninguna clave seleccionada para firmar."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1548,11 +1558,11 @@ msgstr ""
"Aún no tiene una clave privada. ¿Quiere generar una ahora (recomendado) o "
"hacerlo más tarde?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_Generar clave ahora"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1560,160 +1570,170 @@ 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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "Hacer _copia de seguridad ahora"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/_Claves"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/_Servidor"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Actualizar el anillo de llaves"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/Claves/_Nueva Clave..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "Generar clave"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/_Borrar Claves..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Borrar la clave seleccionada"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/_Firmar Claves..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Firmar la clave seleccionada"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Establecer _Confianza en el Usuario..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Borrar la clave seleccionada"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Editar Clave Privada..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Editar la clave privada seleccionada"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "Importar Claves"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importar Claves"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_xportar Claves..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Exportar Claves"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/_Copia de Seguridad..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "Hacer _copia de seguridad ahora"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Servidor/_Descargar Claves..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "actualizar el anillo de llaves"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "E_nviar claves al servidor"
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/_Firmar Claves..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "E_nviar claves al servidor"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Mostrar Lista de Claves Breve"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Mostrar detalles de las claves"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Editar"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
#, fuzzy
msgid "Delete"
msgstr "/Editar/Eliminar"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Firmar"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Exportar"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Importar"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "Clave por defecto seleccionada:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr "No hay ninguna clave predeterminada seleccionada en preferencias."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "Gestor de Archivos"
@@ -2093,51 +2113,51 @@ msgstr "Cortar la selección"
msgid "Select a key"
msgstr "Clave por defecto seleccionada:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "No hay error"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Error interno"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Operación no soportada"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Error de versión"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Error interno del servidor de claves"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Falta memoria"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Clave no encontrada"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "La clave ya está en el servidor"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Clave incompleta"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "No se pudo contactar con el servidor"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Error Desconocido"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2146,7 +2166,7 @@ msgstr ""
"Conectando con el servidor \"%s\".\n"
"Espere, por favor."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2157,7 +2177,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2165,67 +2185,67 @@ msgstr ""
"No hay plugin disponible para el protocolo de servidor\n"
"de claves que especificó."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "El servidor de claves que especificó no es válido"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Local"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "Local"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "Local"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "<b>Usar modo _avanzado</b>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "<b>Usar modo _avanzado</b>"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2234,29 +2254,29 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "Clave por defecto seleccionada:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>Clave por _defecto</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>Servidor de _claves por defecto</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "<b>Servidor de _claves por defecto</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2273,29 +2293,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/_Servidor"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "El servidor de claves que especificó no es válido"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Preferencias"
@@ -2334,7 +2354,7 @@ msgstr "Firmas: %s"
msgid "Signatures:"
msgstr "Firmas:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "Gestor de Archivos"
@@ -2382,35 +2402,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "Portapapeles"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Generar clave"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Operación no soportada"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Cortar la selección"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2832,6 +2852,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Error de GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensaje de GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Portapapeles"
@@ -3199,6 +3227,3 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detallada"
-
-#~ msgid "refresh keyring"
-#~ msgstr "actualizar el anillo de llaves"
diff --git a/po/fr.gmo b/po/fr.gmo
index e86d04a..0d5ca91 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 6d89472..4bd040b 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+0100\n"
"PO-Revision-Date: 2011-12-12 10:12+0100\n"
"Last-Translator: Eric Lassauge <lassauge at users.sf.net>\n"
"Language-Team: <fr at li.org>\n"
@@ -44,13 +44,13 @@ msgstr "Enregistrer sous…"
msgid "Clipboard"
msgstr "Presse-papiers"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
msgid "_File"
msgstr "_Fichier"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
msgid "_Edit"
msgstr "É_diter"
@@ -86,8 +86,8 @@ 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:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "Copier la sélection"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "Coller le presse-papiers"
@@ -119,15 +119,15 @@ msgstr "Effacer le texte sélectionné"
msgid "Select the entire document"
msgstr "Sélectionner le document en entier"
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "Trousseau de clefs"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Fichiers"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "Presse-papiers"
@@ -293,7 +293,7 @@ msgstr "Chiffrer le fichier sélectionné"
msgid "Decrypt the selected file"
msgstr "Déchiffrer le fichier sélectionné"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr "Fermer la fenêtre"
@@ -451,7 +451,7 @@ msgstr "Sauvegarder la clef dans le fichier :"
msgid "Generating backup of key: 0x%s"
msgstr "Génération de la sauvegarde de clef : %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Les clefs ont été copiées dans le presse-papiers."
@@ -555,8 +555,8 @@ msgstr "Etes-vous <b>certain</b> de vouloir utiliser cette clef ?"
msgid "Revoked Key"
msgstr "Clef révoquée"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Fermer"
@@ -614,31 +614,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Génération de clef…"
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Importer des clefs publiques d'un fichier"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Clefs introuvables."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i clefs publiques lues\n"
-"%i clefs publiques importées\n"
-"%i clefs publiques inchangées\n"
-"%i clefs secrètes lues\n"
-"%i clefs secrètes importées\n"
-"%i clefs secrètes inchangées"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Clefs introuvables."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -674,13 +664,20 @@ msgstr "Cette clef a déjà été signée par la vôtre !"
msgid "You haven't selected a default key to sign with!"
msgstr "Pas de clef par défaut pour signer !"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Quelle clef désirez-vous importer (La clef doit être spécifiée par son ID de "
+"clef) ?"
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Quelle clef désirez-vous importer (La clef doit être spécifiée par son ID de "
"clef) ?"
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_ID de clef :"
@@ -1127,49 +1124,63 @@ msgstr "La clef peut être utilisée pour fins de chiffrement seulement."
msgid "This key is useless."
msgstr "Cette clef est inutilisable."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i clefs publiques lues\n"
+"%i clefs publiques importées\n"
+"%i clefs publiques inchangées\n"
+"%i clefs secrètes lues\n"
+"%i clefs secrètes importées\n"
+"%i clefs secrètes inchangées"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
#, fuzzy
msgid "You must enter a name."
msgstr "Vous devez entrer un identificateur d'usager."
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "Erreur GPA"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "Message de GPA"
-
#: src/helpmenu.c:89
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA est l'assistant GNU Privacy."
@@ -1323,7 +1334,7 @@ msgstr "Générer clef"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Générer clef"
@@ -1419,7 +1430,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Créer une _copie de sauvegarde"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Le faire plus _tard"
@@ -1516,11 +1527,11 @@ msgid ""
msgstr ""
"Le Nom d'Usager est le nom mais aussi l'adresse courriel de ce certificat. "
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Aucune clef sélectionnée pour signer."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1528,11 +1539,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:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_Générer la clef maintenant"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1540,143 +1551,153 @@ 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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "_Sauvegarder la clef maintenant"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
msgid "_Keys"
msgstr "_Clefs"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
msgid "_Server"
msgstr "_Serveur"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr "Sélectionner tout les certificats"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Recharger le trousseau de clefs"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
msgid "_New key..."
msgstr "_Nouvelle clef…"
-#: src/keymanager.c:924
+#: src/keymanager.c:951
msgid "Generate a new key"
msgstr "Générer une nouvelle clef"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
msgid "_Delete keys"
msgstr "_Supprimer des clefs"
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Supprimer la clef sélectionnée"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
msgid "_Sign Keys..."
msgstr "Clefs de _signature…"
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Signer la clef sélectionnée"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
msgid "Set _Owner Trust..."
msgstr "Changer la c_onfiance du propriétaire…"
-#: src/keymanager.c:930
+#: src/keymanager.c:957
msgid "Set owner trust of the selected key"
msgstr "Changer la confiance du propriétaire de la clef sélectionnée"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
msgid "_Edit Private Key..."
msgstr "_Éditer une clef privée…"
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Éditer la clef sélectionnée"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
msgid "_Import Keys..."
msgstr "_Importer des clefs…"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importer des clefs"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
msgid "E_xport Keys..."
msgstr "E_xporter des clefs…"
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Exporter des clefs"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
msgid "_Backup..."
msgstr "_Sauvegarder…"
-#: src/keymanager.c:940
+#: src/keymanager.c:967
msgid "Backup key"
msgstr "Sauvegarde des clés"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
msgid "_Retrieve Keys..."
msgstr "_Récupération de clefs…"
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr "Récupérer des clefs depuis un serveur"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Recharger le trousseau de clefs"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Récupérer des clefs depuis un serveur"
+
+#: src/keymanager.c:977
msgid "_Send Keys..."
msgstr "_Envoyer des clefs…"
-#: src/keymanager.c:948
+#: src/keymanager.c:978
msgid "Send keys to server"
msgstr "Envoi de clefs au serveur"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Montrer un résumé de la liste de clefs"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Montrer les détails de la clef"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Éditer"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "Effacer"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Signer"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Exporter"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Importer"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "Clef sélectionnée par défaut :"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
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:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "Gestionnaire de fichiers"
@@ -2057,51 +2078,51 @@ msgstr "Couper la sélection"
msgid "Select a key"
msgstr "Clef sélectionnée par défaut :"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Aucune erreur"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Erreur interne"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Opération non supportée"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Version ne correspondant pas"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Erreur interne au serveur de clefs"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "À court de mémoire"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Clef introuvable"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Clé déjà connue du serveur."
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Clef incomplète"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Impossible de contacter le serveur de clefs"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Erreur inconnue"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2110,7 +2131,7 @@ msgstr ""
"Connection au serveur « %s ».\n"
"Veuillez patienter."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2121,7 +2142,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2129,63 +2150,63 @@ msgstr ""
"Il n'y a aucun greffon disponible pour le protocole de\n"
"serveur de clefs que vous avez spécifié."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Le serveur de clefs que vous avez indiqué n'est pas valide"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Local"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr "Local, serveur de clefs"
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
msgid "Local, PKA"
msgstr "Local, PKA"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr "Local, PKA, serveur de clefs"
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr "Local, serveur de clefs, PKA"
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
msgid "Local, kDNS"
msgstr "Local, kDNS"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr "Local, kDNS, serveur de clefs"
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr "PKA"
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr "kDNS"
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr "Personnalisé"
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
msgid "<b>User interface</b>"
msgstr "<b>Interface utilisateur</b>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
msgid "Use _advanced mode"
msgstr "Utiliser le mode _avancé"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr "Montrer les _options avancées"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2199,27 +2220,27 @@ msgstr ""
"\n"
"Veuillez créer votre propre clef et sélectionnez la ensuite."
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr "Continuer sans clef par défaut"
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
msgid "Let me select a default key"
msgstr "Sélection d'une clef par défaut"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>Clef par _défaut</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>_Serveur de clefs par défaut</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
msgid "<b>Auto key _locate</b>"
msgstr "<b>_Localiser automatiquement les clefs</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2249,29 +2270,29 @@ msgstr ""
" Personnalisé\n"
" - Configurer dans la fenêtre de dialogue du backend.\n"
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr "Méthode :"
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr "Adresse IP du serveur de nom pour la méthode kDNS."
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
msgid "kDNS Server:"
msgstr "Serveur kDNS :"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
msgid "The URL given for the keyserver is not valid."
msgstr ""
"L'URL donnée pour le serveur de clefs que vous avez indiqué n'est pas valide"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
"La donnée pour « Localiser automatiquement les clefs » n'est pas valide"
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr ""
@@ -2310,7 +2331,7 @@ msgstr "Signatures : %s"
msgid "Signatures:"
msgstr "Signatures :"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "Gestionnaire de fichiers"
@@ -2358,36 +2379,36 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "_Presse-papiers"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Générer une nouvelle clef"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Opération non supportée"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Couper la sélection"
-#: src/cardman.c:925
+#: src/cardman.c:937
#, fuzzy
msgid "Auto"
msgstr "Personnalisé"
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2808,6 +2829,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Erreur GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Message de GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "Assistant GNU Privacy - Presse-papiers"
diff --git a/po/gpa.pot b/po/gpa.pot
index 6cba4b5..ca30c5d 100644
--- a/po/gpa.pot
+++ b/po/gpa.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gpa 0.9.5\n"
+"Project-Id-Version: gpa 0.9.6\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,13 +41,13 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
msgid "_File"
msgstr ""
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
msgid "_Edit"
msgstr ""
@@ -83,8 +83,8 @@ msgstr ""
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
msgid "Quit the program"
msgstr ""
@@ -100,11 +100,11 @@ msgstr ""
msgid "Cut the selection"
msgstr ""
-#: src/clipboard.c:795 src/keymanager.c:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr ""
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr ""
@@ -116,15 +116,15 @@ msgstr ""
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr ""
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr ""
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr ""
@@ -286,7 +286,7 @@ msgstr ""
msgid "Decrypt the selected file"
msgstr ""
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -434,7 +434,7 @@ msgstr ""
msgid "Generating backup of key: 0x%s"
msgstr ""
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr ""
@@ -533,8 +533,8 @@ msgstr ""
msgid "Revoked Key"
msgstr ""
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr ""
@@ -585,23 +585,19 @@ msgstr ""
msgid "Generating Key..."
msgstr ""
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
msgid "Import keys from file"
msgstr ""
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr ""
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
+msgstr ""
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
msgstr ""
#: src/gpakeyexpireop.c:244
@@ -636,11 +632,15 @@ msgstr ""
msgid "You haven't selected a default key to sign with!"
msgstr ""
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+msgid "Which key do you want to import?"
+msgstr ""
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr ""
@@ -1047,46 +1047,56 @@ msgstr ""
msgid "This key is useless."
msgstr ""
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-msgid "Error"
-msgstr ""
-
-#: src/gtktools.c:97
-msgid "Message"
-msgstr ""
-
#: src/helpmenu.c:89
msgid "GPA is the GNU Privacy Assistant."
msgstr ""
@@ -1228,7 +1238,7 @@ 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr ""
@@ -1308,7 +1318,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr ""
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr ""
@@ -1379,163 +1389,171 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr ""
-#: src/keymanager.c:747
+#: src/keymanager.c:774
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:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr ""
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr ""
-#: src/keymanager.c:900
+#: src/keymanager.c:927
msgid "_Keys"
msgstr ""
-#: src/keymanager.c:902
+#: src/keymanager.c:929
msgid "_Server"
msgstr ""
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:923
+#: src/keymanager.c:950
msgid "_New key..."
msgstr ""
-#: src/keymanager.c:924
+#: src/keymanager.c:951
msgid "Generate a new key"
msgstr ""
-#: src/keymanager.c:925
+#: src/keymanager.c:952
msgid "_Delete keys"
msgstr ""
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr ""
-#: src/keymanager.c:927
+#: src/keymanager.c:954
msgid "_Sign Keys..."
msgstr ""
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr ""
-#: src/keymanager.c:929
+#: src/keymanager.c:956
msgid "Set _Owner Trust..."
msgstr ""
-#: src/keymanager.c:930
+#: src/keymanager.c:957
msgid "Set owner trust of the selected key"
msgstr ""
-#: src/keymanager.c:932
+#: src/keymanager.c:959
msgid "_Edit Private Key..."
msgstr ""
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr ""
-#: src/keymanager.c:935
+#: src/keymanager.c:962
msgid "_Import Keys..."
msgstr ""
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr ""
-#: src/keymanager.c:937
+#: src/keymanager.c:964
msgid "E_xport Keys..."
msgstr ""
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr ""
-#: src/keymanager.c:939
+#: src/keymanager.c:966
msgid "_Backup..."
msgstr ""
-#: src/keymanager.c:940
+#: src/keymanager.c:967
msgid "Backup key"
msgstr ""
-#: src/keymanager.c:944
+#: src/keymanager.c:971
msgid "_Retrieve Keys..."
msgstr ""
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+msgid "Re_fresh Keys"
+msgstr ""
+
+#: src/keymanager.c:975
+msgid "Refresh keys from server"
+msgstr ""
+
+#: src/keymanager.c:977
msgid "_Send Keys..."
msgstr ""
-#: src/keymanager.c:948
+#: src/keymanager.c:978
msgid "Send keys to server"
msgstr ""
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr ""
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr ""
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr ""
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr ""
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr ""
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr ""
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr ""
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr ""
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
msgid "Key Manager"
msgstr ""
@@ -1874,58 +1892,58 @@ msgstr ""
msgid "Select a key"
msgstr ""
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr ""
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr ""
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr ""
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr ""
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr ""
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr ""
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr ""
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr ""
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr ""
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr ""
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr ""
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
"Please wait."
msgstr ""
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -1933,69 +1951,69 @@ msgid ""
"%s"
msgstr ""
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
msgstr ""
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr ""
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr ""
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
msgid "Local, PKA"
msgstr ""
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
msgid "Local, kDNS"
msgstr ""
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
msgid "<b>User interface</b>"
msgstr ""
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
msgid "Use _advanced mode"
msgstr ""
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2004,27 +2022,27 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
msgid "Let me select a default key"
msgstr ""
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr ""
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr ""
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
msgid "<b>Auto key _locate</b>"
msgstr ""
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2041,27 +2059,27 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
msgid "kDNS Server:"
msgstr ""
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
msgid "The URL given for the keyserver is not valid."
msgstr ""
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr ""
@@ -2099,7 +2117,7 @@ msgstr ""
msgid "Signatures:"
msgstr ""
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
msgid "Card Manager"
msgstr ""
@@ -2145,31 +2163,31 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
msgid "_Card"
msgstr ""
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
msgid "Generate new key on card"
msgstr ""
-#: src/cardman.c:777
+#: src/cardman.c:789
msgid "This card application is not yet supported."
msgstr ""
-#: src/cardman.c:921
+#: src/cardman.c:933
msgid "Application selection:"
msgstr ""
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
diff --git a/po/ja.gmo b/po/ja.gmo
index 31b21af..d4e5dd4 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 5e1d6ab..cfbdb30 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +43,14 @@ msgstr ""
msgid "Clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/�ե����� (_F)"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/�Խ� (_E)"
@@ -92,8 +92,8 @@ msgstr "
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
msgid "Quit the program"
msgstr ""
@@ -111,12 +111,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "����ե������Ź沽����"
-#: src/clipboard.c:795 src/keymanager.c:913
+#: src/clipboard.c:795 src/keymanager.c:940
#, fuzzy
msgid "Copy the selection"
msgstr "����ե������Ź沽����"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
#, fuzzy
msgid "Paste the clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
@@ -130,16 +130,16 @@ msgstr "
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
#, fuzzy
msgid "Keyring"
msgstr "��«���ǥ���"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "�ե�����"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
@@ -310,7 +310,7 @@ msgstr "
msgid "Decrypt the selected file"
msgstr "����ե���������沽����"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -487,7 +487,7 @@ msgstr "
msgid "Generating backup of key: 0x%s"
msgstr "���ΥХå����åפ��������: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "����åץܡ��ɤإ��ԡ����ޤ�����"
@@ -590,8 +590,8 @@ msgstr "<b>
msgid "Revoked Key"
msgstr "�˴��Ѥߤθ�"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "�Ĥ��� (_C)"
@@ -643,31 +643,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "����������..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "�ե����뤫���������ݡ��Ȥ���"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "�������դ���ޤ���Ǥ�����"
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i �Ĥθ��������ɤ߹��ߤޤ���\n"
-"%i �Ĥθ�������ݡ��Ȥ��ޤ���\n"
-"%i �Ĥθ�������̵�ѹ��Ǥ�\n"
-"%i �Ĥ���̩�����ɤ߹��ߤޤ���\n"
-"%i �Ĥ���̩����ݡ��Ȥ��ޤ���\n"
-"%i �Ĥ���̩����̵�ѹ��Ǥ�"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "�������դ���ޤ���Ǥ�����"
#: src/gpakeyexpireop.c:244
msgid ""
@@ -701,11 +691,16 @@ msgstr "
msgid "You haven't selected a default key to sign with!"
msgstr "��̾����ǥե���Ȥθ������Ƥ��ޤ���"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "�ɤθ���ݡ��Ȥ��ޤ���? (���� ID �ǻ��ꤹ��ɬ�פ�����ޤ�)"
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "�ɤθ���ݡ��Ȥ��ޤ���? (���� ID �ǻ��ꤹ��ɬ�פ�����ޤ�)"
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "�� _ID"
@@ -1147,48 +1142,63 @@ msgstr "
msgid "This key is useless."
msgstr "���θ��ϻȤ��ޤ���"
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%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
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
#, fuzzy
msgid "Name is too short."
msgstr "̾����Ĺ��ޤ�"
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-msgid "Error"
-msgstr "���顼"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "GPA ������"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1351,7 +1361,7 @@ 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "��������"
@@ -1444,7 +1454,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "�Хå����åפκ��� (_B)"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "��� (_L)"
@@ -1524,22 +1534,22 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "��̾���븰������Ƥ��ޤ���"
-#: src/keymanager.c:747
+#: src/keymanager.c:774
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:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "����������������� (_G)"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1547,163 +1557,173 @@ msgstr ""
"�ޤ���̩���ΥХå����åפ�����ޤ�����������Хå����åפ��ޤ��� (����"
"��)������Ȥ��ˤ��ޤ�����"
-#: src/keymanager.c:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "����������Хå����åפ��� (_B)"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/�� (_K)"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/������ (_S)"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
#, fuzzy
msgid "Select all certificates"
msgstr "�������������� (_V)"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/�� (K)/�������... (_N)"
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "��������"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/������... (_D)"
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "���줿������"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/���˽�̾... (_S)"
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "���줿���˽�̾����"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/��ͭ�Ԥο����٤����... (_O)"
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "���줿������"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/��̩�����Խ�... (_E)"
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "���줿��̩�����Խ�"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "����ݡ���"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "����ݡ���"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/�������ݡ���... (_X)"
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "�������ݡ���"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/�Хå����å�... (_B)"
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "����Хå����å�"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/������ (S)/�������... (_R)"
-#: src/keymanager.c:945
+#: src/keymanager.c:972
#, fuzzy
msgid "Retrieve keys from server"
msgstr "�����������"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "������"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "�����������"
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/���˽�̾... (_S)"
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "/����������... (_N)"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "�����Ǥθ��ꥹ�Ȥ�ɽ��"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "���ξܺ٤�ɽ��"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "�Խ�"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "���"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "��̾����"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "�������ݡ���"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "����ݡ���"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
#, fuzzy
msgid "Selected default key:"
msgstr "���줿�ǥե���Ȥθ�:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
#, fuzzy
msgid "No default key selected in the preferences."
msgstr "�ݸ��ե����뤬����Ƥ��ޤ���"
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "�ե�����ޥ͡�����"
@@ -2082,51 +2102,51 @@ msgstr "
msgid "Select a key"
msgstr "���줿�ǥե���Ȥθ�:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "���顼�ʤ�"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "�����顼"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "�����ݡ��Ȥ���Ƥ��ޤ���"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "�С������äƤ��ޤ���"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "�������д�Ϣ�������顼"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "������"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "�������դ���ޤ���"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "�����Ф˴��˸���¸�ߤ��ޤ�"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "�����Դ����Ǥ�"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "�������С���Ϣ���Ȥ�ޤ���"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "̤��ǧ���顼"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2135,7 +2155,7 @@ msgstr ""
"������ \"%s\" ����³��Ǥ���\n"
"���Ԥ�����������"
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2146,7 +2166,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2154,69 +2174,69 @@ msgstr ""
"���ꤵ�줿�ץ�ȥ���θ������Ф�\n"
"�Ȥ���ץ饰����Ϥ���ޤ���"
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "���ꤵ�줿�������Ф�̵���Ǥ�"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "������"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
#, fuzzy
msgid "Local, Keyserver"
msgstr "�������� (_K):"
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "������"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "������"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "���ԥ⡼�ɤ�Ȥ� (_A):"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "���ԥ⡼�ɤ�Ȥ� (_A):"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
#, fuzzy
msgid "Show advanced _options"
msgstr "�ե�����ư���ɽ��"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2225,31 +2245,31 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "���줿�ǥե���Ȥθ�:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
#, fuzzy
msgid "<b>Default _key</b>"
msgstr "�ǥե���Ȥθ� (_K):"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
#, fuzzy
msgid "<b>Default key_server</b>"
msgstr "�ǥե���Ȥθ������� (_S):"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "�ǥե���Ȥθ������� (_S):"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2266,29 +2286,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/������ (_S)"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "���ꤵ�줿�������Ф�̵���Ǥ�"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "����"
@@ -2328,7 +2348,7 @@ msgstr "
msgid "Signatures:"
msgstr "��̾:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "�ե�����ޥ͡�����"
@@ -2379,35 +2399,35 @@ msgstr "
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "��������"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "�����ݡ��Ȥ���Ƥ��ޤ���"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "����ե������Ź沽����"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2830,6 +2850,13 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "Error"
+#~ msgstr "���顼"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA ������"
+
#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - �ե�����ޥ͡�����"
diff --git a/po/nl.gmo b/po/nl.gmo
index c9e84b9..b58379a 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index be94225..3a50963 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +40,14 @@ msgstr ""
msgid "Clipboard"
msgstr "Naar _klembord"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/_Bestand"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "Bewerk"
@@ -89,8 +89,8 @@ msgstr "Ontsleutel het geselecteerde bestand"
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
#, fuzzy
msgid "Copy the selection"
msgstr "Versleutel het geselecteerde bestand"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
#, fuzzy
msgid "Paste the clipboard"
msgstr "Naar _klembord"
@@ -127,16 +127,16 @@ msgstr "Ontsleutel het geselecteerde bestand"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
#, fuzzy
msgid "Keyring"
msgstr "Keyring Editor"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Bestanden"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "Naar _klembord"
@@ -307,7 +307,7 @@ msgstr "Versleutel het geselecteerde bestand"
msgid "Decrypt the selected file"
msgstr "Ontsleutel het geselecteerde bestand"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -484,7 +484,7 @@ msgstr "_Backup sleutel naar bestand:"
msgid "Generating backup of key: 0x%s"
msgstr "Genereren van backup van sleutel: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "De sleutels werden naar het klembord gekopieerd."
@@ -587,8 +587,8 @@ msgstr "Wil je <b>echt</b> deze sleutel gebruiken?"
msgid "Revoked Key"
msgstr "Teruggetrokken sleutel"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Sluiten"
@@ -640,31 +640,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Genereren van de sleutel..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Importeer publieke sleutels vanuit een bestand"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Geen sleutels gevonden."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i publieke sleutels gelezen\n"
-"%i publieke sleutels ge�mporteerd\n"
-"%i publieke sleutels onveranderd\n"
-"%i geheime sleutels gelezen\n"
-"%i geheime sleutels ge�mporteerd\n"
-"%i geheime sleutels onveranderd"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Geen sleutels gevonden."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -698,13 +688,20 @@ msgstr "Deze sleutel is al ondertekend met uw eigen sleutel!"
msgid "You haven't selected a default key to sign with!"
msgstr "U hebt geen sleutel geselecteerd voor ondertekening"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Welke sleutel wilt u importeren? (De sleutel moet aangeduid zijn\n"
+"met zijn sleutel id."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Welke sleutel wilt u importeren? (De sleutel moet aangeduid zijn\n"
"met zijn sleutel id."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "Sleutel _ID:"
@@ -1149,48 +1146,63 @@ msgstr "De sleutel kan alleen gebruikt worden voor versleuteling."
msgid "This key is useless."
msgstr "Deze sleutel is waardeloos."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i publieke sleutels gelezen\n"
+"%i publieke sleutels ge�mporteerd\n"
+"%i publieke sleutels onveranderd\n"
+"%i geheime sleutels gelezen\n"
+"%i geheime sleutels ge�mporteerd\n"
+"%i geheime sleutels onveranderd"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
#, fuzzy
msgid "Name is too short."
msgstr "Naam te lang"
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-msgid "Error"
-msgstr "Fout"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "GPA Bericht"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1355,7 +1367,7 @@ msgstr "Genereer sleutel"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Genereer sleutel"
@@ -1451,7 +1463,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Maak _backup kopie"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Doe het _later"
@@ -1530,11 +1542,11 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Geen sleutels geselecteerd voor ondertekening."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1542,11 +1554,11 @@ msgstr ""
"U heeft nog geen geheime sleutel. Wil u er nu een genereren (aanbevolen) of "
"dit later doen?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_Genereer sleutel nu"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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,163 +1566,173 @@ msgstr ""
"U heeft nog geen backup van uw geheime sleutel. Wil u uw sleutel nubackuppen "
"(aanbevolen) of dit later doen?"
-#: src/keymanager.c:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "_Backup sleutel nu"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/_Sleutels"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/_Server"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
#, fuzzy
msgid "Select all certificates"
msgstr "_genereerd terugtrekkings certificaat"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/Sleutels/_Nieuwe Sleutel..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "Genereer sleutel"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/_Verwijder sleutels...."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Verwijder de geselecteerde sleutel"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/_Onderteken Sleutels..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Onderteken de geselecteerde sleutel"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Verander _Eigenaars Vertrouwen...."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Verwijder de geselecteerde sleutel"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Bewerk Sleutel..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Bewerk de geselecteerde sleutel"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "Importeer sleutels"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importeer sleutels"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_xporteer Sleutels...."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Exporteer Sleutels"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/_Backup...."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "Sleutels Backuppen"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Server/_Haal sleutels...."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
#, fuzzy
msgid "Retrieve keys from server"
msgstr "Ontvang sleutel van server:"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Verwijder sleutel"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Ontvang sleutel van server:"
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/_Onderteken Sleutels..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "Stel keyserver in"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Toon beperkte sleutellijst"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Toon Sleutel Details"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Bewerk"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "Wissen"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Ondertekenen"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Exporteer"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Importeer"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
#, fuzzy
msgid "Selected default key:"
msgstr "Selecteer Standaard Sleutel:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
#, fuzzy
msgid "No default key selected in the preferences."
msgstr "Geen sleutels geselecteerd voor export."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "bestandsbeheerder"
@@ -2089,52 +2111,52 @@ msgstr "Versleutel het geselecteerde bestand"
msgid "Select a key"
msgstr "Selecteer Standaard Sleutel:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Geen fout"
# gpapa.c: Keyserver-Fehlermeldungen
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Inwendige fout"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Actie niet ondersteund"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Niet passende versie"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Inwendige keyserver fout"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Geen geheugen meer"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Sleutel niet gevonden"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Sleutel bestaat al op de server"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Sleutel niet compleet"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Kan de keyserver niet contacteren"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Onbekende fout"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2143,7 +2165,7 @@ msgstr ""
"Verbinden met server \"%s\".\n"
"Even geduld."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2154,7 +2176,7 @@ msgstr ""
"\n"
"%s werd gecontacteerd."
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2162,69 +2184,69 @@ msgstr ""
"Er is geen plugin beschikbaar voor het keyserver\n"
"protocol dat u specifieerde."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "De keyserver die u specifieerde is niet geldig"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Lokaal"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
#, fuzzy
msgid "Local, Keyserver"
msgstr "_KeyServer: "
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "Lokaal"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "Lokaal"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "Gebruik ge_avanceerde mode:"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "Gebruik ge_avanceerde mode:"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
#, fuzzy
msgid "Show advanced _options"
msgstr "Toon bestands operaties"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2233,31 +2255,31 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "Selecteer Standaard Sleutel:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
#, fuzzy
msgid "<b>Default _key</b>"
msgstr "_Standaard sleutel:"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
#, fuzzy
msgid "<b>Default key_server</b>"
msgstr "_Standaard KeyServer:"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "_Standaard KeyServer:"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2274,29 +2296,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/_Server"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "De keyserver die u specifieerde is niet geldig"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Instellingen"
@@ -2336,7 +2358,7 @@ msgstr "Ondertekeningen"
msgid "Signatures:"
msgstr "Ondertekeningen:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "bestandsbeheerder"
@@ -2386,35 +2408,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "Naar _klembord"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Genereer sleutel"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Actie niet ondersteund"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Versleutel het geselecteerde bestand"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2835,6 +2857,13 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA Bericht"
+
#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Bestands beheerder"
diff --git a/po/pl.gmo b/po/pl.gmo
index c38659e..63f58ae 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index ed3264a..e6a2432 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +42,14 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/_Plik"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/_Edycja"
@@ -91,8 +91,8 @@ msgstr "Deszyfruje wybrany plik"
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
#, fuzzy
msgid "Copy the selection"
msgstr "Szyfruje wybrany plik"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr ""
@@ -128,16 +128,16 @@ msgstr "Deszyfruje wybrany plik"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
#, fuzzy
msgid "Keyring"
msgstr "Edytor zbioru kluczy"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Pliki"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr ""
@@ -304,7 +304,7 @@ msgstr "Szyfruje wybrany plik"
msgid "Decrypt the selected file"
msgstr "Deszyfruje wybrany plik"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -481,7 +481,7 @@ msgstr "Wykonaj kopię zapasową klucza do pliku"
msgid "Generating backup of key: 0x%s"
msgstr "Generowanie kopii zapasowej klucza: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Klucze zostały skopiowane do schowka."
@@ -584,8 +584,8 @@ msgstr "Czy <b>naprawdę</b> chcesz użyć tego klucza?"
msgid "Revoked Key"
msgstr "Unieważniony klucz"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "Z_amknij"
@@ -641,31 +641,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Generowanie klucza..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Import kluczy publicznych z pliku"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Nie odnaleziono żadnych kluczy."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i publicznych kluczy odczytano\n"
-"%i publicznych kluczy zaimportowano\n"
-"%i publicznych kluczy nie uległo zmianie\n"
-"%i tajnych kluczy odczytano\n"
-"%i tajnych kluczy zaimportowano\n"
-"%i tajnych kluczy nie uległo zmianie"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Nie odnaleziono żadnych kluczy."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -699,11 +689,16 @@ msgstr "Ten klucz został już podpisany przez ciebie!"
msgid "You haven't selected a default key to sign with!"
msgstr "Nie wybrano domyślnego klucza, który ma posłużyć do podpisania!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "Który klucz chcesz importować? (Należy podać identyfikator klucza)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Który klucz chcesz importować? (Należy podać identyfikator klucza)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_Identyfikator klucza:"
@@ -1150,48 +1145,62 @@ msgstr "Ten klucz może być użyty tylko do szyfrowania."
msgid "This key is useless."
msgstr "Ten klucz jest bezużyteczny."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i publicznych kluczy odczytano\n"
+"%i publicznych kluczy zaimportowano\n"
+"%i publicznych kluczy nie uległo zmianie\n"
+"%i tajnych kluczy odczytano\n"
+"%i tajnych kluczy zaimportowano\n"
+"%i tajnych kluczy nie uległo zmianie"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "Błąd GPA"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "Komunikat GPA"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1357,7 +1366,7 @@ msgstr "Wygeneruj klucz"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Wygeneruj klucz"
@@ -1452,7 +1461,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Utwórz kopię _zapasową"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Zrób to _później"
@@ -1535,11 +1544,11 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Nie wybrano kluczy do podpisu."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1547,11 +1556,11 @@ msgstr ""
"Nie posiadasz jeszcze klucza prywatnego. Wygenerować taki klucz teraz "
"(zalecane), czy uczynić to później?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_Wygeneruj klucz teraz"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1559,161 +1568,171 @@ msgstr ""
"Nie posiadasz kopii zapasowej swojego klucza prywatnego. Sporządzić kopię "
"zapasową klucza teraz (zalecane), czy uczynić to później? "
-#: src/keymanager.c:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "_Sporządź kopię zapasową teraz"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/_Klucze"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/_Serwer"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Odświeża zbiór kluczy"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/Klucze/_Nowy Klucz..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "Wygeneruj klucz"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/_Usuń klucze..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Usuwa wybrany klucz"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/_Podpisz klucze..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Podpisuje wybrany klucz"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Ustaw poziom zaufania do właściciela..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Usuwa wybrany klucz"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Edytuj klucz prywatny..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Edytuje wybrany klucz prywatny"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "Importuje klucze"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importuje klucze"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_ksportuj klucze..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Eksportuje klucze"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/_Kopia zapasowa..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "Kopia zaspasowa kluczy"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Serwer/_Pobierz klucze..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "odświeża zbiór kluczy"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/W_yślij klucze na serwer..."
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/_Podpisz klucze..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "/W_yślij klucze na serwer..."
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Pokazuje zwięzłą listę kluczy"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Pokazuje szczegółową listę kluczy"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Edycja"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
#, fuzzy
msgid "Delete"
msgstr "/Edycja/Wybierz _wszystko"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Podpisz"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Eksport"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Import"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
#, fuzzy
msgid "Selected default key:"
msgstr "Wybrano domyślny klucz"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "menedżer plików"
@@ -2092,51 +2111,51 @@ msgstr "Szyfruje wybrany plik"
msgid "Select a key"
msgstr "Wybrano domyślny klucz"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Brak błędów"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Błąd wewnętrzny"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Operacja nie jest obsługiwana"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Niezgodność wersji"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Wewnętrzny błąd serwera kluczy"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Brak pamięci"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Klucz nie został znaleziony"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Klucz już istnieje na serwerze"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Klucz nie jest pełny"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Nie można nawiązać połączenia z serwerem kluczy"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Nieznany błąd"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2145,7 +2164,7 @@ msgstr ""
"Łączenie z serwerem \"%s\".\n"
"Proszę czekać."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2156,7 +2175,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2164,67 +2183,67 @@ msgstr ""
"Nie ma dostępnej wtyczki dla wybranego protokołu\n"
"obsługującego serwer kluczy."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Podany serwer kluczy nie jest poprawny."
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Lokalny"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "Lokalny"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "Lokalny"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "Użyj trybu zaawansowanego:"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "Użyj trybu zaawansowanego:"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2233,31 +2252,31 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "Wybrano domyślny klucz"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
#, fuzzy
msgid "<b>Default _key</b>"
msgstr "_Domyślny klucz:"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
#, fuzzy
msgid "<b>Default key_server</b>"
msgstr "Domyślny _serwer kluczy: "
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "Domyślny _serwer kluczy: "
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2274,29 +2293,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/_Serwer"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "Podany serwer kluczy nie jest poprawny."
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Ustawienia"
@@ -2336,7 +2355,7 @@ msgstr "Podpis: %s"
msgid "Signatures:"
msgstr "Podpisy:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "menedżer plików"
@@ -2384,35 +2403,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "/Okna/Menadżer _plików"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Wygeneruj klucz"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Operacja nie jest obsługiwana"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Szyfruje wybrany plik"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2832,6 +2851,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Błąd GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Komunikat GPA"
+
+#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Menedżer plików "
@@ -3209,9 +3236,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "szczegółowy"
-#~ msgid "refresh keyring"
-#~ msgstr "odświeża zbiór kluczy"
-
#~ msgid "Sign files"
#~ msgstr "Podpisz pliki"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index c78e017..6686caf 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 15b1d55..37734fd 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +41,14 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/Ar_quivo"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "_Editar"
@@ -90,8 +90,8 @@ msgstr "Desencriptar o arquivo selecionado"
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
#, fuzzy
msgid "Copy the selection"
msgstr "Encriptar o arquivo selecionado"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr ""
@@ -127,16 +127,16 @@ msgstr "Desencriptar o arquivo selecionado"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
#, fuzzy
msgid "Keyring"
msgstr "Editor do chaveiro digital"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Arquivos"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr ""
@@ -307,7 +307,7 @@ msgstr "Encriptar o arquivo selecionado"
msgid "Decrypt the selected file"
msgstr "Desencriptar o arquivo selecionado"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -484,7 +484,7 @@ msgstr "E_xportar para o arquivo:"
msgid "Generating backup of key: 0x%s"
msgstr "Gerando backup de chave: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr ""
@@ -587,8 +587,8 @@ msgstr "Voc
msgid "Revoked Key"
msgstr "Chave revogada"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Fechar"
@@ -643,31 +643,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "/Chaves/_Gerar Chave..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Importar chave p�blica de um arquivo"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Nenhuma chave foi encontrada."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i chave p�blica lida\n"
-"%i chave p�blica importada\n"
-"%i chave p�blica sem altera��es\n"
-"%i chave secreta lida\n"
-"%i chave secreta importada\n"
-"%i chave secreta sem altera��es"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Nenhuma chave foi encontrada."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -701,11 +691,15 @@ msgstr "Esta chave j
msgid "You haven't selected a default key to sign with!"
msgstr "Voc� n�o selecionou uma chave default para assinar!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+msgid "Which key do you want to import?"
+msgstr ""
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_Key ID:"
@@ -1148,48 +1142,63 @@ msgstr "E n
msgid "This key is useless."
msgstr ""
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i chave p�blica lida\n"
+"%i chave p�blica importada\n"
+"%i chave p�blica sem altera��es\n"
+"%i chave secreta lida\n"
+"%i chave secreta importada\n"
+"%i chave secreta sem altera��es"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
#, fuzzy
msgid "Name is too short."
msgstr "Nome muito longo"
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-msgid "Error"
-msgstr "Erro"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "Mensagem do GPA"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1351,7 +1360,7 @@ msgstr "Gerar chave"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Gerar chave"
@@ -1448,7 +1457,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Criar uma _c�pia de backup"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Faz�-lo mais _tarde"
@@ -1529,11 +1538,11 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Nenhuma chave selecionada para assinar."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1541,11 +1550,11 @@ msgstr ""
"Voc� n�o tem ainda uma chave privada. Voc� desejar gerar uma agora "
"(recomendado) ou faz�-lo mais tarde?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "_Gerar chave agora"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1553,164 +1562,174 @@ 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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "_Backup de chave agora"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/_Chaves"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "_Nunca"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
#, fuzzy
msgid "Select all certificates"
msgstr "Gerar certificado de revoga��o"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
#, fuzzy
msgid "Refresh the keyring"
msgstr "_Chaveiro de chaves secretas"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/Chaves/_Nova Chave..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "Gerar chave"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/_Apagar Chaves..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Remover a chave selecionada"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/A_ssinar Chaves..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Assinar a chave selecionada"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/A_lterar a confiabilidade..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Remover a chave selecionada"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/_Editar Chave Privada..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Editar a chave privada selecionada"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "Importar chaves"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importar chaves"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/E_xportar Chaves..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Exportar Chaves"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/_Backup..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "Backup de chaves"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Chaves/_Apagar Chaves..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
#, fuzzy
msgid "Retrieve keys from server"
msgstr "Receber chave de _servidor:"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "_Chaveiro de chaves secretas"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Receber chave de _servidor:"
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/A_ssinar Chaves..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "_Servidor de chave:"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Mostrar resumo da lista de chaves"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Mostrar detalhes da chave"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Editar"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "_Apagar"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Assinar"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Exportar"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Importar"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
#, fuzzy
msgid "Selected default key:"
msgstr "Chave default selecionada:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
#, fuzzy
msgid "No default key selected in the preferences."
msgstr "Nenhum arquivo selecionado para ser protegido"
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "gerenciador de arquivos"
@@ -2098,51 +2117,51 @@ msgstr "Encriptar o arquivo selecionado"
msgid "Select a key"
msgstr "Chave default selecionada:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Nenhum erro"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Erro interno"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Opera��o n�o suportada"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Vers�o incorreta"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Erro interno do servidor"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Sem mem�ria"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Chave n�o encontrada"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Chave j� existe no servidor"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Chave incompleta"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "N�o foi poss�vel contactar o servidor"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "ERRO desconhecido"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2151,7 +2170,7 @@ msgstr ""
"Conectando com o servidor \"%s\".\n"
"Por favor espere."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2162,7 +2181,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2170,67 +2189,67 @@ msgstr ""
"N�o h� um plugin dispon�vel para o servidor de chaves\n"
"com o protocolo especificado."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "O servidor de chaves especificado n�o � v�lido"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr ""
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
#, fuzzy
msgid "Local, Keyserver"
msgstr "_Servidor de chaves"
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
msgid "Local, PKA"
msgstr ""
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
msgid "Local, kDNS"
msgstr ""
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "Usar modo _avan�ado:"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "Usar modo _avan�ado:"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
#, fuzzy
msgid "Show advanced _options"
msgstr "Mostrar detalhes da chave"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2239,31 +2258,31 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "Chave default selecionada:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
#, fuzzy
msgid "<b>Default _key</b>"
msgstr "Chave _padr�o (default key):"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
#, fuzzy
msgid "<b>Default key_server</b>"
msgstr "Servidor de chaves _padr�o:"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "Servidor de chaves _padr�o:"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2280,29 +2299,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "_Nunca"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "O servidor de chaves especificado n�o � v�lido"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Configura��o"
@@ -2343,7 +2362,7 @@ msgstr "Assinaturas"
msgid "Signatures:"
msgstr "Assinaturas:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "gerenciador de arquivos"
@@ -2392,36 +2411,36 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "/Janelas/_Gerenciador de arquivos"
-#: src/cardman.c:646
+#: src/cardman.c:657
#, fuzzy
msgid "Reload card information"
msgstr "Mostrar as informa��es sobre a garantia\n"
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Gerar chave"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Opera��o n�o suportada"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Encriptar o arquivo selecionado"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2843,6 +2862,13 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensagem do GPA"
+
#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Gerenciador de arquivos"
@@ -3241,10 +3267,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detalhado"
-#, fuzzy
-#~ msgid "refresh keyring"
-#~ msgstr "_Chaveiro de chaves secretas"
-
#~ msgid "Sign files"
#~ msgstr "Arquivo assinado"
diff --git a/po/ru.gmo b/po/ru.gmo
index 6f2888a..c3fa01b 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index d1ad47b..f2147d0 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +43,14 @@ msgstr "Сохранить как..."
msgid "Clipboard"
msgstr "Буфер"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/_Файл"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/_Правка"
@@ -92,8 +92,8 @@ msgstr "Расшифровать выбранный текст"
msgid "Close the buffer"
msgstr "Очистить буфер"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
msgid "Quit the program"
msgstr ""
@@ -110,11 +110,11 @@ msgstr ""
msgid "Cut the selection"
msgstr "Вырезать выделенное в буфер"
-#: src/clipboard.c:795 src/keymanager.c:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "Копировать выделенное в буфер"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "Вставить из буфера"
@@ -127,15 +127,15 @@ msgstr "Расшифровать выбранный текст"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "Ключи"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Файлы"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "Буфер"
@@ -301,7 +301,7 @@ msgstr "Зашифровать выбранный файл"
msgid "Decrypt the selected file"
msgstr "Расшифровать выбранный файл"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -468,7 +468,7 @@ msgstr "Резервная копия ключа в файл"
msgid "Generating backup of key: 0x%s"
msgstr "Создание резервной копии ключа: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Ключи скопированы в буфер."
@@ -570,8 +570,8 @@ msgstr "Вы <b><действительно уверены/b>, что хотит
msgid "Revoked Key"
msgstr "Отзыв ключа"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Закрыть"
@@ -626,31 +626,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Создание ключа..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Импорт открытого ключа из файла"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Ключи не обнаружены."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"Прочитано открытых ключей: %i\n"
-"Импортировано открытых ключей: %i\n"
-"Не изменено открытых ключей: %i\n"
-"Прочитано закрытых ключей: %i\n"
-"Импортировано закрытых ключей: %i\n"
-"Не изменено закрытых ключей: %i"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Ключи не обнаружены."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -686,11 +676,16 @@ msgstr "Этот ключ уже подписан вашим ключом!"
msgid "You haven't selected a default key to sign with!"
msgstr "Не выбран ключ по умолчанию для подписи!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "Какой ключ импортировать (ID ключа)?"
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Какой ключ импортировать (ID ключа)?"
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "ID _ключа:"
@@ -1135,49 +1130,63 @@ msgstr "Ключ может быть использован только для
msgid "This key is useless."
msgstr "Данный ключ бесполезен/неприменим."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%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
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
#, fuzzy
msgid "You must enter a name."
msgstr "Введите ID пользователя."
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "Ошибка GPA"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "Сообщение GPA"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1342,7 +1351,7 @@ 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Генерация ключа"
@@ -1438,7 +1447,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Создать резервную копию"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "Позже"
@@ -1525,11 +1534,11 @@ msgid ""
"certificate."
msgstr "Имя владельца сертификата и (часто) его электронный адрес."
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Не выбран ключ для подписи."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1537,11 +1546,11 @@ msgstr ""
"У вас пока нет закрытого ключа. Хотите создать его сейчас (рекомендуется) "
"или позже?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "Создать ключ"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1549,160 +1558,170 @@ msgstr ""
"Вы еще не сделали резервную копию закрытого ключа. Хотите сделать ее сейчас "
"(рекомендуется) или позже?"
-#: src/keymanager.c:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "Создать резервную копию"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/_Ключи"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/_Сервер"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Обновить связку ключей"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/Ключи/_Создать..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "Генерация ключа"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/Удалить ключи..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Удалить выбранный ключ"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/Подписать ключи..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Подписать выбранный ключ"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Доверие владельцу..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Удалить выбранный ключ"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/Редактировать закрытый ключ..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Правка выделенного закрытого ключа"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "Импорт ключей"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Импорт ключей"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/Экспортировать ключи..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Экспорт ключей"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/Резервная копия..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "Создать резервную копию"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Сервер/_Загрузить ключи..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "обновить связку ключей"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/Отправить на сервер..."
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/Подписать ключи..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "/Отправить на сервер..."
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Краткий список ключей"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Подробный список ключей"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Правка"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
#, fuzzy
msgid "Delete"
msgstr "/Правка/_Удалить"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Подписать"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Экспорт"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Импорт"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "Ключ по умолчанию:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr "В настройках не выбран ключ по умолчанию."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "Менеджер _файлов"
@@ -2076,51 +2095,51 @@ msgstr "Вырезать выделенное в буфер"
msgid "Select a key"
msgstr "Ключ по умолчанию:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Нет ошибок"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Действие не поддерживается"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Несоответствие версии"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Внутренняя ошибка сервера ключей"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Недостаточно памяти"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Ключ не найден"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Ключ уже существует на сервере"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Ключ неполный"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Не удалось связаться с сервером"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Неизвестная ошибка"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2129,7 +2148,7 @@ msgstr ""
"Подключение к серверу \"%s\".\n"
"Подождите, пожалуйста."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2140,7 +2159,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2148,67 +2167,67 @@ msgstr ""
"Отсутствует плагин выбранного протокола\n"
"для связи с сервером ключей."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Некорректно задан сервер ключей"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Локал."
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "Локал."
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "Локал."
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "<b>Рас_ширенный режим</b>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "<b>Рас_ширенный режим</b>"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2217,29 +2236,29 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "Ключ по умолчанию:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>_Ключ по умолчанию</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>_Сервер ключей по умолчанию</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "<b>_Сервер ключей по умолчанию</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2256,29 +2275,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/_Сервер"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "Некорректно задан сервер ключей"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Настройки"
@@ -2317,7 +2336,7 @@ msgstr "Подпись: %s"
msgid "Signatures:"
msgstr "Подписи:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "Менеджер _файлов"
@@ -2365,35 +2384,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "Буфер"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Генерация ключа"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Действие не поддерживается"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Вырезать выделенное в буфер"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2815,6 +2834,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Ошибка GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Сообщение GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Буфер"
@@ -3182,6 +3209,3 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "подробный"
-
-#~ msgid "refresh keyring"
-#~ msgstr "обновить связку ключей"
diff --git a/po/sv.gmo b/po/sv.gmo
index 1e0e915..c5f21c2 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 7006068..1d3c0f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,13 +42,13 @@ msgstr "Spara som..."
msgid "Clipboard"
msgstr "Urklipp"
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
msgid "_File"
msgstr "_Arkiv"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
msgid "_Edit"
msgstr "R_edigera"
@@ -84,8 +84,8 @@ msgstr "Dekryptera bufferttexten"
msgid "Close the buffer"
msgstr "Stäng bufferten"
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
msgid "Copy the selection"
msgstr "Kopiera markeringen"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr "Klistra in urklipp"
@@ -117,15 +117,15 @@ msgstr "Ta bort markerad text"
msgid "Select the entire document"
msgstr "Välj hela dokumentet"
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
msgid "Keyring"
msgstr "Nyckelring"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Filer"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
#, fuzzy
msgid "Card"
msgstr "Urklipp"
@@ -291,7 +291,7 @@ msgstr "Kryptera markerad fil"
msgid "Decrypt the selected file"
msgstr "Dekryptera markerad fil"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr "Stäng fönstret"
@@ -448,7 +448,7 @@ msgstr "Säkerhetskopiera nyckel till fil"
msgid "Generating backup of key: 0x%s"
msgstr "Skapar säkerhetskopia av nyckel: %s"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Nycklarna har kopierats till urklipp."
@@ -550,8 +550,8 @@ msgstr "Vill du <b>verkligen</b> använda denna nyckel?"
msgid "Revoked Key"
msgstr "Spärrad nyckel"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Stäng"
@@ -609,31 +609,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Genererar nyckel..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Importera publika nycklar från fil"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Inga nycklar hittades."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i publika nycklar inlästa\n"
-"%i publika nycklar importerade\n"
-"%i publika nycklar oförändrade\n"
-"%i hemliga nycklar inlästa\n"
-"%i hemliga nycklar importerade\n"
-"%i hemliga nycklar oförändrade"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Inga nycklar hittades."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -669,13 +659,20 @@ msgstr "Den här nyckeln har redan signerats med din egen nyckel!"
msgid "You haven't selected a default key to sign with!"
msgstr "Du har inte valt en standardnyckel att signera med!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Vilken nyckel vill du importera? (Nyckeln måste anges med dess "
+"nyckelidentitet)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Vilken nyckel vill du importera? (Nyckeln måste anges med dess "
"nyckelidentitet)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "_Nyckelidentitet:"
@@ -1112,49 +1109,63 @@ msgstr "Nyckeln kan endast användas för kryptering."
msgid "This key is useless."
msgstr "Den här nyckeln är oanvändbar."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i publika nycklar inlästa\n"
+"%i publika nycklar importerade\n"
+"%i publika nycklar oförändrade\n"
+"%i hemliga nycklar inlästa\n"
+"%i hemliga nycklar importerade\n"
+"%i hemliga nycklar oförändrade"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
#, fuzzy
msgid "You must enter a name."
msgstr "Du måste ange en användaridentitet."
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "GPA-fel"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "GPA-meddelande"
-
#: src/helpmenu.c:89
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA är GNU Privacy Assistant."
@@ -1308,7 +1319,7 @@ msgstr "Skapa nyckel"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Skapa nyckel"
@@ -1404,7 +1415,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Skapa _säkerhetskopia"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "_Vänta till senare"
@@ -1492,11 +1503,11 @@ msgid ""
"certificate."
msgstr "Användarnamn är namnet och ofta även e-postadressen för certifikatet."
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "Inga nycklar valda för signering."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1504,11 +1515,11 @@ msgstr ""
"Du har inte skapat en privat nyckel ännu. Vill du skapa en nu "
"(rekommenderas) eller vänta till senare?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "Generera nyckel _nu"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1516,143 +1527,153 @@ 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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "Skapa _säkerhetskopia nu"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
msgid "_Keys"
msgstr "_Nycklar"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
msgid "_Server"
msgstr "_Server"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr "Markera alla certifikat"
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr "Uppdatera nyckelringen"
-#: src/keymanager.c:923
+#: src/keymanager.c:950
msgid "_New key..."
msgstr "_Ny nyckel..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
msgid "Generate a new key"
msgstr "Generera en ny nyckel"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
msgid "_Delete keys"
msgstr "_Ta bort nycklar..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Ta bort vald nyckel"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
msgid "_Sign Keys..."
msgstr "_Signera nycklar..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Signera vald nyckel"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
msgid "Set _Owner Trust..."
msgstr "Ange _ägartillit..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
msgid "Set owner trust of the selected key"
msgstr "Ange ägartillit för vald nyckel"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
msgid "_Edit Private Key..."
msgstr "Redigera _privat nyckel..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Redigera markerad privat nyckel"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
msgid "_Import Keys..."
msgstr "_Importera nycklar..."
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Importera nycklar"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
msgid "E_xport Keys..."
msgstr "E_xportera nycklar..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Exportera nycklar"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
msgid "_Backup..."
msgstr "Säkerhetsk_opiera..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
msgid "Backup key"
msgstr "Säkerhetskopiera nyckel"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
msgid "_Retrieve Keys..."
msgstr "_Hämta nycklar..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr "Hämta nycklar från server"
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "uppdatera nyckelring"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Hämta nycklar från server"
+
+#: src/keymanager.c:977
msgid "_Send Keys..."
msgstr "_Skicka nycklar..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
msgid "Send keys to server"
msgstr "Skicka nycklar till server"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "Visa kortfattad nyckellista"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Visa nyckeldetaljer"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "Redigera"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
msgid "Delete"
msgstr "Ta bort"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "Signera"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "Exportera"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "Importera"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
msgid "Selected default key:"
msgstr "Vald standardnyckel:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr "Ingen standardnyckel har valts i inställningarna."
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "Filhanterare"
@@ -2034,52 +2055,52 @@ msgstr "_Automatiskt val"
msgid "Select a key"
msgstr "Välj en nyckel"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Inget fel"
# gpapa.c: Keyserver-Fehlermeldungen
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Internt fel"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "Åtgärden stöds inte"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "Felaktig version"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Internt nyckelserverfel"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Slut på minne"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Nyckeln hittades inte"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Nyckeln fanns redan på nyckelservern"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Ofullständig nyckel"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Kunde inte kontakta nyckelservern"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Okänt fel"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2088,7 +2109,7 @@ msgstr ""
"Ansluter till servern \"%s\".\n"
"Vänta."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2099,7 +2120,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2107,63 +2128,63 @@ msgstr ""
"Det finns ingen insticksmodul för nyckelserverprotokollet\n"
"du angav."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Nyckelservern du angav är inte giltig"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Lokal"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr "Lokal, Nyckelserver"
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
msgid "Local, PKA"
msgstr "Lokal, PKA"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr "Lokal, PKA, Nyckelserver"
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr "Lokal, Nyckelserver, PKA"
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
msgid "Local, kDNS"
msgstr "Lokal, kDNS"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr "Lokal, kDNS, Nyckelserver"
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr "PKA"
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr "kDNS"
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr "Anpassad"
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
msgid "<b>User interface</b>"
msgstr "<b>Användargränssnitt</b>"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
msgid "Use _advanced mode"
msgstr "Använd _avancerat läge"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr "Visa avancerade a_lternativ"
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2177,27 +2198,27 @@ msgstr ""
"\n"
"Överväg att skapa dig en egen nyckel och sedan välja den."
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr "Fortsätt utan en standardnyckel"
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
msgid "Let me select a default key"
msgstr "Låt mig välja en standardnyckel"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
msgid "<b>Default _key</b>"
msgstr "<b>Standardn_yckel</b>"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
msgid "<b>Default key_server</b>"
msgstr "<b>Standardnyckel_server</b>"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
msgid "<b>Auto key _locate</b>"
msgstr "<b>Automatisk sö_kning av nyckel</b>"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2227,27 +2248,27 @@ msgstr ""
" Anpassad\n"
" - Konfigurerad i bakändesdialogrutan.\n"
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr "Metod:"
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr "IP-adressen till namnservern som ska användas för kDNS-metoden."
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
msgid "kDNS Server:"
msgstr "kDNS-server:"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
msgid "The URL given for the keyserver is not valid."
msgstr "URL:en angiven för nyckelservern är inte giltig."
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr "Angivet data för \"Automatisk sökning av nyckel\" är inte giltig."
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Inställningar"
@@ -2286,7 +2307,7 @@ msgstr "Signatur: %s"
msgid "Signatures:"
msgstr "Signaturer:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "Filhanterare"
@@ -2335,36 +2356,36 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "_Urklipp"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Generera en ny nyckel"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Åtgärden stöds inte"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "_Automatiskt val"
-#: src/cardman.c:925
+#: src/cardman.c:937
#, fuzzy
msgid "Auto"
msgstr "Anpassad"
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2786,6 +2807,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "GPA-fel"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA-meddelande"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Urklipp"
@@ -3171,9 +3200,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detaljerat"
-#~ msgid "refresh keyring"
-#~ msgstr "uppdatera nyckelring"
-
#~ msgid "Sign files"
#~ msgstr "Signera filer"
diff --git a/po/tr.gmo b/po/tr.gmo
index 367bf98..cc9e5a5 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 9cb121d..eaa927e 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +42,14 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/_Dosya"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/D�_zen"
@@ -91,8 +91,8 @@ msgstr "Se
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
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:913
+#: src/clipboard.c:795 src/keymanager.c:940
#, fuzzy
msgid "Copy the selection"
msgstr "Se�ili dosyay� �ifrele"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr ""
@@ -128,16 +128,16 @@ msgstr "Se
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
#, fuzzy
msgid "Keyring"
msgstr "Anahtarl�k D�zenleyicisi"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "Dosyalar"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr ""
@@ -304,7 +304,7 @@ msgstr "Se
msgid "Decrypt the selected file"
msgstr "Se�ili dosyay� ��z"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -480,7 +480,7 @@ msgstr "Anahtar
msgid "Generating backup of key: 0x%s"
msgstr "%s anahtar�n�n yedeklemesi yap�l�yor"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "Anahtarlar panoya kopyaland�"
@@ -583,8 +583,8 @@ msgstr "Bu anahtar
msgid "Revoked Key"
msgstr "Feshedilmi� Anahtar"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "_Kapat"
@@ -635,31 +635,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "Anahtar Yarat�l�yor..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "Genel anahtarlar� dosyadan al"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "Hi�bir anahtar bulunamad�."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i genel anahtar okundu\n"
-"%i genel anahtar d��ar�dan al�nd�\n"
-"%i genel anahtar de�i�tirilmedi\n"
-"%i gizli anahtar okundu\n"
-"%i gizli anahtar d��ar�dan al�nd�\n"
-"%i gizli anahtar de�i�tirilmedi"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "Hi�bir anahtar bulunamad�."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -693,13 +683,20 @@ msgstr "Bu anahtar zaten kendiniz taraf
msgid "You haven't selected a default key to sign with!"
msgstr "�mzalamak i�in varsay�lan bir anahtar se�mediniz!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Hangi anahtar� d��ar�dan almak istiyorsunuz? (Anahtar, kimli�i ile "
+"belirtilmeli)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Hangi anahtar� d��ar�dan almak istiyorsunuz? (Anahtar, kimli�i ile "
"belirtilmeli)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "Anahtar _Kimli�i:"
@@ -1143,48 +1140,62 @@ msgstr "Anahtar sadece
msgid "This key is useless."
msgstr "Bu anahtar i�e yaramaz."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i genel anahtar okundu\n"
+"%i genel anahtar d��ar�dan al�nd�\n"
+"%i genel anahtar de�i�tirilmedi\n"
+"%i gizli anahtar okundu\n"
+"%i gizli anahtar d��ar�dan al�nd�\n"
+"%i gizli anahtar de�i�tirilmedi"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "GPA Hatas�"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "GPA Mesaj�"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1349,7 +1360,7 @@ msgstr "Anahtar yarat"
#: 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "Anahtar yarat"
@@ -1444,7 +1455,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "Yedek _kopya yarat"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "So_nra yap"
@@ -1526,11 +1537,11 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "�mzalamak i�in hi�bir anahtar se�ilmedi."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
msgid ""
"You do not have a private key yet. Do you want to generate one now "
"(recommended) or do it later?"
@@ -1538,11 +1549,11 @@ msgstr ""
"Hala bir �zel anahtara sahip de�ilsiniz. Bir tane yaratmak ister misiniz "
"(�nerilen) ya da daha sonra da yapabilirsiniz?"
-#: src/keymanager.c:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "Anahtar� �imdi _yarat"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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?"
@@ -1550,161 +1561,171 @@ 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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "Anahtar� �imdi ye_dekle"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/_Anahtarlar"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/_Sunucu"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/Anahtarlar/_Yeni Anahtar..."
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "Anahtar yarat"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/Anahtarlar� _Sil..."
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "Se�ili anahtar� kald�r"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/Anahtarlar� �m_zala..."
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "Se�ili anahtar� imzala"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/Sahibine _G�veni Belirle..."
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "Se�ili anahtar� kald�r"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/�zel Anahtar� _D�zenle..."
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "Se�ili �zel anahtar� d�zenle"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "Anahtarlar� D��ar�dan Al"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "Anahtarlar� D��ar�dan Al"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/Anahtarlar� _Yaz..."
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "Anahtarlar� D��ar� Yaz"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/_Yedekle..."
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "Anahtarlar� Yedekle"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/Sunucu/A_nahtarlar� Edin..."
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Anahtar� Kald�r"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/Anahtarlar� Sunucuya _G�nder..."
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/Anahtarlar� �m_zala..."
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "/Anahtarlar� Sunucuya _G�nder..."
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "�zet Anahtar Listesi G�ster"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "Anahtar Detaylar�n� G�ster"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "D�zenle"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
#, fuzzy
msgid "Delete"
msgstr "/D�zen/_T�m�n� Se�"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "�mzala"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "D��ar� Yaz"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "D��ar�dan Al"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
#, fuzzy
msgid "Selected default key:"
msgstr "Se�ili Varsay�lan Anahtar:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "dosya y�neticisi"
@@ -2083,51 +2104,51 @@ msgstr "Se
msgid "Select a key"
msgstr "Se�ili Varsay�lan Anahtar:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "Hata yok"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "Dahili hata"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "��lem desteklenmiyor"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "S�r�m tutmuyor"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "Dahili anahtar sunucusu hatas�"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "Haf�za yetersiz"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "Anahtar bulunamad�"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "Anahtar sunucuda zaten var"
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "Eksik anahtar"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "Anahtar sunucusuna ba�lan�lam�yor"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "Bilinmeyen Hata"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2136,7 +2157,7 @@ msgstr ""
"\"%s\" sunucusuna ba�lan�l�yor.\n"
"L�tfen bekleyin."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2147,7 +2168,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2155,67 +2176,67 @@ msgstr ""
"Belirtti�iniz anahtar sunucusu protokol� i�in\n"
"mevcut bir plugin bulunamad�."
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "Belitti�iniz anahtar sunucusu ge�ersiz"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "Yerel"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "Yerel"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "Yerel"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "U_zman modunu kullan:"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "U_zman modunu kullan:"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2224,31 +2245,31 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "Se�ili Varsay�lan Anahtar:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
#, fuzzy
msgid "<b>Default _key</b>"
msgstr "Varsay�lan _anahtar:"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
#, fuzzy
msgid "<b>Default key_server</b>"
msgstr "Varsay�lan anahtar _sunucusu: "
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "Varsay�lan anahtar _sunucusu: "
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2265,29 +2286,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/_Sunucu"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "Belitti�iniz anahtar sunucusu ge�ersiz"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "Ayarlar"
@@ -2327,7 +2348,7 @@ msgstr "
msgid "Signatures:"
msgstr "�mzalar:"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "dosya y�neticisi"
@@ -2375,35 +2396,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "/Pencereler/_Dosya Y�neticisi"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "Anahtar yarat"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "��lem desteklenmiyor"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "Se�ili dosyay� �ifrele"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2823,6 +2844,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Error"
+#~ msgstr "GPA Hatas�"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA Mesaj�"
+
+#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Gizlilik Asistan� - Dosya Y�neticisi"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 08dedfc..01f57cc 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 792d5ea..c98b0f1 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: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-09-01 09:40+0200\n"
+"POT-Creation-Date: 2014-11-21 09:49+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,14 +41,14 @@ msgstr ""
msgid "Clipboard"
msgstr ""
-#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:898
-#: src/cardman.c:636
+#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
+#: src/cardman.c:645
#, fuzzy
msgid "_File"
msgstr "/�ɮ�"
-#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:899
-#: src/cardman.c:637
+#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
+#: src/cardman.c:646
#, fuzzy
msgid "_Edit"
msgstr "/�s��"
@@ -90,8 +90,8 @@ msgstr "
msgid "Close the buffer"
msgstr ""
-#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:909
-#: src/cardman.c:642
+#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
+#: src/cardman.c:653
msgid "Quit the program"
msgstr ""
@@ -109,12 +109,12 @@ msgstr ""
msgid "Cut the selection"
msgstr "�[�K�w����ɮ�"
-#: src/clipboard.c:795 src/keymanager.c:913
+#: src/clipboard.c:795 src/keymanager.c:940
#, fuzzy
msgid "Copy the selection"
msgstr "�[�K�w����ɮ�"
-#: src/clipboard.c:797 src/keymanager.c:915
+#: src/clipboard.c:797 src/keymanager.c:942
msgid "Paste the clipboard"
msgstr ""
@@ -127,16 +127,16 @@ msgstr "
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:727
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
#, fuzzy
msgid "Keyring"
msgstr "�_��s�边"
-#: src/clipboard.c:917 src/keymanager.c:1102 src/cardman.c:729
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
msgid "Files"
msgstr "�ɮ�"
-#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1105
+#: src/clipboard.c:920 src/fileman.c:631 src/keymanager.c:1136
msgid "Card"
msgstr ""
@@ -303,7 +303,7 @@ msgstr "
msgid "Decrypt the selected file"
msgstr "�ѱK�w����ɮ�"
-#: src/fileman.c:528
+#: src/fileman.c:528 src/cardman.c:651
msgid "Close the window"
msgstr ""
@@ -479,7 +479,7 @@ msgstr "
msgid "Generating backup of key: 0x%s"
msgstr "���b�إ� %s ���ƥ�"
-#: src/gpaexportclipop.c:139
+#: src/gpaexportclipop.c:140
msgid "The keys have been copied to the clipboard."
msgstr "���_�w�ƨ��ŶKï��."
@@ -582,8 +582,8 @@ msgstr "
msgid "Revoked Key"
msgstr "�����K�_"
-#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/gtktools.c:61
-#: src/gtktools.c:102 src/keyeditdlg.c:150 src/verifydlg.c:115
+#: src/gpafileencryptop.c:525 src/gpafileencryptop.c:565 src/keyeditdlg.c:150
+#: src/verifydlg.c:115
msgid "_Close"
msgstr "���� (&C)"
@@ -635,31 +635,21 @@ msgstr ""
msgid "Generating Key..."
msgstr "�إ߷s�_..."
-#: src/gpaimportfileop.c:132
+#: src/gpaimportfileop.c:130
#, fuzzy
msgid "Import keys from file"
msgstr "���ɮפ��פJ���_"
-#: src/gpaimportop.c:200
-msgid "No keys were found."
-msgstr "�䤣��K�_."
-
-#: src/gpaimportop.c:208
+#: src/gpaimportserverop.c:156
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i ���_�QŪ��\n"
-"%i ���_�w�פJ\n"
-"%i ���_�S����\n"
-"%i �p�_�QŪ��\n"
-"%i �p�_�w�פJ\n"
-"%i �p�_�w�פJ"
+
+#: src/gpaimportserverop.c:172 src/gpgmetools.c:1259
+msgid "No keys were found."
+msgstr "�䤣��K�_."
#: src/gpakeyexpireop.c:244
msgid ""
@@ -693,11 +683,16 @@ msgstr "
msgid "You haven't selected a default key to sign with!"
msgstr "�S����ܹw�]ñ�p���K�_!"
-#: src/gparecvkeydlg.c:106
+#: src/gparecvkeydlg.c:107
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "��ܭn�פJ���K�_. (�Х������ѱK�_���Ǹ�)."
+
+#: src/gparecvkeydlg.c:108
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "��ܭn�פJ���K�_. (�Х������ѱK�_���Ǹ�)."
-#: src/gparecvkeydlg.c:116
+#: src/gparecvkeydlg.c:125
msgid "Key _ID:"
msgstr "�K�_�Ǹ�: (&I)"
@@ -1136,48 +1131,62 @@ msgstr "
msgid "This key is useless."
msgstr "�K�_�O���i�ϥΪ�."
-#: src/gpgmetools.c:1512
+#: src/gpgmetools.c:1249
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#: src/gpgmetools.c:1264
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i ���_�QŪ��\n"
+"%i ���_�w�פJ\n"
+"%i ���_�S����\n"
+"%i �p�_�QŪ��\n"
+"%i �p�_�w�פJ\n"
+"%i �p�_�w�פJ"
+
+#: src/gpgmetools.c:1579
msgid "A required engine component is not installed."
msgstr ""
-#: src/gpgmetools.c:1556
+#: src/gpgmetools.c:1623
msgid "Calling the crypto engine program failed."
msgstr ""
-#: src/gpgmetools.c:1627
+#: src/gpgmetools.c:1694
msgid "You must enter a name."
msgstr ""
-#: src/gpgmetools.c:1629
+#: src/gpgmetools.c:1696
msgid "Invalid character in name."
msgstr ""
-#: src/gpgmetools.c:1631
+#: src/gpgmetools.c:1698
msgid "Name may not start with a digit."
msgstr ""
-#: src/gpgmetools.c:1633
+#: src/gpgmetools.c:1700
msgid "Name is too short."
msgstr ""
-#: src/gpgmetools.c:1705
+#: src/gpgmetools.c:1772
msgid "Email address is not valid."
msgstr ""
-#: src/gpgmetools.c:1719
+#: src/gpgmetools.c:1786
msgid "Invalid character in comments."
msgstr ""
-#: src/gtktools.c:56
-#, fuzzy
-msgid "Error"
-msgstr "GPA ���~"
-
-#: src/gtktools.c:97
-#, fuzzy
-msgid "Message"
-msgstr "GPA �T��"
-
#: src/helpmenu.c:89
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
@@ -1338,7 +1347,7 @@ 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:647
+#: src/keygenwizard.c:450 src/cardman.c:658
msgid "Generate key"
msgstr "�إ߷s�_"
@@ -1432,7 +1441,7 @@ msgstr ""
msgid "Create _backup copy"
msgstr "�إ߳ƥ� (&b)"
-#: src/keygenwizard.c:248 src/keymanager.c:752 src/keymanager.c:778
+#: src/keygenwizard.c:248 src/keymanager.c:779 src/keymanager.c:805
msgid "Do it _later"
msgstr "����~�i�� (&l)"
@@ -1513,181 +1522,191 @@ msgid ""
"certificate."
msgstr ""
-#: src/keymanager.c:450
+#: src/keymanager.c:451
msgid "No keys selected for signing."
msgstr "�S����ܧ@ñ�p���K�_."
-#: src/keymanager.c:747
+#: src/keymanager.c:774
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:751
+#: src/keymanager.c:778
msgid "_Generate key now"
msgstr "�{�b�إ��_ (&G)"
-#: src/keymanager.c:772
+#: src/keymanager.c:799
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:777
+#: src/keymanager.c:804
msgid "_Backup key now"
msgstr "�{�b�i��ƥ� (&G)"
-#: src/keymanager.c:900
+#: src/keymanager.c:927
#, fuzzy
msgid "_Keys"
msgstr "/�_��"
-#: src/keymanager.c:902
+#: src/keymanager.c:929
#, fuzzy
msgid "_Server"
msgstr "/���A��"
-#: src/keymanager.c:917
+#: src/keymanager.c:944
msgid "Select all certificates"
msgstr ""
-#: src/keymanager.c:922
+#: src/keymanager.c:949
msgid "Refresh the keyring"
msgstr ""
-#: src/keymanager.c:923
+#: src/keymanager.c:950
#, fuzzy
msgid "_New key..."
msgstr "/�_��/�إ߷s�_... (&N)"
-#: src/keymanager.c:924
+#: src/keymanager.c:951
#, fuzzy
msgid "Generate a new key"
msgstr "�إ߷s�_"
-#: src/keymanager.c:925
+#: src/keymanager.c:952
#, fuzzy
msgid "_Delete keys"
msgstr "/�R���K�_... (&D)"
-#: src/keymanager.c:926
+#: src/keymanager.c:953
msgid "Remove the selected key"
msgstr "�����w��ܪ��K�_"
-#: src/keymanager.c:927
+#: src/keymanager.c:954
#, fuzzy
msgid "_Sign Keys..."
msgstr "/ñ�p���_... (&S)"
-#: src/keymanager.c:928
+#: src/keymanager.c:955
msgid "Sign the selected key"
msgstr "ñ�p�w��ܪ��K�_"
-#: src/keymanager.c:929
+#: src/keymanager.c:956
#, fuzzy
msgid "Set _Owner Trust..."
msgstr "/�]�w�H���... (&O)"
-#: src/keymanager.c:930
+#: src/keymanager.c:957
#, fuzzy
msgid "Set owner trust of the selected key"
msgstr "�����w��ܪ��K�_"
-#: src/keymanager.c:932
+#: src/keymanager.c:959
#, fuzzy
msgid "_Edit Private Key..."
msgstr "/�ק�p�_... (&E)"
-#: src/keymanager.c:933
+#: src/keymanager.c:960
msgid "Edit the selected private key"
msgstr "�ק�w��ܪ��K�_"
-#: src/keymanager.c:935
+#: src/keymanager.c:962
#, fuzzy
msgid "_Import Keys..."
msgstr "�פJ�K�_"
-#: src/keymanager.c:936
+#: src/keymanager.c:963
msgid "Import Keys"
msgstr "�פJ�K�_"
-#: src/keymanager.c:937
+#: src/keymanager.c:964
#, fuzzy
msgid "E_xport Keys..."
msgstr "/�ץX�_��... (&X)"
-#: src/keymanager.c:938
+#: src/keymanager.c:965
msgid "Export Keys"
msgstr "��X�K�_"
-#: src/keymanager.c:939
+#: src/keymanager.c:966
#, fuzzy
msgid "_Backup..."
msgstr "/�ƥ�... (&B)"
-#: src/keymanager.c:940
+#: src/keymanager.c:967
#, fuzzy
msgid "Backup key"
msgstr "�ƥ��K�_"
-#: src/keymanager.c:944
+#: src/keymanager.c:971
#, fuzzy
msgid "_Retrieve Keys..."
msgstr "/���A��/�U�����_... (&R)"
-#: src/keymanager.c:945
+#: src/keymanager.c:972
msgid "Retrieve keys from server"
msgstr ""
-#: src/keymanager.c:947
+#: src/keymanager.c:974
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "�����K�_"
+
+#: src/keymanager.c:975
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "�H�X���_����A��... (&N)"
+
+#: src/keymanager.c:977
#, fuzzy
msgid "_Send Keys..."
msgstr "/ñ�p���_... (&S)"
-#: src/keymanager.c:948
+#: src/keymanager.c:978
#, fuzzy
msgid "Send keys to server"
msgstr "�H�X���_����A��... (&N)"
-#: src/keymanager.c:955
+#: src/keymanager.c:985
msgid "Show Brief Keylist"
msgstr "��ܱK�_�M��K�n"
-#: src/keymanager.c:957
+#: src/keymanager.c:987
msgid "Show Key Details"
msgstr "��ܱK�_�Ա�"
-#: src/keymanager.c:1092
+#: src/keymanager.c:1123
msgid "Edit"
msgstr "�ק�"
-#: src/keymanager.c:1094
+#: src/keymanager.c:1125
#, fuzzy
msgid "Delete"
msgstr "/�s��/������� (&A)"
-#: src/keymanager.c:1096
+#: src/keymanager.c:1127
msgid "Sign"
msgstr "ñ�p"
-#: src/keymanager.c:1098
+#: src/keymanager.c:1129
msgid "Export"
msgstr "��X"
-#: src/keymanager.c:1100
+#: src/keymanager.c:1131
msgid "Import"
msgstr "�פJ"
-#: src/keymanager.c:1239
+#: src/keymanager.c:1273
#, fuzzy
msgid "Selected default key:"
msgstr "��ܹw�]�K�_:"
-#: src/keymanager.c:1249
+#: src/keymanager.c:1283
msgid "No default key selected in the preferences."
msgstr ""
-#: src/keymanager.c:1339 src/keymanager.c:1367
+#: src/keymanager.c:1373 src/keymanager.c:1401
#, fuzzy
msgid "Key Manager"
msgstr "�ɮz��"
@@ -2053,51 +2072,51 @@ msgstr "
msgid "Select a key"
msgstr "��ܹw�]�K�_:"
-#: src/server-access.c:294
+#: src/server-access.c:298
msgid "No error"
msgstr "�S�����~"
-#: src/server-access.c:297
+#: src/server-access.c:301
msgid "Internal error"
msgstr "�������~"
-#: src/server-access.c:300
+#: src/server-access.c:304
msgid "Operation not supported"
msgstr "�ާ@���䴩"
-#: src/server-access.c:303
+#: src/server-access.c:307
msgid "Version mismatch"
msgstr "��������"
-#: src/server-access.c:306
+#: src/server-access.c:310
msgid "Internal keyserver error"
msgstr "�������_���A�����~"
-#: src/server-access.c:309
+#: src/server-access.c:313
msgid "Out of memory"
msgstr "�O���餣��"
-#: src/server-access.c:312
+#: src/server-access.c:316
msgid "Key not found"
msgstr "�䤣�줽�_"
-#: src/server-access.c:315
+#: src/server-access.c:319
msgid "Key already exists on server"
msgstr "�w�g�H����A��."
-#: src/server-access.c:318
+#: src/server-access.c:322
msgid "Key incomplete"
msgstr "�_�藍����"
-#: src/server-access.c:321
+#: src/server-access.c:325
msgid "Could not contact keyserver"
msgstr "�䤣�줽�_���A��"
-#: src/server-access.c:324
+#: src/server-access.c:328
msgid "Unknown Error"
msgstr "���W�����~"
-#: src/server-access.c:360
+#: src/server-access.c:364
#, c-format
msgid ""
"Connecting to server \"%s\".\n"
@@ -2106,7 +2125,7 @@ msgstr ""
"���b�p�����A�� \"%s\" ��\n"
"���..."
-#: src/server-access.c:383 src/server-access.c:403
+#: src/server-access.c:387 src/server-access.c:407
#, c-format
msgid ""
"An error ocurred while contacting the server:\n"
@@ -2117,7 +2136,7 @@ msgstr ""
"\n"
"%s"
-#: src/server-access.c:469
+#: src/server-access.c:473
msgid ""
"There is no plugin available for the keyserver\n"
"protocol you specified."
@@ -2125,67 +2144,67 @@ msgstr ""
"�S���P���A���q�T��w�ϥΪ�\n"
"�~���Ҳ�"
-#: src/server-access.c:542 src/server-access.c:586
+#: src/server-access.c:546 src/server-access.c:590
msgid "The keyserver you specified is not valid"
msgstr "���A������T"
-#: src/settingsdlg.c:133 src/siglist.c:164
+#: src/settingsdlg.c:134 src/siglist.c:164
msgid "Local"
msgstr "���Ϫ�"
-#: src/settingsdlg.c:135
+#: src/settingsdlg.c:136
msgid "Local, Keyserver"
msgstr ""
-#: src/settingsdlg.c:137
+#: src/settingsdlg.c:138
#, fuzzy
msgid "Local, PKA"
msgstr "���Ϫ�"
-#: src/settingsdlg.c:139
+#: src/settingsdlg.c:140
msgid "Local, PKA, Keyserver"
msgstr ""
-#: src/settingsdlg.c:140
+#: src/settingsdlg.c:141
msgid "Local, Keyserver, PKA"
msgstr ""
-#: src/settingsdlg.c:142
+#: src/settingsdlg.c:143
#, fuzzy
msgid "Local, kDNS"
msgstr "���Ϫ�"
-#: src/settingsdlg.c:144
+#: src/settingsdlg.c:145
msgid "Local, kDNS, Keyserver"
msgstr ""
-#: src/settingsdlg.c:146
+#: src/settingsdlg.c:147
msgid "PKA"
msgstr ""
-#: src/settingsdlg.c:147
+#: src/settingsdlg.c:148
msgid "kDNS"
msgstr ""
-#: src/settingsdlg.c:148
+#: src/settingsdlg.c:149
msgid "Custom"
msgstr ""
-#: src/settingsdlg.c:218
+#: src/settingsdlg.c:221
#, fuzzy
msgid "<b>User interface</b>"
msgstr "�ϥζi���Ҧ� (&A):"
-#: src/settingsdlg.c:225
+#: src/settingsdlg.c:228
#, fuzzy
msgid "Use _advanced mode"
msgstr "�ϥζi���Ҧ� (&A):"
-#: src/settingsdlg.c:231
+#: src/settingsdlg.c:234
msgid "Show advanced _options"
msgstr ""
-#: src/settingsdlg.c:282
+#: src/settingsdlg.c:285
msgid ""
"No default key has been selected. This may lead to problems when signing or "
"encrypting. For example you might later not be able to read a mail written "
@@ -2194,31 +2213,31 @@ msgid ""
"Please consider creating your own key and select it then."
msgstr ""
-#: src/settingsdlg.c:288
+#: src/settingsdlg.c:291
msgid "Continue without a default key"
msgstr ""
-#: src/settingsdlg.c:290
+#: src/settingsdlg.c:293
#, fuzzy
msgid "Let me select a default key"
msgstr "��ܹw�]�K�_:"
-#: src/settingsdlg.c:315
+#: src/settingsdlg.c:318
#, fuzzy
msgid "<b>Default _key</b>"
msgstr "�w�]�K�_ (&K):"
-#: src/settingsdlg.c:423
+#: src/settingsdlg.c:432
#, fuzzy
msgid "<b>Default key_server</b>"
msgstr "�w�]���_���A�� :"
-#: src/settingsdlg.c:621
+#: src/settingsdlg.c:630
#, fuzzy
msgid "<b>Auto key _locate</b>"
msgstr "�w�]���_���A�� :"
-#: src/settingsdlg.c:631
+#: src/settingsdlg.c:640
msgid ""
"The list of methods to locate keys via an email address.\n"
"All given methods are used in turn until a matching key is found. The "
@@ -2235,29 +2254,29 @@ msgid ""
" - Configured in the backend dialog.\n"
msgstr ""
-#: src/settingsdlg.c:648
+#: src/settingsdlg.c:657
msgid "Method:"
msgstr ""
-#: src/settingsdlg.c:665
+#: src/settingsdlg.c:674
msgid "The IP address of the nameserver used for the kDNS method."
msgstr ""
-#: src/settingsdlg.c:667
+#: src/settingsdlg.c:676
#, fuzzy
msgid "kDNS Server:"
msgstr "/���A��"
-#: src/settingsdlg.c:764
+#: src/settingsdlg.c:779
#, fuzzy
msgid "The URL given for the keyserver is not valid."
msgstr "���A������T"
-#: src/settingsdlg.c:774
+#: src/settingsdlg.c:790
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:912
+#: src/settingsdlg.c:928
msgid "Settings"
msgstr "�]�w"
@@ -2297,7 +2316,7 @@ msgstr "ñ
msgid "Signatures:"
msgstr "ñ�p"
-#: src/cardman.c:167 src/cardman.c:913
+#: src/cardman.c:167 src/cardman.c:925
#, fuzzy
msgid "Card Manager"
msgstr "�ɮz��"
@@ -2345,35 +2364,35 @@ msgstr ""
msgid "No card"
msgstr ""
-#: src/cardman.c:638
+#: src/cardman.c:647
#, fuzzy
msgid "_Card"
msgstr "/����/�ɮz (&F)"
-#: src/cardman.c:646
+#: src/cardman.c:657
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:648
+#: src/cardman.c:659
#, fuzzy
msgid "Generate new key on card"
msgstr "�إ߷s�_"
-#: src/cardman.c:777
+#: src/cardman.c:789
#, fuzzy
msgid "This card application is not yet supported."
msgstr "�ާ@���䴩"
-#: src/cardman.c:921
+#: src/cardman.c:933
#, fuzzy
msgid "Application selection:"
msgstr "�[�K�w����ɮ�"
-#: src/cardman.c:925
+#: src/cardman.c:937
msgid "Auto"
msgstr ""
-#: src/cardman.c:1002
+#: src/cardman.c:1014
msgid "The GPGME library is too old to support smartcards."
msgstr ""
@@ -2793,6 +2812,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Error"
+#~ msgstr "GPA ���~"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA �T��"
+
+#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - �ɮz"
diff --git a/src/Makefile.am b/src/Makefile.am
index d961144..6a2ab71 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,7 @@ if ENABLE_KEYSERVER_SUPPORT
keyserver_support_sources = \
server-access.c \
gpaimportserverop.c \
+ gpaimportbykeyidop.c \
gpaexportserverop.c
else
keyserver_support_sources =
@@ -154,6 +155,7 @@ gpa_SOURCES = \
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 \
@@ -168,6 +170,7 @@ gpa_SOURCES = \
gpaimportfileop.h gpaimportfileop.c \
gpaimportclipop.h gpaimportclipop.c \
gpaimportserverop.h \
+ gpaimportbykeyidop.h \
gpagenkeyop.h gpagenkeyop.c \
gpagenkeyadvop.h gpagenkeyadvop.c \
gpagenkeysimpleop.h gpagenkeysimpleop.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 0bb6061..b422a34 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -119,41 +119,44 @@ am__gpa_SOURCES_DIST = get-path.h get-path.c gpa.c gpa.h i18n.h \
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 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 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 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
+ 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) \
+ at ENABLE_KEYSERVER_SUPPORT_TRUE@ gpaimportbykeyidop.$(OBJEXT) \
@ENABLE_KEYSERVER_SUPPORT_TRUE@ gpaexportserverop.$(OBJEXT)
@HAVE_W32_SYSTEM_TRUE at am__objects_2 = w32reg.$(OBJEXT) \
@HAVE_W32_SYSTEM_TRUE@ w32-afunix.$(OBJEXT)
@@ -186,22 +189,22 @@ am_gpa_OBJECTS = get-path.$(OBJEXT) gpa.$(OBJEXT) \
gpastreamdecryptop.$(OBJEXT) gpafileop.$(OBJEXT) \
gpafiledecryptop.$(OBJEXT) gpafileencryptop.$(OBJEXT) \
gpafilesignop.$(OBJEXT) gpafileverifyop.$(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)
+ 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 \
@@ -449,6 +452,7 @@ gpa_DEPENDENCIES = $(gpa_deps)
@ENABLE_KEYSERVER_SUPPORT_TRUE at keyserver_support_sources = \
@ENABLE_KEYSERVER_SUPPORT_TRUE@ server-access.c \
@ENABLE_KEYSERVER_SUPPORT_TRUE@ gpaimportserverop.c \
+ at ENABLE_KEYSERVER_SUPPORT_TRUE@ gpaimportbykeyidop.c \
@ENABLE_KEYSERVER_SUPPORT_TRUE@ gpaexportserverop.c
gpa_SOURCES = \
@@ -504,6 +508,7 @@ gpa_SOURCES = \
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 \
@@ -518,6 +523,7 @@ gpa_SOURCES = \
gpaimportfileop.h gpaimportfileop.c \
gpaimportclipop.h gpaimportclipop.c \
gpaimportserverop.h \
+ gpaimportbykeyidop.h \
gpagenkeyop.h gpagenkeyop.c \
gpagenkeyadvop.h gpagenkeyadvop.c \
gpagenkeysimpleop.h gpagenkeysimpleop.c \
@@ -671,6 +677,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpaexportserverop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpafiledecryptop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpafileencryptop.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpafileimportop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpafileop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpafilesignop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpafileverifyop.Po at am__quote@
@@ -678,6 +685,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpagenkeycardop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpagenkeyop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpagenkeysimpleop.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpaimportbykeyidop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpaimportclipop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpaimportfileop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpaimportop.Po at am__quote@
diff --git a/src/cardman.c b/src/cardman.c
index c752442..844a44a 100644
--- a/src/cardman.c
+++ b/src/cardman.c
@@ -624,6 +624,15 @@ watcher_cb (void *opaque, const char *filename, const char *reason)
}
+/* Handle menu item "File/Close". */
+static void
+file_close (GtkAction *action, gpointer param)
+{
+ GpaCardManager *cardman = param;
+ gtk_widget_destroy (GTK_WIDGET (cardman));
+}
+
+
/* Construct the card manager menu and toolbar widgets and return
them. */
static void
@@ -638,6 +647,8 @@ cardman_action_new (GpaCardManager *cardman, GtkWidget **menubar,
{ "Card", NULL, N_("_Card"), NULL },
/* File menu. */
+ { "FileClose", GTK_STOCK_CLOSE, NULL, NULL,
+ N_("Close the window"), G_CALLBACK (file_close) },
{ "FileQuit", GTK_STOCK_QUIT, NULL, NULL,
N_("Quit the program"), G_CALLBACK (gtk_main_quit) },
@@ -652,6 +663,7 @@ cardman_action_new (GpaCardManager *cardman, GtkWidget **menubar,
"<ui>"
" <menubar name='MainMenu'>"
" <menu action='File'>"
+ " <menuitem action='FileClose'/>"
" <menuitem action='FileQuit'/>"
" </menu>"
" <menu action='Edit'>"
diff --git a/src/gpaexportclipop.c b/src/gpaexportclipop.c
index 62edb12..1e4c306 100644
--- a/src/gpaexportclipop.c
+++ b/src/gpaexportclipop.c
@@ -136,8 +136,8 @@ gpa_export_clipboard_operation_complete_export (GpaExportOperation *operation)
GpaExportClipboardOperation *op = GPA_EXPORT_CLIPBOARD_OPERATION (operation);
if (!dump_data_to_clipboard (operation->dest, gtk_clipboard_get
(GDK_SELECTION_CLIPBOARD)))
- gpa_window_message (_("The keys have been copied to the clipboard."),
- GPA_OPERATION (op)->window);
+ gpa_show_info(GPA_OPERATION (op)->window,
+ _("The keys have been copied to the clipboard."));
}
/* API */
diff --git a/src/gpafileimportop.c b/src/gpafileimportop.c
new file mode 100644
index 0000000..4cc0dc1
--- /dev/null
+++ b/src/gpafileimportop.c
@@ -0,0 +1,311 @@
+/* gpafileimportop.c - Import keys from a file.
+ Copyright (C) 2003 Miguel Coca.
+ Copyright (C) 2008, 2014 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/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
+
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#else
+#include <io.h>
+#endif
+
+#include "gpa.h"
+#include "gtktools.h"
+#include "gpgmetools.h"
+#include "filetype.h"
+#include "gpafileimportop.h"
+
+
+/* Internal functions */
+static gboolean gpa_file_import_operation_idle_cb (gpointer data);
+static void gpa_file_import_operation_done_error_cb (GpaContext *context,
+ gpg_error_t err,
+ GpaFileImportOperation *op);
+static void gpa_file_import_operation_done_cb (GpaContext *context,
+ gpg_error_t err,
+ GpaFileImportOperation *op);
+
+/* GObject */
+
+static GObjectClass *parent_class = NULL;
+
+static void
+gpa_file_import_operation_finalize (GObject *object)
+{
+ /* GpaFileImportOperation *op = GPA_FILE_IMPORT_OPERATION (object); */
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static void
+gpa_file_import_operation_init (GpaFileImportOperation *op)
+{
+ memset (&op->counters, 0, sizeof op->counters);
+}
+
+
+static GObject*
+gpa_file_import_operation_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
+{
+ GObject *object;
+ GpaFileImportOperation *op;
+
+ /* Invoke parent's constructor */
+ object = parent_class->constructor (type,
+ n_construct_properties,
+ construct_properties);
+ op = GPA_FILE_IMPORT_OPERATION (object);
+ /* Initialize */
+ /* Start with the first file after going back into the main loop */
+ g_idle_add (gpa_file_import_operation_idle_cb, op);
+ /* Connect to the "done" signal */
+ g_signal_connect (G_OBJECT (GPA_OPERATION (op)->context), "done",
+ G_CALLBACK (gpa_file_import_operation_done_error_cb), op);
+ g_signal_connect (G_OBJECT (GPA_OPERATION (op)->context), "done",
+ G_CALLBACK (gpa_file_import_operation_done_cb), op);
+ /* Give a title to the progress dialog */
+ gtk_window_set_title (GTK_WINDOW (GPA_FILE_OPERATION (op)->progress_dialog),
+ _("Importing..."));
+
+ return object;
+}
+
+
+static void
+gpa_file_import_operation_class_init (GpaFileImportOperationClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->constructor = gpa_file_import_operation_constructor;
+ object_class->finalize = gpa_file_import_operation_finalize;
+}
+
+
+GType
+gpa_file_import_operation_get_type (void)
+{
+ static GType file_import_operation_type = 0;
+
+ if (!file_import_operation_type)
+ {
+ static const GTypeInfo file_import_operation_info =
+ {
+ sizeof (GpaFileImportOperationClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gpa_file_import_operation_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GpaFileImportOperation),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gpa_file_import_operation_init
+ };
+
+ file_import_operation_type = g_type_register_static
+ (GPA_FILE_OPERATION_TYPE, "GpaFileImportOperation",
+ &file_import_operation_info, 0);
+ }
+
+ return file_import_operation_type;
+}
+
+
+/* API */
+
+
+GpaFileImportOperation*
+gpa_file_import_operation_new (GtkWidget *window, GList *files)
+{
+ GpaFileImportOperation *op;
+
+ op = g_object_new (GPA_FILE_IMPORT_OPERATION_TYPE,
+ "window", window,
+ "input_files", files,
+ NULL);
+
+ return op;
+}
+
+
+/* Internal */
+
+
+static gboolean
+proc_one_file (GpaFileImportOperation *op, gpa_file_item_t file_item)
+{
+ gpg_error_t err;
+ int fd;
+ gpgme_data_t data;
+
+ if (file_item->direct_in)
+ {
+ /* No copy is made. */
+ err = gpgme_data_new_from_mem (&data, file_item->direct_in,
+ file_item->direct_in_len, 0);
+ if (err)
+ {
+ gpa_gpgme_warning (err);
+ return FALSE;
+ }
+
+ gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
+ is_cms_data (file_item->direct_in,
+ file_item->direct_in_len) ?
+ GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
+ }
+ else
+ {
+ const char *filename = file_item->filename_in;
+
+ fd = gpa_open_input (filename, &data, GPA_OPERATION (op)->window);
+ if (fd == -1)
+ return FALSE;
+
+ gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
+ is_cms_file (filename) ?
+ GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
+ }
+
+
+ /* Start importing one file. */
+ err = gpgme_op_import_start (GPA_OPERATION (op)->context->ctx, data);
+ if (err)
+ {
+ gpa_gpgme_warning (err);
+ return FALSE;
+ }
+
+ /* Show and update the progress dialog */
+ gtk_widget_show_all (GPA_FILE_OPERATION (op)->progress_dialog);
+ gpa_progress_dialog_set_label (GPA_PROGRESS_DIALOG
+ (GPA_FILE_OPERATION (op)->progress_dialog),
+ file_item->direct_name
+ ? file_item->direct_name
+ : file_item->filename_in);
+
+ return TRUE;
+}
+
+
+static void
+gpa_file_import_operation_next (GpaFileImportOperation *op)
+{
+ if (!GPA_FILE_OPERATION (op)->current
+ || !proc_one_file (op, GPA_FILE_OPERATION (op)->current->data))
+ {
+ /* Finished all files. */
+ gtk_widget_hide (GPA_FILE_OPERATION (op)->progress_dialog);
+ if (op->counters.imported > 0)
+ {
+ if (op->counters.secret_imported)
+ g_signal_emit_by_name (GPA_OPERATION (op), "imported_secret_keys");
+ else
+ g_signal_emit_by_name (GPA_OPERATION (op), "imported_keys");
+ }
+ gpa_gpgme_show_import_results (GPA_OPERATION (op)->window, &op->counters);
+ }
+}
+
+
+static gboolean
+gpa_file_import_operation_idle_cb (gpointer data)
+{
+ GpaFileImportOperation *op = data;
+
+ gpa_file_import_operation_next (op);
+
+ return FALSE;
+}
+
+
+static void
+gpa_file_import_operation_done_cb (GpaContext *context,
+ gpg_error_t err,
+ GpaFileImportOperation *op)
+{
+ if (err)
+ {
+ gpa_gpgme_update_import_results (&op->counters, 1, 1, NULL);
+ }
+ else
+ {
+ gpgme_import_result_t res;
+
+ res = gpgme_op_import_result (GPA_OPERATION (op)->context->ctx);
+ gpa_gpgme_update_import_results (&op->counters, 1, 0, res);
+
+ }
+
+ if (gpg_err_code (err) != GPG_ERR_CANCELED)
+ {
+ /* Go to the next file in the list and import it. */
+ GPA_FILE_OPERATION (op)->current = (g_list_next
+ (GPA_FILE_OPERATION (op)->current));
+ gpa_file_import_operation_next (op);
+ }
+}
+
+
+static void
+gpa_file_import_operation_done_error_cb (GpaContext *context, gpg_error_t err,
+ GpaFileImportOperation *op)
+{
+ gpa_file_item_t file_item = GPA_FILE_OPERATION (op)->current->data;
+
+ /* FIXME: Add the errors to a list and show a dialog with all import
+ errors, similar to the verify status. */
+ switch (gpg_err_code (err))
+ {
+ case GPG_ERR_NO_ERROR:
+ case GPG_ERR_CANCELED:
+ /* Ignore these */
+ break;
+
+ case GPG_ERR_NO_DATA:
+ gpa_show_warning (GPA_OPERATION (op)->window,
+ file_item->direct_name
+ ? _("\"%s\" contained no OpenPGP data.")
+ : _("The file \"%s\" contained no OpenPGP"
+ "data."),
+ file_item->direct_name
+ ? file_item->direct_name
+ : file_item->filename_in);
+ break;
+
+ default:
+ gpa_show_warning (GPA_OPERATION (op)->window,
+ _("Error importing \"%s\": %s <%s>"),
+ file_item->direct_name
+ ? file_item->direct_name
+ : file_item->filename_in,
+ gpg_strerror (err), gpg_strsource (err));
+ break;
+ }
+}
diff --git a/src/gpafileimportop.h b/src/gpafileimportop.h
new file mode 100644
index 0000000..8da190c
--- /dev/null
+++ b/src/gpafileimportop.h
@@ -0,0 +1,77 @@
+/* gpafileimportop.h - The GpaFileImportOperation object.
+ * Copyright (C) 2003 Miguel Coca.
+ * Copyright (C) 2014 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef GPA_FILE_IMPORT_OP_H
+#define GPA_FILE_IMPORT_OP_H
+
+#include <glib.h>
+#include <glib-object.h>
+#include "gpgmetools.h"
+#include "gpafileop.h"
+
+
+/* GObject stuff */
+#define GPA_FILE_IMPORT_OPERATION_TYPE (gpa_file_import_operation_get_type ())
+
+#define GPA_FILE_IMPORT_OPERATION(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPA_FILE_IMPORT_OPERATION_TYPE, \
+ GpaFileImportOperation))
+
+#define GPA_FILE_IMPORT_OPERATION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GPA_FILE_IMPORT_OPERATION_TYPE, \
+ GpaFileImportOperationClass))
+
+#define GPA_IS_FILE_IMPORT_OPERATION(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GPA_FILE_IMPORT_OPERATION_TYPE))
+
+#define GPA_IS_FILE_IMPORT_OPERATION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GPA_FILE_IMPORT_OPERATION_TYPE))
+
+#define GPA_FILE_IMPORT_OPERATION_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GPA_FILE_IMPORT_OPERATION_TYPE, \
+ GpaFileImportOperationClass))
+
+typedef struct _GpaFileImportOperation GpaFileImportOperation;
+typedef struct _GpaFileImportOperationClass GpaFileImportOperationClass;
+
+struct _GpaFileImportOperation
+{
+ GpaFileOperation parent;
+
+ struct gpa_import_result_s counters;
+};
+
+
+struct _GpaFileImportOperationClass
+{
+ GpaFileOperationClass parent_class;
+};
+
+
+GType gpa_file_import_operation_get_type (void) G_GNUC_CONST;
+
+/* API */
+
+/* Creates a new import operation. */
+GpaFileImportOperation *
+gpa_file_import_operation_new (GtkWidget *window, GList *files);
+
+#endif
diff --git a/src/gpaimportbykeyidop.c b/src/gpaimportbykeyidop.c
new file mode 100644
index 0000000..8e5d5ce
--- /dev/null
+++ b/src/gpaimportbykeyidop.c
@@ -0,0 +1,189 @@
+/* gpaimportbykeyidop.c - The GpaImportByKeyidOperation object.
+ * Copyright (C) 2014 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/>.
+ */
+
+#include <config.h>
+
+#include <gpgme.h>
+#include <unistd.h>
+#include "gpa.h"
+#include "i18n.h"
+#include "gtktools.h"
+#include "gpaimportbykeyidop.h"
+#include "server-access.h"
+
+
+static GObjectClass *parent_class = NULL;
+
+static gboolean
+gpa_import_bykeyid_operation_get_source (GpaImportOperation *operation);
+static void
+gpa_import_bykeyid_operation_complete_import (GpaImportOperation *operation);
+
+/* GObject boilerplate */
+
+static void
+gpa_import_bykeyid_operation_finalize (GObject *object)
+{
+ GpaImportByKeyidOperation *op = GPA_IMPORT_BYKEYID_OPERATION (object);
+
+ gpgme_key_unref (op->key);
+ op->key = NULL;
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static void
+gpa_import_bykeyid_operation_init (GpaImportByKeyidOperation *op)
+{
+ op->key = NULL;
+}
+
+
+static GObject*
+gpa_import_bykeyid_operation_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
+{
+ GObject *object;
+ /* GpaImportByKeyidOperation *op; */
+
+ /* Invoke parent's constructor */
+ object = parent_class->constructor (type,
+ n_construct_properties,
+ construct_properties);
+ /* op = GPA_IMPORT_BYKEYID_OPERATION (object); */
+
+ return object;
+}
+
+
+static void
+gpa_import_bykeyid_operation_class_init (GpaImportByKeyidOperationClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GpaImportOperationClass *import_class = GPA_IMPORT_OPERATION_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->constructor = gpa_import_bykeyid_operation_constructor;
+ object_class->finalize = gpa_import_bykeyid_operation_finalize;
+
+ import_class->get_source = gpa_import_bykeyid_operation_get_source;
+ import_class->complete_import = gpa_import_bykeyid_operation_complete_import;
+}
+
+
+GType
+gpa_import_bykeyid_operation_get_type (void)
+{
+ static GType type = 0;
+
+ if (!type)
+ {
+ static const GTypeInfo info =
+ {
+ sizeof (GpaImportByKeyidOperationClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gpa_import_bykeyid_operation_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GpaImportByKeyidOperation),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gpa_import_bykeyid_operation_init,
+ };
+
+ type = g_type_register_static (GPA_IMPORT_OPERATION_TYPE,
+ "GpaImportByKeyidOperation",
+ &info, 0);
+ }
+
+ return type;
+}
+
+
+/* Virtual methods */
+
+static gboolean
+gpa_import_bykeyid_operation_get_source (GpaImportOperation *operation)
+{
+ GpaImportByKeyidOperation *op = GPA_IMPORT_BYKEYID_OPERATION (operation);
+ int i;
+
+ /* Better reset the source variables. */
+ gpgme_data_release (operation->source);
+ operation->source = NULL;
+ if (operation->source2)
+ {
+ for (i=0; operation->source2[i]; i++)
+ gpgme_key_unref (operation->source2[i]);
+ g_free (operation->source2);
+ operation->source2 = NULL;
+ }
+
+ if (!op->key
+ || op->key->protocol != GPGME_PROTOCOL_OpenPGP
+ || !op->key->subkeys
+ || !op->key->subkeys->keyid
+ || !*op->key->subkeys->keyid)
+ ;
+ else if (is_gpg_version_at_least ("2.1.0"))
+ {
+ operation->source2 = g_malloc0_n (1 + 1, sizeof *operation->source2);
+ gpgme_key_ref (op->key);
+ operation->source2[0] = op->key;
+ return TRUE;
+ }
+ else
+ {
+
+ if (server_get_key (gpa_options_get_default_keyserver
+ (gpa_options_get_instance ()),
+ op->key->subkeys->keyid,
+ &operation->source, GPA_OPERATION (op)->window))
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+
+static void
+gpa_import_bykeyid_operation_complete_import (GpaImportOperation *operation)
+{
+ (void)operation;
+}
+
+
+/* API */
+
+GpaImportByKeyidOperation*
+gpa_import_bykeyid_operation_new (GtkWidget *window, gpgme_key_t key)
+{
+ GpaImportByKeyidOperation *op;
+
+ op = g_object_new (GPA_IMPORT_BYKEYID_OPERATION_TYPE,
+ "window", window, NULL);
+ gpgme_key_ref (key);
+ op->key = key;
+
+ return op;
+}
diff --git a/src/gpaimportbykeyidop.h b/src/gpaimportbykeyidop.h
new file mode 100644
index 0000000..4fdc7e7
--- /dev/null
+++ b/src/gpaimportbykeyidop.h
@@ -0,0 +1,77 @@
+/* gpaimportbykeyidop.h - The GpaImportByKeyidOperation object.
+ * Copyright (C) 2014 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_IMPORT_BYKEYID_OP_H
+#define GPA_IMPORT_BYKEYID_OP_H
+#ifdef ENABLE_KEYSERVER_SUPPORT
+
+#include "gpa.h"
+#include <glib.h>
+#include <glib-object.h>
+#include "gpaimportop.h"
+
+/* GObject stuff */
+#define GPA_IMPORT_BYKEYID_OPERATION_TYPE \
+ (gpa_import_bykeyid_operation_get_type ())
+
+#define GPA_IMPORT_BYKEYID_OPERATION(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPA_IMPORT_BYKEYID_OPERATION_TYPE,\
+ GpaImportByKeyidOperation))
+
+#define GPA_IMPORT_BYKEYID_OPERATION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GPA_IMPORT_BYKEYID_OPERATION_TYPE, \
+ GpaImportByKeyidOperationClass))
+
+#define GPA_IS_IMPORT_BYKEYID_OPERATION(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GPA_IMPORT_BYKEYID_OPERATION_TYPE))
+
+#define GPA_IS_IMPORT_BYKEYID_OPERATION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GPA_IMPORT_BYKEYID_OPERATION_TYPE))
+
+#define GPA_IMPORT_BYKEYID_OPERATION_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GPA_IMPORT_BYKEYID_OPERATION_TYPE, \
+ GpaImportByKeyidOperationClass))
+
+typedef struct _GpaImportByKeyidOperation GpaImportByKeyidOperation;
+typedef struct _GpaImportByKeyidOperationClass GpaImportByKeyidOperationClass;
+
+struct _GpaImportByKeyidOperation
+{
+ GpaImportOperation parent;
+
+ gpgme_key_t key;
+};
+
+
+struct _GpaImportByKeyidOperationClass
+{
+ GpaImportOperationClass parent_class;
+};
+
+
+GType gpa_import_bykeyid_operation_get_type (void) G_GNUC_CONST;
+
+/* API */
+
+/* Creates a new import by keyid operation. */
+GpaImportByKeyidOperation *
+gpa_import_bykeyid_operation_new (GtkWidget *window, gpgme_key_t key);
+
+#endif /*ENABLE_KEYSERVER_SUPPORT*/
+#endif /*GPA_IMPORT_BYKEYID_OP_H*/
diff --git a/src/gpaimportclipop.c b/src/gpaimportclipop.c
index 2e1eb59..7162982 100644
--- a/src/gpaimportclipop.c
+++ b/src/gpaimportclipop.c
@@ -30,9 +30,8 @@
static GObjectClass *parent_class = NULL;
static gboolean
-gpa_import_clipboard_operation_get_source (GpaImportOperation *operation,
- gpgme_data_t *source);
-static void
+gpa_import_clipboard_operation_get_source (GpaImportOperation *operation);
+static void
gpa_import_clipboard_operation_complete_import (GpaImportOperation *operation);
/* GObject boilerplate */
@@ -50,14 +49,14 @@ gpa_import_clipboard_operation_class_init (GpaImportClipboardOperationClass *kla
parent_class = g_type_class_peek_parent (klass);
import_class->get_source = gpa_import_clipboard_operation_get_source;
- import_class->complete_import = gpa_import_clipboard_operation_complete_import;
+ import_class->complete_import = gpa_import_clipboard_operation_complete_import;
}
GType
gpa_import_clipboard_operation_get_type (void)
{
static GType clipboard_operation_type = 0;
-
+
if (!clipboard_operation_type)
{
static const GTypeInfo clipboard_operation_info =
@@ -72,36 +71,38 @@ gpa_import_clipboard_operation_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_import_clipboard_operation_init,
};
-
+
clipboard_operation_type = g_type_register_static (GPA_IMPORT_OPERATION_TYPE,
"GpaImportClipboardOperation",
&clipboard_operation_info, 0);
}
-
+
return clipboard_operation_type;
}
/* Virtual methods */
static gboolean
-gpa_import_clipboard_operation_get_source (GpaImportOperation *operation,
- gpgme_data_t *source)
+gpa_import_clipboard_operation_get_source (GpaImportOperation *operation)
{
gpg_error_t err;
- gchar *text = gtk_clipboard_wait_for_text (gtk_clipboard_get
- (GDK_SELECTION_CLIPBOARD));
-
+ gchar *text;
+
+ text = gtk_clipboard_wait_for_text (gtk_clipboard_get
+ (GDK_SELECTION_CLIPBOARD));
+ gpgme_data_release (operation->source);
if (text)
{
/* Fill the data from the selection clipboard.
*/
- err = gpgme_data_new_from_mem (source, text, strlen (text), FALSE);
+ err = gpgme_data_new_from_mem (&operation->source,
+ text, strlen (text), TRUE);
}
else
{
- /* If the keyboard was empty, create an empty data
+ /* If the keyboard was empty, create an empty data object.
*/
- err = gpgme_data_new (source);
+ err = gpgme_data_new (&operation->source);
}
if (err)
@@ -112,7 +113,7 @@ gpa_import_clipboard_operation_get_source (GpaImportOperation *operation,
return TRUE;
}
-static void
+static void
gpa_import_clipboard_operation_complete_import (GpaImportOperation *operation)
{
/* Nothing special to do */
@@ -124,7 +125,7 @@ GpaImportClipboardOperation*
gpa_import_clipboard_operation_new (GtkWidget *window)
{
GpaImportClipboardOperation *op;
-
+
op = g_object_new (GPA_IMPORT_CLIPBOARD_OPERATION_TYPE,
"window", window, NULL);
diff --git a/src/gpaimportfileop.c b/src/gpaimportfileop.c
index 71cb02b..81d7995 100644
--- a/src/gpaimportfileop.c
+++ b/src/gpaimportfileop.c
@@ -31,8 +31,7 @@
static GObjectClass *parent_class = NULL;
static gboolean
-gpa_import_file_operation_get_source (GpaImportOperation *operation,
- gpgme_data_t *source);
+gpa_import_file_operation_get_source (GpaImportOperation *operation);
static void
gpa_import_file_operation_complete_import (GpaImportOperation *operation);
@@ -121,8 +120,7 @@ gpa_import_file_operation_get_type (void)
/* Virtual methods */
static gboolean
-gpa_import_file_operation_get_source (GpaImportOperation *operation,
- gpgme_data_t *source)
+gpa_import_file_operation_get_source (GpaImportOperation *operation)
{
GpaImportFileOperation *op = GPA_IMPORT_FILE_OPERATION (operation);
GtkWidget *dialog;
@@ -134,6 +132,9 @@ gpa_import_file_operation_get_source (GpaImportOperation *operation,
GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+ gpgme_data_release (operation->source);
+ operation->source = NULL;
+
/* Run the dialog until there is a valid response. */
do
{
@@ -145,8 +146,9 @@ gpa_import_file_operation_get_source (GpaImportOperation *operation,
(GTK_FILE_CHOOSER (dialog)));
}
while (response == GTK_RESPONSE_OK
- && (op->fd = gpa_open_input
- (op->file, source, GPA_OPERATION (op)->window)) == -1);
+ && (op->fd = gpa_open_input (op->file,
+ &operation->source,
+ GPA_OPERATION (op)->window)) == -1);
gtk_widget_destroy (dialog);
return (response == GTK_RESPONSE_OK);
diff --git a/src/gpaimportop.c b/src/gpaimportop.c
index 0680a21..15b38cd 100644
--- a/src/gpaimportop.c
+++ b/src/gpaimportop.c
@@ -26,6 +26,7 @@
#include "gtktools.h"
#include "gpaimportop.h"
#include "filetype.h"
+#include "gpgmetools.h"
static GObjectClass *parent_class = NULL;
@@ -51,11 +52,17 @@ static void
gpa_import_operation_finalize (GObject *object)
{
GpaImportOperation *op = GPA_IMPORT_OPERATION (object);
+ int i;
/* Free the data object, if it exists */
- if (op->source)
+ gpgme_data_release (op->source);
+ op->source = NULL;
+ if (op->source2)
{
- gpgme_data_release (op->source);
+ for (i=0; op->source2[i]; i++)
+ gpgme_key_unref (op->source2[i]);
+ g_free (op->source2);
+ op->source2 = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -65,6 +72,7 @@ static void
gpa_import_operation_init (GpaImportOperation *op)
{
op->source = NULL;
+ op->source2 = NULL;
}
static GObject*
@@ -162,15 +170,29 @@ gpa_import_operation_idle_cb (gpointer data)
{
GpaImportOperation *op = data;
- if (GPA_IMPORT_OPERATION_GET_CLASS (op)->get_source (op, &op->source))
+ if (GPA_IMPORT_OPERATION_GET_CLASS (op)->get_source (op))
{
gpg_error_t err;
- gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
- is_cms_data_ext (op->source)?
- GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
- err = gpgme_op_import_start (GPA_OPERATION (op)->context->ctx,
- op->source);
+ if (op->source)
+ {
+ gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
+ is_cms_data_ext (op->source)?
+ GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
+ err = gpgme_op_import_start (GPA_OPERATION (op)->context->ctx,
+ op->source);
+ }
+ else if (op->source2)
+ {
+ /* The only protocol where an array of keys is used in GPA
+ is OpenPGP. */
+ gpgme_set_protocol (GPA_OPERATION (op)->context->ctx,
+ GPGME_PROTOCOL_OpenPGP);
+ err = gpgme_op_import_keys_start (GPA_OPERATION (op)->context->ctx,
+ op->source2);
+ }
+ else
+ err = gpg_error (GPG_ERR_BUG);
if (err)
{
gpa_gpgme_warning (err);
@@ -185,44 +207,6 @@ gpa_import_operation_idle_cb (gpointer data)
return FALSE;
}
-static void
-key_import_results_dialog_run (GtkWidget *parent,
- gpgme_import_result_t info)
-{
- GtkWidget *dialog;
-
- if (info->considered == 0)
- {
- dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE,
- _("No keys were found."));
- }
- else
- {
- dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE,
- _("%i public keys read\n"
- "%i public keys imported\n"
- "%i public keys unchanged\n"
- "%i secret keys read\n"
- "%i secret keys imported\n"
- "%i secret keys unchanged"),
- info->considered, info->imported,
- info->unchanged, info->secret_read,
- info->secret_imported,
- info->secret_unchanged);
- }
-
- /* Run the dialog */
- gtk_widget_show_all (dialog);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-}
-
static void
gpa_import_operation_done_cb (GpaContext *context, gpg_error_t err,
@@ -230,8 +214,11 @@ gpa_import_operation_done_cb (GpaContext *context, gpg_error_t err,
{
if (! err)
{
+ struct gpa_import_result_s result;
gpgme_import_result_t res;
+ memset (&result, 0, sizeof result);
+
GPA_IMPORT_OPERATION_GET_CLASS (op)->complete_import (op);
res = gpgme_op_import_result (GPA_OPERATION (op)->context->ctx);
@@ -243,7 +230,9 @@ gpa_import_operation_done_cb (GpaContext *context, gpg_error_t err,
{
g_signal_emit_by_name (GPA_OPERATION (op), "imported_keys");
}
- key_import_results_dialog_run (GPA_OPERATION (op)->window, res);
+
+ gpa_gpgme_update_import_results (&result, 0, 0, res);
+ gpa_gpgme_show_import_results (GPA_OPERATION (op)->window, &result);
}
g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
diff --git a/src/gpaimportop.h b/src/gpaimportop.h
index ac14b22..19efea8 100644
--- a/src/gpaimportop.h
+++ b/src/gpaimportop.h
@@ -41,16 +41,17 @@ typedef struct _GpaImportOperationClass GpaImportOperationClass;
struct _GpaImportOperation {
GpaOperation parent;
- gpgme_data_t source;
+ gpgme_data_t source; /* Either a data object with the full key */
+ gpgme_key_t *source2; /* or an array of key descriptions. */
};
struct _GpaImportOperationClass {
GpaOperationClass parent_class;
- /* Get the gpgme_data_t from which the keys should be imported.
- * Returns FALSE if the operation should be aborted.
+ /* Get the data from which the keys should be imported. Returns
+ * FALSE if the operation should be aborted.
*/
- gboolean (*get_source) (GpaImportOperation *op, gpgme_data_t *source);
+ gboolean (*get_source) (GpaImportOperation *op);
/* Do whatever it takes to complete the import once the gpgme_data_t is
* filled. Basically, this sends the data to the server, the clipboard,
diff --git a/src/gpaimportserverop.c b/src/gpaimportserverop.c
index d1d93a5..fe383a3 100644
--- a/src/gpaimportserverop.c
+++ b/src/gpaimportserverop.c
@@ -29,11 +29,17 @@
#include "gpaimportserverop.h"
#include "server-access.h"
+/* The number of keys we allow to import at once. If we have more
+ than this we terminate the dialog and ask the user to give a better
+ specification of the key. A better way to do this would be to pop
+ up a dialog to allow the user to select matching keys. */
+#define MAX_KEYSEARCH_RESULTS 5
+
+
static GObjectClass *parent_class = NULL;
static gboolean
-gpa_import_server_operation_get_source (GpaImportOperation *operation,
- gpgme_data_t *source);
+gpa_import_server_operation_get_source (GpaImportOperation *operation);
static void
gpa_import_server_operation_complete_import (GpaImportOperation *operation);
@@ -111,28 +117,132 @@ gpa_import_server_operation_get_type (void)
/* Internal */
+/* Search for keys with KEYID. Return true on success and set the
+ SOURCE2 instance variable. */
+static gboolean
+search_keys (GpaImportOperation *operation, const char *keyid)
+{
+ gpg_error_t err;
+ gboolean result = FALSE;
+ gpgme_ctx_t ctx;
+ gpgme_key_t key;
+ gpgme_key_t *keyarray;
+ int i, nkeys;
+
+ if (!keyid || !*keyid)
+ return FALSE;
+
+ keyarray = g_malloc0_n (MAX_KEYSEARCH_RESULTS + 1, sizeof *keyarray);
+
+ /* We need to use a separate context because the operaion's context
+ has already been setup and the done signal would relate to the
+ actual import operation done later. */
+ ctx = gpa_gpgme_new ();
+ gpgme_set_protocol (ctx, GPGME_PROTOCOL_OpenPGP);
+ /* Switch to extern-only list mode. */
+ err = gpgme_set_keylist_mode (ctx, GPGME_KEYLIST_MODE_EXTERN);
+ if (err)
+ gpa_gpgme_error (err);
+
+ /* List keys matching the given keyid. Actually all kind of search
+ specifications can be given. */
+ nkeys = 0;
+ err = gpgme_op_keylist_start (ctx, keyid, 0);
+ while (!err && !(err = gpgme_op_keylist_next (ctx, &key)))
+ {
+ if (nkeys >= MAX_KEYSEARCH_RESULTS)
+ {
+ gpa_show_warning (GPA_OPERATION (operation)->window,
+ _("More than %d keys match your search pattern.\n"
+ "Use the long keyid or a fingerprint "
+ "for a better match"), nkeys);
+ gpgme_key_unref (key);
+ err = gpg_error (GPG_ERR_TRUNCATED);
+ break;
+ }
+ keyarray[nkeys++] = key;
+ }
+ gpgme_op_keylist_end (ctx);
+ if (gpg_err_code (err) == GPG_ERR_EOF)
+ err = 0;
+
+ if (!err && !nkeys)
+ {
+ gpa_show_warning (GPA_OPERATION (operation)->window,
+ _("No keys were found."));
+ }
+ else if (!err)
+ {
+ operation->source2 = keyarray;
+ keyarray = NULL;
+ result = TRUE;
+ }
+ else if (gpg_err_code (err) != GPG_ERR_TRUNCATED)
+ gpa_gpgme_warning (err);
+
+ gpgme_release (ctx);
+ if (keyarray)
+ {
+ for (i=0; keyarray[i]; i++)
+ gpgme_key_unref (keyarray[i]);
+ g_free (keyarray);
+ }
+ return result;
+}
+
+
/* Virtual methods */
static gboolean
-gpa_import_server_operation_get_source (GpaImportOperation *operation,
- gpgme_data_t *source)
+gpa_import_server_operation_get_source (GpaImportOperation *operation)
{
GpaImportServerOperation *op = GPA_IMPORT_SERVER_OPERATION (operation);
- GtkWidget *dialog = gpa_receive_key_dialog_new (GPA_OPERATION (op)->window);
+ GtkWidget *dialog;
GtkResponseType response;
gchar *keyid;
+ int i;
+ dialog = gpa_receive_key_dialog_new (GPA_OPERATION (op)->window);
gtk_widget_show_all (dialog);
response = gtk_dialog_run (GTK_DIALOG (dialog));
keyid = g_strdup (gpa_receive_key_dialog_get_id
(GPA_RECEIVE_KEY_DIALOG (dialog)));
gtk_widget_destroy (dialog);
- if (response == GTK_RESPONSE_OK)
+ /* Better reset the source variables. */
+ gpgme_data_release (operation->source);
+ operation->source = NULL;
+ if (operation->source2)
+ {
+ for (i=0; operation->source2[i]; i++)
+ gpgme_key_unref (operation->source2[i]);
+ g_free (operation->source2);
+ operation->source2 = NULL;
+ }
+
+ if (response == GTK_RESPONSE_OK && is_gpg_version_at_least ("2.1.0"))
+ {
+ /* GnuPG 2.1.0 does not anymore use the keyserver helpers and
+ thus we need to use the real API for receiving keys. Given
+ that there is currently no way to create a list of keys from
+ the keyids to be passed to the import function we run a
+ --search-keys first to get the list of matching keys and pass
+ them to the actual import function (which does a --recv-keys). */
+ /* Fixme: As with server_get_key (below), this is a blocking
+ operation. */
+ if (search_keys (operation, keyid))
+ {
+ /* Okay, found key(s). */
+ g_free (keyid);
+ return TRUE;
+ }
+ }
+ else if (response == GTK_RESPONSE_OK)
{
if (server_get_key (gpa_options_get_default_keyserver
(gpa_options_get_instance ()),
- keyid, source, GPA_OPERATION (op)->window))
+ keyid,
+ &operation->source, GPA_OPERATION (op)->window))
{
g_free (keyid);
return TRUE;
@@ -142,6 +252,7 @@ gpa_import_server_operation_get_source (GpaImportOperation *operation,
return FALSE;
}
+
static void
gpa_import_server_operation_complete_import (GpaImportOperation *operation)
{
diff --git a/src/gparecvkeydlg.c b/src/gparecvkeydlg.c
index c0cd752..758190e 100644
--- a/src/gparecvkeydlg.c
+++ b/src/gparecvkeydlg.c
@@ -46,7 +46,7 @@ gpa_receive_key_dialog_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
GpaReceiveKeyDialog *dialog = GPA_RECEIVE_KEY_DIALOG (object);
-
+
switch (prop_id)
{
case PROP_WINDOW:
@@ -100,24 +100,34 @@ gpa_receive_key_dialog_init (GpaReceiveKeyDialog *dialog)
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),5);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),10);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
- label = gtk_label_new (_("Which key do you want to import? (The key must "
+ label = gtk_label_new (is_gpg_version_at_least ("2.1.0")?
+ _("Which key do you want to import?") :
+ _("Which key do you want to import? (The key must "
"be specified by key ID)."));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE,
- TRUE, 5);
+ TRUE, 10);
dialog->entry = gtk_entry_new ();
- hbox = gtk_hbox_new (0, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE,
- TRUE, 5);
- label = gtk_label_new_with_mnemonic (_("Key _ID:"));
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->entry);
-
- gtk_box_pack_start_defaults (GTK_BOX (hbox), label);
- gtk_box_pack_start_defaults (GTK_BOX (hbox), dialog->entry);
+ if (is_gpg_version_at_least ("2.1.0"))
+ {
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ dialog->entry, FALSE, TRUE, 10);
+ }
+ else
+ {
+ hbox = gtk_hbox_new (0, FALSE);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE,
+ TRUE, 10);
+ label = gtk_label_new_with_mnemonic (_("Key _ID:"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->entry);
+ gtk_box_pack_start_defaults (GTK_BOX (hbox), label);
+ gtk_box_pack_start_defaults (GTK_BOX (hbox), dialog->entry);
+ }
+
}
@@ -125,9 +135,9 @@ static void
gpa_receive_key_dialog_class_init (GpaReceiveKeyDialogClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
parent_class = g_type_class_peek_parent (klass);
-
+
object_class->finalize = gpa_receive_key_dialog_finalize;
object_class->set_property = gpa_receive_key_dialog_set_property;
object_class->get_property = gpa_receive_key_dialog_get_property;
@@ -135,7 +145,7 @@ gpa_receive_key_dialog_class_init (GpaReceiveKeyDialogClass *klass)
/* Properties */
g_object_class_install_property (object_class,
PROP_WINDOW,
- g_param_spec_object
+ g_param_spec_object
("window", "Parent window",
"Parent window", GTK_TYPE_WIDGET,
G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY));
@@ -146,7 +156,7 @@ GType
gpa_receive_key_dialog_get_type (void)
{
static GType verify_dialog_type = 0;
-
+
if (!verify_dialog_type)
{
static const GTypeInfo verify_dialog_info =
@@ -161,12 +171,12 @@ gpa_receive_key_dialog_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_receive_key_dialog_init,
};
-
+
verify_dialog_type = g_type_register_static (GTK_TYPE_DIALOG,
"GpaReceiveKeyDialog",
&verify_dialog_info, 0);
}
-
+
return verify_dialog_type;
}
@@ -177,7 +187,7 @@ GtkWidget*
gpa_receive_key_dialog_new (GtkWidget *parent)
{
GpaReceiveKeyDialog *dialog;
-
+
dialog = g_object_new (GPA_RECEIVE_KEY_DIALOG_TYPE,
"window", parent, NULL);
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index 3b2eba9..e2e6ec1 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -1219,6 +1219,73 @@ gpa_get_key_capabilities_text (gpgme_key_t key)
}
+/* Update the result structure RESULT using the gpgme result INFO and
+ the FILES and BAD_FILES counter. */
+void
+gpa_gpgme_update_import_results (gpa_import_result_t result,
+ unsigned int files, unsigned int bad_files,
+ gpgme_import_result_t info)
+{
+ result->files += files;
+ result->bad_files += bad_files;
+ if (info)
+ {
+ result->considered += info->considered;
+ result->imported += info->imported;
+ result->unchanged += info->unchanged;
+ result->secret_read += info->secret_read;
+ result->secret_imported += info->secret_imported;
+ result->secret_unchanged += info->secret_unchanged;
+ }
+}
+
+
+void
+gpa_gpgme_show_import_results (GtkWidget *parent, gpa_import_result_t result)
+{
+ char *buf1, *buf2;
+
+ if (result->files)
+ buf2 = g_strdup_printf (_("%u file(s) read\n"
+ "%u file(s) with errors"),
+ result->files,
+ result->bad_files);
+ else
+ buf2 = NULL;
+
+
+ if (!result->considered)
+ gpa_show_warning (parent, "%s%s%s",
+ _("No keys were found."),
+ buf2? "\n":"",
+ buf2? buf2:"");
+ else
+ {
+ buf1 = g_strdup_printf (_("%i public keys read\n"
+ "%i public keys imported\n"
+ "%i public keys unchanged\n"
+ "%i secret keys read\n"
+ "%i secret keys imported\n"
+ "%i secret keys unchanged"),
+ result->considered,
+ result->imported,
+ result->unchanged,
+ result->secret_read,
+ result->secret_imported,
+ result->secret_unchanged);
+
+ gpa_show_info (parent,
+ "%s%s%s",
+ buf1,
+ buf2? "\n":"",
+ buf2? buf2:"");
+ g_free (buf1);
+ }
+
+ g_free (buf2);
+}
+
+
/* Return a copy of the key array. */
gpgme_key_t *
gpa_gpgme_copy_keyarray (gpgme_key_t *keys)
@@ -1244,7 +1311,7 @@ gpa_gpgme_copy_keyarray (gpgme_key_t *keys)
}
-/* Release all keys in the array KEYS as weel as ARRY itself. */
+/* Release all keys in the array KEYS as well as ARRAY itself. */
void
gpa_gpgme_release_keyarray (gpgme_key_t *keys)
{
diff --git a/src/gpgmetools.h b/src/gpgmetools.h
index c6d4885..1320f88 100644
--- a/src/gpgmetools.h
+++ b/src/gpgmetools.h
@@ -68,6 +68,25 @@ typedef struct
} gpa_keygen_para_t;
+/* An object to collect information about key imports. */
+struct gpa_import_result_s
+{
+ unsigned int files; /* # of files imported. */
+ unsigned int bad_files; /* # of files with errors. */
+
+ /* To avoid breaking translated strings the variables below are int
+ and not unsigned int as they should be for counters. */
+ int considered;
+ int imported;
+ int unchanged;
+ int secret_read;
+ int secret_imported;
+ int secret_unchanged;
+};
+typedef struct gpa_import_result_s *gpa_import_result_t;
+
+
+
/* Report an unexpected error in GPGME and quit the application.
Better to use the macro instead of the function. */
#define gpa_gpgme_error(err) \
@@ -142,6 +161,16 @@ const gchar *gpa_key_ownertrust_string (gpgme_key_t key);
/* Key validity strings. */
const gchar *gpa_key_validity_string (gpgme_key_t key);
+/* Function to manage import results. */
+void gpa_gpgme_update_import_results (gpa_import_result_t result,
+ unsigned int files,
+ unsigned int bad_files,
+ gpgme_import_result_t info);
+void gpa_gpgme_show_import_results (GtkWidget *parent,
+ gpa_import_result_t result);
+
+
+
/* This is the function called by GPGME when it wants a
passphrase. */
gpg_error_t gpa_passphrase_cb (void *hook, const char *uid_hint,
diff --git a/src/gtktools.c b/src/gtktools.c
index 973d974..8bf2867 100644
--- a/src/gtktools.c
+++ b/src/gtktools.c
@@ -35,95 +35,65 @@
#include "icons.h"
-/* BEGIN of old unchecked code (wk 2008-03-07) */
-
-static char *
-make_box_title (const char *string)
+/* Deprecated - use gpa_show_warning instead. */
+void
+gpa_window_error (const gchar *message, GtkWidget *messenger)
{
- return g_strdup_printf ("%s %s", GPA_NAME, string);
+ gpa_show_warning (messenger, "%s", message);
}
+/* Deprecated - use gpa_show_info instead. */
void
-gpa_window_error (const gchar *message, GtkWidget *messenger)
+gpa_window_message (const gchar *message, GtkWidget * messenger)
+{
+ gpa_show_info (messenger, "%s", message);
+}
+
+
+static void
+show_gtk_message (GtkWidget *parent, GtkMessageType mtype,
+ const char *format, va_list arg_ptr)
{
- GtkWidget *windowError;
- GtkWidget *hboxError;
- GtkWidget *labelMessage;
- GtkWidget *pixmap;
- char *title;
-
- title = make_box_title (_("Error"));
- windowError = gtk_dialog_new_with_buttons (title,
- (messenger ?
- GTK_WINDOW(messenger) : NULL),
- GTK_DIALOG_MODAL,
- _("_Close"),
- GTK_RESPONSE_CLOSE,
- NULL);
- g_free (title);
- if (messenger)
- gtk_window_set_transient_for (GTK_WINDOW (windowError),
- GTK_WINDOW (messenger));
-
- gtk_container_set_border_width (GTK_CONTAINER (windowError), 5);
- gtk_dialog_set_default_response (GTK_DIALOG (windowError),
- GTK_RESPONSE_CLOSE);
- hboxError = gtk_hbox_new (FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hboxError), 5);
- gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (windowError)->vbox),
- hboxError);
- pixmap = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (hboxError), pixmap, TRUE, FALSE, 10);
- labelMessage = gtk_label_new (message);
- gtk_box_pack_start (GTK_BOX (hboxError), labelMessage, TRUE, FALSE, 10);
-
- gtk_widget_show_all (windowError);
- gtk_dialog_run (GTK_DIALOG (windowError));
- gtk_widget_destroy (windowError);
+ GtkWidget *dialog;
+ char *buffer;
+
+ buffer = g_strdup_vprintf (format, arg_ptr);
+ dialog = gtk_message_dialog_new (parent? GTK_WINDOW (parent):NULL,
+ GTK_DIALOG_MODAL,
+ mtype,
+ GTK_BUTTONS_CLOSE,
+ "%s", buffer);
+ g_free (buffer);
+
+ gtk_widget_show_all (dialog);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
}
+/* Show a modal info message. */
void
-gpa_window_message (gchar * message, GtkWidget * messenger)
+gpa_show_info (GtkWidget *parent, const char *format, ...)
{
- GtkWidget *window;
- GtkWidget *hbox;
- GtkWidget *labelMessage;
- GtkWidget *pixmap;
- char *title;
-
- title = make_box_title (_("Message"));
- window = gtk_dialog_new_with_buttons (title,
- (messenger ?
- GTK_WINDOW(messenger) : NULL),
- GTK_DIALOG_MODAL,
- _("_Close"),
- GTK_RESPONSE_CLOSE,
- NULL);
- g_free (title);
- gtk_container_set_border_width (GTK_CONTAINER (window), 5);
- gtk_dialog_set_default_response (GTK_DIALOG (window),
- GTK_RESPONSE_CLOSE);
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (window)->vbox),
- hbox);
- pixmap = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (hbox), pixmap, TRUE, FALSE, 10);
- labelMessage = gtk_label_new (message);
- gtk_box_pack_start (GTK_BOX (hbox), labelMessage, TRUE, FALSE, 10);
-
- gtk_widget_show_all (window);
- gtk_dialog_run (GTK_DIALOG (window));
- gtk_widget_destroy (window);
+ va_list arg_ptr;
+
+ va_start (arg_ptr, format);
+ show_gtk_message (parent, GTK_MESSAGE_INFO, format, arg_ptr);
+ va_end (arg_ptr);
}
-/* END of old unchecked code (wk 2008-03-07) */
-
+/* Show a modal warning message. */
+void
+gpa_show_warning (GtkWidget *parent, const char *format, ...)
+{
+ va_list arg_ptr;
+
+ va_start (arg_ptr, format);
+ show_gtk_message (parent, GTK_MESSAGE_WARNING, format, arg_ptr);
+ va_end (arg_ptr);
+}
/* Set a tooltip TEXT to WIDGET. TEXT and WIDGET may both be NULL.
diff --git a/src/gtktools.h b/src/gtktools.h
index 3a204ba..41fafc5 100644
--- a/src/gtktools.h
+++ b/src/gtktools.h
@@ -23,9 +23,13 @@
#include <gtk/gtk.h>
-extern void gpa_window_error (const gchar * message, GtkWidget * messenger);
-extern void gpa_window_message (gchar * message, GtkWidget * messenger);
+/* Show a modal info message. */
+void gpa_show_info (GtkWidget *parent,
+ const char *format, ...) G_GNUC_PRINTF(2,3);
+/* Show a modal warning message. */
+void gpa_show_warning (GtkWidget *parent,
+ const char *format, ...) G_GNUC_PRINTF(2,3);
/* Set a tooltip TEXT to WIDGET. TEXT and WIDGET may both be NULL.
This function is useful so that GPA can be build with older GTK+
@@ -44,4 +48,10 @@ void gpa_window_set_title (GtkWindow *window, const char *string);
+/* Deprecated functions. */
+void gpa_window_error (const gchar * message, GtkWidget * messenger);
+void gpa_window_message (const gchar * message, GtkWidget * messenger);
+
+
+
#endif /* GTK_TOOLS_H_ */
diff --git a/src/keymanager.c b/src/keymanager.c
index 84baf6a..d78eb94 100644
--- a/src/keymanager.c
+++ b/src/keymanager.c
@@ -61,6 +61,7 @@
#include "gpaimportfileop.h"
#include "gpaimportclipop.h"
#include "gpaimportserverop.h"
+#include "gpaimportbykeyidop.h"
#include "gpabackupop.h"
@@ -549,6 +550,32 @@ key_manager_retrieve (GtkAction *action, gpointer param)
#endif /*ENABLE_KEYSERVER_SUPPORT*/
+/* Refresh keys from the keyserver. */
+#ifdef ENABLE_KEYSERVER_SUPPORT
+static void
+key_manager_refresh_keys (GtkAction *action, gpointer param)
+{
+ GpaKeyManager *self = param;
+ GpaImportByKeyidOperation *op;
+ GList *selection;
+
+ /* FIXME: The refresh-from-server operation currently only supports
+ one key at a time. */
+ if (!key_manager_has_single_selection (self))
+ return;
+
+ selection = gpa_keylist_get_selected_keys (self->keylist,
+ GPGME_PROTOCOL_OPENPGP);
+ if (selection)
+ {
+ op = gpa_import_bykeyid_operation_new (GTK_WIDGET (self),
+ (gpgme_key_t) selection->data);
+ register_import_operation (self, GPA_IMPORT_OPERATION (op));
+ }
+}
+#endif /*ENABLE_KEYSERVER_SUPPORT*/
+
+
/* Send a key to the keyserver. */
#ifdef ENABLE_KEYSERVER_SUPPORT
static void
@@ -889,8 +916,8 @@ keyring_set_listing_cb (GtkAction *action,
/* Create and return the menu bar for the key ring editor. */
static void
key_manager_action_new (GpaKeyManager *self,
- GtkWidget **menu, GtkWidget **toolbar,
- GtkWidget **popup)
+ GtkWidget **menu, GtkWidget **toolbar,
+ GtkWidget **popup)
{
static const GtkActionEntry entries[] =
{
@@ -944,6 +971,9 @@ key_manager_action_new (GpaKeyManager *self,
{ "ServerRetrieve", NULL, N_("_Retrieve Keys..."), NULL,
N_("Retrieve keys from server"),
G_CALLBACK (key_manager_retrieve) },
+ { "ServerRefresh", NULL, N_("Re_fresh Keys"), NULL,
+ N_("Refresh keys from server"),
+ G_CALLBACK (key_manager_refresh_keys) },
{ "ServerSend", NULL, N_("_Send Keys..."), NULL,
N_("Send keys to server"), G_CALLBACK (key_manager_send) }
#endif /*ENABLE_KEYSERVER_SUPPORT*/
@@ -1042,6 +1072,7 @@ key_manager_action_new (GpaKeyManager *self,
" <separator/>"
" <menuitem action='KeysExport'/>"
#ifdef ENABLE_KEYSERVER_SUPPORT
+ " <menuitem action='ServerRefresh'/>"
" <menuitem action='ServerSend'/>"
#endif
" <menuitem action='KeysBackup'/>"
@@ -1117,6 +1148,9 @@ key_manager_action_new (GpaKeyManager *self,
key_manager_has_selection);
#ifdef ENABLE_KEYSERVER_SUPPORT
+ action = gtk_action_group_get_action (action_group, "ServerRefresh");
+ add_selection_sensitive_action (self, action,
+ key_manager_has_single_selection);
action = gtk_action_group_get_action (action_group, "ServerSend");
add_selection_sensitive_action (self, action,
key_manager_has_single_selection);
diff --git a/src/server-access.c b/src/server-access.c
index 94fe0ca..74bc3f5 100644
--- a/src/server-access.c
+++ b/src/server-access.c
@@ -18,6 +18,10 @@
along with GPA; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */
+/* Note: This is the old code using the keyserver helpers
+ directly. This code is not used if GnuPG 2.1 is used. */
+
+
#include <config.h>
#include "gpa.h"
@@ -58,7 +62,7 @@
/* Internal API */
-/* FIXME: THIS SHOULDN'T BE HERE
+/* FIXME: THIS SHOULDN'T BE HERE
* The strsep function is not portable, yet parse_keyserver_uri needs it and
* I'm too lazy to rewrite it using GLib or ANSI functions, so we copy an
* implementation here. If there is no other way around it, this kind or
@@ -116,7 +120,7 @@ strsep (char **stringp, const char *delim)
#endif /*HAVE_STRSEP*/
/* Code adapted from GnuPG (file g10/keyserver.c) */
-static gboolean
+static gboolean
parse_keyserver_uri (char *uri, char **scheme, char **host,
char **port, char **opaque)
{
@@ -232,19 +236,19 @@ helper_path (const gchar *scheme)
path = g_build_filename (GPA_KEYSERVER_HELPERS_DIR, helper, NULL);
g_free (helper);
}
-#endif
+#endif
return path;
}
/* Find out the plugin protocol version */
-static int
+static int
protocol_version (const gchar *scheme)
{
gchar *helper[] = {helper_path (scheme), "-V", NULL};
gchar *output = NULL;
gint version;
- g_spawn_sync (NULL, helper, NULL, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL,
+ g_spawn_sync (NULL, helper, NULL, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL,
&output, NULL, NULL, NULL);
if (output && *output)
{
@@ -280,7 +284,7 @@ parse_helper_output (const gchar *filename)
break;
}
fclose (file);
-
+
return error;
}
@@ -327,7 +331,7 @@ error_string (gint error_code)
static void
write_command (FILE *file, const char *scheme,
- const char *host, const char *port,
+ const char *host, const char *port,
const char *opaque, const char *command)
{
fprintf (file, "%s\n", "VERSION 1");
@@ -353,9 +357,9 @@ write_command (FILE *file, const char *scheme,
static GtkWidget *
wait_dialog (const gchar *server, GtkWidget *parent)
{
- GtkWidget *dialog =
+ GtkWidget *dialog =
gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO, GTK_BUTTONS_NONE,
_("Connecting to server \"%s\".\n"
"Please wait."), server);
@@ -370,7 +374,7 @@ static gboolean
check_errors (int exit_status, gchar *error_message, gchar *output_filename,
int version, GtkWidget *parent)
{
- /* Error during connection. Try to parse the output and report the
+ /* Error during connection. Try to parse the output and report the
* error.
*/
if (version == 0)
@@ -381,7 +385,7 @@ check_errors (int exit_status, gchar *error_message, gchar *output_filename,
if (exit_status)
{
gchar *message = g_strdup_printf (_("An error ocurred while "
- "contacting the server:\n\n%s"),
+ "contacting the server:\n\n%s"),
error_message);
gpa_window_error (message, parent);
return TRUE;
@@ -401,7 +405,7 @@ check_errors (int exit_status, gchar *error_message, gchar *output_filename,
else
{
gchar *message = g_strdup_printf (_("An error ocurred while "
- "contacting the server:\n\n%s"),
+ "contacting the server:\n\n%s"),
error_string (error_code));
gpa_window_error (message, parent);
return TRUE;
@@ -447,15 +451,15 @@ do_spawn (const gchar *scheme, const gchar *command_filename,
/* Invoke the keyserver helper */
#ifdef G_OS_UNIX
/* On Unix, run the helper asyncronously, so that we can update the dialog */
- g_spawn_async_with_pipes (NULL, helper_argv, NULL,
+ g_spawn_async_with_pipes (NULL, helper_argv, NULL,
G_SPAWN_STDOUT_TO_DEV_NULL|
- G_SPAWN_DO_NOT_REAP_CHILD,
+ G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &pid, NULL, NULL, &standard_error,
&error);
#else
/* On Windows, use syncronous spawn */
- g_spawn_sync (NULL, helper_argv, NULL,
- G_SPAWN_STDOUT_TO_DEV_NULL, NULL, NULL,
+ g_spawn_sync (NULL, helper_argv, NULL,
+ G_SPAWN_STDOUT_TO_DEV_NULL, NULL, NULL,
NULL, error_output, exit_status, &error);
#endif
@@ -525,7 +529,7 @@ invoke_helper (const gchar *server, const gchar *scheme,
/* Public functions */
-gboolean
+gboolean
server_send_keys (const gchar *server, const gchar *keyid,
gpgme_data_t data, GtkWidget *parent)
{
@@ -552,7 +556,7 @@ server_send_keys (const gchar *server, const gchar *keyid,
dump_data_to_file (data, command);
fprintf (command, "\nKEY %s END\n", keyid);
fclose (command);
- success = invoke_helper (server, scheme, command_filename,
+ success = invoke_helper (server, scheme, command_filename,
&output_filename, parent);
g_free (keyserver);
/* Delete temp files */
@@ -564,7 +568,7 @@ server_send_keys (const gchar *server, const gchar *keyid,
return success;
}
-gboolean
+gboolean
server_get_key (const gchar *server, const gchar *keyid,
gpgme_data_t *data, GtkWidget *parent)
{
diff --git a/src/server.c b/src/server.c
index c7c7740..0c7209a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -45,6 +45,7 @@
#include "gpafilesignop.h"
#include "gpafiledecryptop.h"
#include "gpafileverifyop.h"
+#include "gpafileimportop.h"
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
@@ -107,7 +108,6 @@ struct conn_ctrl_s
/* The list of all files to be processed. */
GList *files;
- gboolean files_finished;
};
@@ -349,7 +349,6 @@ release_files (conn_ctrl_t ctrl)
g_list_foreach (ctrl->files, (GFunc) free_file_item, NULL);
g_list_free (ctrl->files);
ctrl->files = NULL;
- ctrl->files_finished = FALSE;
}
@@ -1261,22 +1260,24 @@ cmd_getinfo (assuan_context_t ctx, char *line)
}
-/* FILE <file> [--continued]
-
- Set the files on which to operate.
- */
+static const char hlp_file[] =
+ "FILE [--clear] <file>\n"
+ "\n"
+ "Add FILE to the list of files on which to operate.\n"
+ "With --clear given, that list is first cleared.";
static gpg_error_t
cmd_file (assuan_context_t ctx, char *line)
{
gpg_error_t err = 0;
conn_ctrl_t ctrl = assuan_get_pointer (ctx);
- gboolean continued;
+ gboolean clear;
gpa_file_item_t file_item;
char *tail;
- continued = has_option (line, "--continued");
+ clear = has_option (line, "--clear");
+ line = skip_options (line);
- if (ctrl->files_finished)
+ if (clear)
release_files (ctrl);
tail = line;
@@ -1289,13 +1290,12 @@ cmd_file (assuan_context_t ctx, char *line)
file_item->filename_in = g_strdup (line);
ctrl->files = g_list_append (ctrl->files, file_item);
- if (! continued)
- ctrl->files_finished = TRUE;
-
return assuan_process_done (ctx, err);
}
+/* Encrypt or sign files. If neither ENCR nor SIGN is set, import
+ files. */
static gpg_error_t
impl_encrypt_sign_files (assuan_context_t ctx, int encr, int sign)
{
@@ -1308,11 +1308,6 @@ impl_encrypt_sign_files (assuan_context_t ctx, int encr, int sign)
err = set_error (GPG_ERR_ASS_SYNTAX, "no files specified");
return assuan_process_done (ctx, err);
}
- else if (! ctrl->files_finished)
- {
- err = set_error (GPG_ERR_ASS_SYNTAX, "more files expected");
- return assuan_process_done (ctx, err);
- }
/* FIXME: Needs a root window. Need to set "sign" default. */
if (encr && sign)
@@ -1321,13 +1316,15 @@ impl_encrypt_sign_files (assuan_context_t ctx, int encr, int sign)
else if (encr)
op = (GpaFileOperation *)
gpa_file_encrypt_operation_new (NULL, ctrl->files, FALSE);
- else
+ else if (sign)
op = (GpaFileOperation *)
gpa_file_sign_operation_new (NULL, ctrl->files, FALSE);
+ else
+ op = (GpaFileOperation *)
+ gpa_file_import_operation_new (NULL, ctrl->files);
/* Ownership of CTRL->files was passed to callee. */
ctrl->files = NULL;
- ctrl->files_finished = FALSE;
g_signal_connect (G_OBJECT (op), "completed",
G_CALLBACK (g_object_unref), NULL);
@@ -1416,11 +1413,6 @@ impl_decrypt_verify_files (assuan_context_t ctx, int decrypt, int verify)
err = set_error (GPG_ERR_ASS_SYNTAX, "no files specified");
return assuan_process_done (ctx, err);
}
- else if (! ctrl->files_finished)
- {
- err = set_error (GPG_ERR_ASS_SYNTAX, "more files expected");
- return assuan_process_done (ctx, err);
- }
/* FIXME: Needs a root window. Need to enable "verify". */
if (decrypt && verify)
@@ -1435,7 +1427,6 @@ impl_decrypt_verify_files (assuan_context_t ctx, int decrypt, int verify)
/* Ownership of CTRL->files was passed to callee. */
ctrl->files = NULL;
- ctrl->files_finished = FALSE;
g_signal_connect (G_OBJECT (op), "completed",
G_CALLBACK (g_object_unref), NULL);
@@ -1531,10 +1522,10 @@ cmd_import_files (assuan_context_t ctx, char *line)
return assuan_process_done (ctx, err);
}
- err = set_error (GPG_ERR_NOT_IMPLEMENTED, "not implemented");
- return assuan_process_done (ctx, err);
+ return impl_encrypt_sign_files (ctx, 0, 0);
}
+
/* CHECKSUM_CREATE_FILES --nohup */
static gpg_error_t
@@ -1670,7 +1661,7 @@ register_commands (assuan_context_t ctx)
#endif /*ENABLE_CARD_MANAGER*/
{ "START_CONFDIALOG", cmd_start_confdialog, hlp_start_confdialog },
{ "GETINFO", cmd_getinfo, hlp_getinfo },
- { "FILE", cmd_file },
+ { "FILE", cmd_file, hlp_file },
{ "ENCRYPT_FILES", cmd_encrypt_files },
{ "SIGN_FILES", cmd_sign_files },
{ "ENCRYPT_SIGN_FILES", cmd_encrypt_sign_files },
diff --git a/src/settingsdlg.c b/src/settingsdlg.c
index 66bed62..fe9e529 100644
--- a/src/settingsdlg.c
+++ b/src/settingsdlg.c
@@ -58,7 +58,8 @@ struct _SettingsDlg
{
GtkDialog parent;
- gboolean modified; /* True is tehre are unsaved changes. */
+ gboolean modified; /* True is there are unsaved changes. */
+ gboolean gnupg21; /* True if gnupg 2.1.0 or later is in use. */
/* Data for the user interface frame. */
struct {
@@ -170,7 +171,8 @@ update_show_advanced_options (SettingsDlg *dialog)
if (gpa_options_get_show_advanced_options (options))
{
#ifdef ENABLE_KEYSERVER_SUPPORT
- gtk_widget_show_all (dialog->keyserver.frame);
+ if (!dialog->gnupg21)
+ gtk_widget_show_all (dialog->keyserver.frame);
#endif /*ENABLE_KEYSERVER_SUPPORT*/
if (dialog->akl.enabled)
gtk_widget_show_all (dialog->akl.frame);
@@ -178,7 +180,8 @@ update_show_advanced_options (SettingsDlg *dialog)
else
{
#ifdef ENABLE_KEYSERVER_SUPPORT
- gtk_widget_hide_all (dialog->keyserver.frame);
+ if (!dialog->gnupg21)
+ gtk_widget_hide_all (dialog->keyserver.frame);
#endif /*ENABLE_KEYSERVER_SUPPORT*/
if (dialog->akl.enabled)
gtk_widget_hide_all (dialog->akl.frame);
@@ -353,6 +356,9 @@ keyserver_selected_from_list_cb (SettingsDlg *dialog)
{
char *text;
+ if (dialog->gnupg21)
+ return;
+
text = gtk_combo_box_get_active_text (dialog->keyserver.combo);
g_message ("got `%s'", text);
xfree (dialog->keyserver.url);
@@ -370,6 +376,9 @@ check_default_keyserver (SettingsDlg *dialog)
{
keyserver_spec_t kspec;
+ if (dialog->gnupg21)
+ return NULL; /* GnuPG manages the keyservers. */
+
keyserver_selected_from_list_cb (dialog);
if (!dialog->keyserver.url)
@@ -728,9 +737,13 @@ load_settings (SettingsDlg *dialog)
/* Default keyserver section. */
#ifdef ENABLE_KEYSERVER_SUPPORT
- gtk_entry_set_text (GTK_ENTRY
- (gtk_bin_get_child (GTK_BIN (dialog->keyserver.combo))),
- gpa_options_get_default_keyserver (options));
+ if (!dialog->gnupg21)
+ {
+ gtk_entry_set_text (GTK_ENTRY
+ (gtk_bin_get_child
+ (GTK_BIN (dialog->keyserver.combo))),
+ gpa_options_get_default_keyserver (options));
+ }
#endif /*ENABLE_KEYSERVER_SUPPORT*/
/* AKL section. */
@@ -758,13 +771,16 @@ save_settings (SettingsDlg *dialog)
}
#ifdef ENABLE_KEYSERVER_SUPPORT
- if ((errwdg = check_default_keyserver (dialog)))
+ if (!dialog->gnupg21)
{
- gpa_window_error
- (_("The URL given for the keyserver is not valid."),
- GTK_WIDGET (dialog));
- gtk_widget_grab_focus (errwdg);
- return -1;
+ if ((errwdg = check_default_keyserver (dialog)))
+ {
+ gpa_window_error
+ (_("The URL given for the keyserver is not valid."),
+ GTK_WIDGET (dialog));
+ gtk_widget_grab_focus (errwdg);
+ return -1;
+ }
}
#endif /*ENABLE_KEYSERVER_SUPPORT*/
@@ -893,7 +909,7 @@ static void
settings_dlg_init (SettingsDlg *dialog)
{
dialog->akl.method_idx = -1;
-
+ dialog->gnupg21 = is_gpg_version_at_least ("2.1.0");
}
@@ -931,15 +947,21 @@ settings_dlg_constructor (GType type, guint n_construct_properties,
frame = default_key_frame (dialog);
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame);
- /* The default keyserver section. */
+ /* The default keyserver section. Note that there is no keyserver
+ entry if we are using gnupg 2.1. There we do not have the
+ keyserver helpers anymore and thus the keyservers are to be
+ enabled in the backend preferences. */
#ifdef ENABLE_KEYSERVER_SUPPORT
- frame = default_keyserver_frame (dialog);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame,
- FALSE, FALSE, 0);
+ if (!dialog->gnupg21)
+ {
+ frame = default_keyserver_frame (dialog);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame,
+ FALSE, FALSE, 0);
+ }
#endif /*ENABLE_KEYSERVER_SUPPORT*/
/* The auto key locate section. */
- dialog->akl.enabled = is_gpg_version_at_least ("2.0.10");
+ dialog->akl.enabled = dialog->gnupg21;
if (dialog->akl.enabled)
{
frame = auto_key_locate_frame (dialog);
--
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