[Pkg-gnupg-commit] [gpa] 01/03: Imported Upstream version 0.9.7
Andreas Rönnquist
gusnan at moszumanska.debian.org
Sat Dec 13 13:07:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
gusnan pushed a commit to branch experimental
in repository gpa.
commit f37bb5bd058922eb58cf0567c379d11b77681a5d
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date: Fri Dec 12 12:11:29 2014 +0100
Imported Upstream version 0.9.7
---
ChangeLog | 43 ++++++++
NEWS | 6 ++
VERSION | 2 +-
configure | 26 ++---
configure.ac | 2 +-
po/ar.gmo | Bin 29489 -> 28794 bytes
po/ar.po | 263 +++++++++++++++++++++++++----------------------
po/cs.gmo | Bin 59269 -> 57437 bytes
po/cs.po | 266 +++++++++++++++++++++++++----------------------
po/de.gmo | Bin 53510 -> 53955 bytes
po/de.po | 268 ++++++++++++++++++++++++++----------------------
po/es.gmo | Bin 25696 -> 25073 bytes
po/es.po | 263 +++++++++++++++++++++++++----------------------
po/fr.gmo | Bin 34355 -> 34099 bytes
po/fr.po | 265 +++++++++++++++++++++++++----------------------
po/gpa.pot | 255 ++++++++++++++++++++++++---------------------
po/ja.gmo | Bin 18622 -> 18060 bytes
po/ja.po | 267 +++++++++++++++++++++++++----------------------
po/nl.gmo | Bin 20208 -> 19558 bytes
po/nl.po | 263 +++++++++++++++++++++++++----------------------
po/pl.gmo | Bin 20736 -> 20073 bytes
po/pl.po | 263 +++++++++++++++++++++++++----------------------
po/pt_BR.gmo | Bin 17017 -> 16630 bytes
po/pt_BR.po | 261 ++++++++++++++++++++++++----------------------
po/ru.gmo | Bin 31157 -> 30295 bytes
po/ru.po | 263 +++++++++++++++++++++++++----------------------
po/sv.gmo | Bin 36309 -> 35688 bytes
po/sv.po | 265 +++++++++++++++++++++++++----------------------
po/tr.gmo | Bin 20088 -> 19479 bytes
po/tr.po | 263 +++++++++++++++++++++++++----------------------
po/zh_TW.gmo | Bin 16188 -> 15672 bytes
po/zh_TW.po | 263 +++++++++++++++++++++++++----------------------
src/cardman.c | 100 +++++++++---------
src/cm-dinsig.c | 64 ++++++------
src/cm-geldkarte.c | 76 +++++++-------
src/cm-netkey.c | 55 +++++-----
src/cm-openpgp.c | 54 ++++++----
src/cm-unknown.c | 12 +--
src/confdialog.c | 42 ++++++++
src/confdialog.h | 3 +-
src/gpa.c | 3 +-
src/gpabackupop.c | 2 +-
src/gpaexportserverop.c | 112 +++++++++++++++++---
src/options.c | 45 ++++----
src/settingsdlg.c | 5 +-
45 files changed, 2416 insertions(+), 1924 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c920f15..3aa67e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,48 @@
+2014-12-12 Werner Koch <wk at gnupg.org>
+
+ Release 0.9.7.
+
+ po: Auto update.
+
+2014-12-11 Werner Koch <wk at gnupg.org>
+
+ Replace deprecated gpgme API for card access.
+ * src/cardman.c: Use gpgme_op_assuan_transact_ext.
+ * src/cm-dinsig.c: Ditto.
+ * src/cm-geldkarte.c: Ditto.
+ * src/cm-netkey.c: Ditto.
+ * src/cm-openpgp.c: Ditto.
+ * src/cm-unknown.c: Ditto.
+
+2014-12-08 Werner Koch <wk at gnupg.org>
+
+ po: Use the term "USB stick" for the backup message.
+
+ Add another OpenPGP card vendor.
+
+ Floppy drives are pretty rare these days advice to use flash.
+
+ po: Update the German translation.
+
+ Support sending keys with GnuPG 2.1.
+ * src/confdialog.c (gpa_configure_keyserver): New.
+ * src/gpa.c (main): Do no get a default keyserver for GnuPG 2.1.
+ * src/options.c (gpa_options_read_settings): Ditto.
+ * src/settingsdlg.c (save_settings): Do not set a default keyserver
+ for GnuPG 2.1
+ * src/gpaexportserverop.c (confirm_send): Ask to configure keyserver.
+ Support GnuPG 2.1.
+ (send_keys): New.
+ (gpa_export_server_operation_complete_export): Support GnuPG 2.1.
+
+2014-12-05 Werner Koch <wk at gnupg.org>
+
+ Update card vendor list and fix one typo.
+
2014-11-21 Werner Koch <wk at gnupg.org>
+ Post release updates.
+
Release 0.9.6.
Do not create gzipped tarball.
diff --git a/NEWS b/NEWS
index b9129ac..cd99a9a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Noteworthy changes in version 0.9.7 (2014-12-12)
+------------------------------------------------
+
+ * Support sending keys for GnuPG 2.1.
+
+
Noteworthy changes in version 0.9.6 (2014-11-21)
------------------------------------------------
diff --git a/VERSION b/VERSION
index 85b7c69..c81aa44 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.6
+0.9.7
diff --git a/configure b/configure
index 972738b..3768206 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.6.
+# Generated by GNU Autoconf 2.69 for gpa 0.9.7.
#
# 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.6'
-PACKAGE_STRING='gpa 0.9.6'
+PACKAGE_VERSION='0.9.7'
+PACKAGE_STRING='gpa 0.9.7'
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.6 to adapt to many kinds of systems.
+\`configure' configures gpa 0.9.7 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.6:";;
+ short | recursive ) echo "Configuration of gpa 0.9.7:";;
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.6
+gpa configure 0.9.7
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.6, which was
+It was created by gpa $as_me 0.9.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2717,7 +2717,7 @@ fi
# Define the identity of the package.
PACKAGE='gpa'
- VERSION='0.9.6'
+ VERSION='0.9.7'
cat >>confdefs.h <<_ACEOF
@@ -2787,7 +2787,7 @@ have_libassuan=no
#
# Provide information about the build.
#
-BUILD_REVISION="886e24f"
+BUILD_REVISION="8ce9480"
cat >>confdefs.h <<_ACEOF
@@ -2796,7 +2796,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}34926"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}36073"
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.6, which was
+This file was extended by gpa $as_me 0.9.7, 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.6
+gpa config.status 0.9.7
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: 886e24f (34926)
+ Revision: 8ce9480 (36073)
Platform: $host
"
diff --git a/configure.ac b/configure.ac
index 97beedd..4c35e71 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.6])
+m4_define([mym4_version], [0.9.7])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
diff --git a/po/ar.gmo b/po/ar.gmo
index 3d46069..fe3049c 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 5208324..ae298fe 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+0100\n"
"PO-Revision-Date: 2011-12-12 10:14+0100\n"
"Last-Translator: \n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "Open File"
msgstr "افتح ملفا"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "رسالة GPA"
@@ -43,13 +43,13 @@ msgid "Clipboard"
msgstr "الحافظة"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_ملف"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/_تحرير"
@@ -92,7 +92,7 @@ msgid "Close the buffer"
msgstr "يخلي البراح"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -126,11 +126,11 @@ msgstr "يظهِّر النصّ المحدد"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "حلقة مفاتيح"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "ملفات"
@@ -139,35 +139,35 @@ msgstr "ملفات"
msgid "Card"
msgstr "الحافظة"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>الرئيسي</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "يستخدم القيم البدئية"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "استخدم القيمة البدئية"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "لا تستخدم الخيار"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "يستخدم قيم معينة"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "استخدم قيمة معينة"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "استخدم المعطى البدئي"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -175,34 +175,58 @@ msgstr ""
"هناك تغييرات قمت بها لم تُطبّق. تغيير إعداد الخبير سيُطبّق هذه التغييرات. أتريد "
"المواصلة؟"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "إعدادات محرّك التعمية"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "صفّر"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "اضبط أدوات نظام GnuPG."
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "المستوى:"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "أساسي"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "متقدّم"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "خبير"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_نعم"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_لا"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "أيّام"
@@ -223,7 +247,7 @@ msgstr "سنين"
msgid "never expires"
msgstr "لا تنتهي أبدا"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "مجهول"
@@ -300,7 +324,7 @@ msgstr "يعمّي الملف المحدد"
msgid "Decrypt the selected file"
msgstr "يظهِّر الملف المحدد"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -438,14 +462,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"حُفظت نسخة من مفتاحك السري في الملف:\n"
"\n"
@@ -488,30 +512,27 @@ msgstr "تم تصدير المفاتيح إلى %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"ستُرسَل المفتاح المحدد إلى\n"
"خادوم مفاتيح علني (\"%s\").\n"
"أمتأكد أنك تريد توزيع هذا المفتاح؟"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_نعم"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "أمتأكد أنك تريد حذف هذا المفتاح؟"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_لا"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/أر_سِل المفاتيح للخادوم..."
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "أُرسلت المفاتيح إلى الخادوم."
@@ -1343,7 +1364,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "ولّد مفتاحا"
@@ -2278,7 +2299,7 @@ msgstr "خادوم المفاتيح الذي حددته غير صالح"
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "التضبيطات"
@@ -2317,7 +2338,7 @@ msgstr "التوقيع: %s"
msgid "Signatures:"
msgstr "التوقيعات:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "مدير الملفات"
@@ -2331,16 +2352,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "لم توجد مفاتيح."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2349,55 +2370,55 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "الحافظة"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "ولّد مفتاحا"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "العمليّة غير مدعومة"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "يقص المحدد إلى الحافظة"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2414,75 +2435,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PIN"
msgstr "صفّر"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PUK"
msgstr "صفّر"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "يوقّع الملف المُحدد"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2496,7 +2517,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2512,7 +2533,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2524,7 +2545,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2534,7 +2555,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2542,7 +2563,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2560,117 +2581,117 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "<b>استخدم الطَّور ال_متقدّم:</>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "شخصي"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "اسم المستخدم:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "_مفاتيح علنية"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "<b>الرئيسي</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "التوقيعات:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "تجري التعمية..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "يمكن الاستيثاق به"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "التوقيعات:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
#, fuzzy
msgid "<b>PIN</b>"
msgstr "<b>الرئيسي</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "توقيع _منفصِل"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2678,12 +2699,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "صدّر المفاتيح"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2696,12 +2717,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "يجري توليد المفتاح..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2721,27 +2742,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2754,7 +2775,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2771,7 +2792,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2784,26 +2805,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "يجري التوقيع..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
index 7220407..f1eec58 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index fb1b601..93a5f72 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -21,7 +21,7 @@ msgstr ""
msgid "Open File"
msgstr "Otevřít soubor"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "Zpráva GPA"
@@ -42,12 +42,12 @@ msgid "Clipboard"
msgstr "Schránka"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
msgid "_File"
msgstr "_Soubor"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
msgid "_Edit"
msgstr "Úpr_avy"
@@ -84,7 +84,7 @@ msgid "Close the buffer"
msgstr "Uzavřít mezipaměť"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr "Ukončit program"
@@ -116,11 +116,11 @@ msgstr "Smazat vybraný text"
msgid "Select the entire document"
msgstr "Vybrat celý dokument"
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "Klíčenka"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Soubory"
@@ -128,35 +128,35 @@ msgstr "Soubory"
msgid "Card"
msgstr "Karta"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>Hlavní</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "Použít výchozí hodnoty"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "Použít výchozí hodnotu"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "Nepoužívat tuto volbu"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "Použít vlastní hodnoty"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "Použít vlastní hodnotu"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "Použít výchozí argument"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -164,34 +164,60 @@ msgstr ""
"Nebyly uloženy změny, které jste provedl. Přepnutí nastavení úrovně expert "
"tyto změny uloží. Přejete si pokračovat?"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "Nastavení šifrovacího backendu"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "Výchozí"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "Nastavit nástroje GnuPG systému."
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "Úroveň:"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "Základní"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "Pokročilý"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "Expert"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+#, fuzzy
+msgid "Configure backend to use a keyserver?"
+msgstr "Nastavit programy backednu"
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ano"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Ne"
+
+#: src/confdialog.c:1605
+#, fuzzy
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Nastavit programy backednu"
+
#: src/convert.c:29
msgid "days"
msgstr "dny"
@@ -212,7 +238,7 @@ msgstr "roky"
msgid "never expires"
msgstr "nikdy nevyprší"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "neznámá"
@@ -288,7 +314,7 @@ msgstr "Zašifrovat vybraný soubor"
msgid "Decrypt the selected file"
msgstr "Dešifrovat vybraný soubor"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr "Zavřít okno"
@@ -413,14 +439,14 @@ msgid "Configure the backend programs"
msgstr "Nastavit programy backednu"
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Kopie vašeho soukromého klíče byla uložena v souboru:\n"
"\n"
@@ -463,30 +489,27 @@ msgstr "Klíče byly exportovány do %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr "Pouze klíče stejného protokolu smějí být exportovány jako kolekce."
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Vybraný klíč bude odeslán na server klíčů\n"
"(\"%s\").\n"
"Určitě chcete šířit tento klíč?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Ano"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Jste si jistý, že chcete smazat tento klíč?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Ne"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Odeslat klíče na server..."
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Klíče byly odeslány na server."
@@ -1302,7 +1325,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Vytvořit klíč"
@@ -2248,7 +2271,7 @@ msgstr "Zadané URL serveru klíčů není platné."
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:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Nastavení"
@@ -2286,7 +2309,7 @@ msgstr "Podpis: %s"
msgid "Signatures:"
msgstr "Podpisy:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
msgid "Card Manager"
msgstr "Správce karet"
@@ -2299,15 +2322,15 @@ msgstr "Detekována %s karta."
msgid "Checking for card..."
msgstr "Hledá se karta..."
-#: src/cardman.c:368
+#: src/cardman.c:369
msgid "No card found."
msgstr "Nebyla nalezena žádná karta."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr "Zvolená aplikace karty v tuto chvíli není dostupná."
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2319,51 +2342,51 @@ msgstr ""
"\n"
"Nastavením na \"Auto\" můžete změnit mód výběru aktivní aplikace. "
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr "Zvolená aplikace karty není dostupná."
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr "Chyba přístupu ke kartě."
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr "Chyba přístupu ke kartě"
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr "Žádná karta"
-#: src/cardman.c:647
+#: src/cardman.c:651
msgid "_Card"
msgstr "_Karta"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr "Obnovit informace o kartě"
-#: src/cardman.c:659
+#: src/cardman.c:663
msgid "Generate new key on card"
msgstr "Vytvořit nový klíč na kartě"
-#: src/cardman.c:789
+#: src/cardman.c:793
msgid "This card application is not yet supported."
msgstr "Tato aplikace karty není zatím podporována."
-#: src/cardman.c:933
+#: src/cardman.c:937
msgid "Application selection:"
msgstr "Volba aplikace: "
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr "Auto"
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr "Knihovna GPGME je příliš zastaralá aby podporovala čipové karty."
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2393,31 +2416,31 @@ msgstr ""
"\n"
"Toto oznámení bude zobrazeno pouze jednou za relaci."
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr "Čítač opakování PUK:"
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr "Čítač opakování CHV2:"
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr "Resetovat PIN"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr "Změnit PIN"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr "Změnit PUK"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr "Resetovat PUK"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
@@ -2426,41 +2449,41 @@ msgstr ""
"Chyba při ukládání změněných hodnot.\n"
"(%s <%s>)"
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr "Aktuálně je povoleno pouze základní ASCII."
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr "Znak \"<\" nelze použít."
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr "Více mezer není povoleno."
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr "Celková délka křestního jména a příjmení nesmí přesáhnout 39 znaků."
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
msgid "Saving the field failed."
msgstr "Uložení pole selhalo."
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr "Neplatná délka předvolby jazyka."
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr "Volba jazyka smí obsahovat pouze písmena 'a' až 'z'."
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr "Délka tohoto pole nesmí přesáhnout 254 znaků."
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2483,7 +2506,7 @@ msgstr ""
"Pokud budete pokračovat, budete vyzvání, abyste vložili současnou hodnotu "
"<b>Reset kódu</b> , poté novou hodnotu PIN a tu na dalším řádku zopakovali."
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2511,7 +2534,7 @@ msgstr ""
"vydavatel mohl vaši kartu inicializovat s jiným PIN. Zkontrolujte prosím "
"instrukce od vašeho vydavatele."
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2530,7 +2553,8 @@ msgstr ""
"Pokud budete pokračovat, budete vyzvání, abyste vložili současnou hodnotu "
"PIN, poté novou hodnotu Reset kódu a tu na dalším řádku zopakovali."
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
+#, fuzzy
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2540,7 +2564,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2560,7 +2584,7 @@ msgstr ""
"<b>Admin-PIN</b>, poté novou hodnotu PIN nebo Reset kódu a tu na dalším "
"řádku zopakovali."
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2590,7 +2614,7 @@ msgstr ""
"Pokud budete pokračovat, budete vyzvání, abyste vložili současnou hodnotu "
"<b>Admin-PIN</b>, poté novou hodnotu a tu na dalším řádku zopakovali."
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
@@ -2599,7 +2623,7 @@ msgstr ""
"Chyba při změně nebo resetu PIN/PUK.\n"
"(%s <%s>)"
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
@@ -2608,92 +2632,92 @@ msgstr ""
"Chyba při stahování klíče.\n"
"(%s <%s>)"
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr "Nalezeno %d klíčů, importováno: %d, nezměněno: %d"
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr "Získat klíč"
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
msgid "<b>General</b>"
msgstr "<b>Obecné</b>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr "Výrobní číslo:"
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr "Verze karty:"
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr "Výrobce:"
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
msgid "<b>Personal</b>"
msgstr "<b>Osobní</b>"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr "Oslovení:"
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr "Křestní jméno:"
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
msgid "Last name:"
msgstr "Příjmení:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr "Jazyk:"
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr "Data přihlášení:"
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
msgid "Public key URL:"
msgstr "URL veřejného klíče: "
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
msgid "<b>Keys</b>"
msgstr "<b>Klíče</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
msgid "Signature key:"
msgstr "Podpisový klíč:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
msgid "Encryption key:"
msgstr "Šifrovací klíč:"
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
msgid "Authentication key:"
msgstr "Autentizační klíč:"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
msgid "Signature counter:"
msgstr "Počítadlo podpisů:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr "<b>PIN</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
msgid "Force signature PIN:"
msgstr "Vynutit podpisový PIN:"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr "Čítač opakování PIN:"
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr "Čítač opakování admin PIN:"
@@ -2701,11 +2725,11 @@ msgstr "Čítač opakování admin PIN:"
msgid "blocked"
msgstr "blokováno"
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
msgid "Learn keys"
msgstr "Učit klíče"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2727,11 +2751,11 @@ msgstr ""
"\n"
"Pokud si nejste jistí co dělat, klikněte na tlačítko."
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
msgid "Learning keys ..."
msgstr "Klíče jsou učeny"
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2765,7 +2789,7 @@ msgstr ""
"\n"
"%s"
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
@@ -2774,7 +2798,7 @@ msgstr ""
"Nyní nastavujete PIN pro SigG klíče používané pro vytváření "
"<b>kvalifikovaných podpisů</b>. PIN můžete nastavit stejný jako u NKS klíčů."
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
@@ -2782,7 +2806,7 @@ msgstr ""
"Nyní nastavujete PIN pro NKS klíče používané pro běžné podpisy, šifrování a "
"autentizaci."
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
@@ -2791,7 +2815,7 @@ msgstr ""
"Chyba při změně prázdného PIN.\n"
"(%s <%s>)"
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2812,7 +2836,7 @@ msgstr ""
"Pokud oba čítače (PIN a odpovídající PUK) klesnou na nulu, klíče chráněné "
"tímto PIN nebudou více použitelné. Ani je nebude možné nikdy odblokovat!"
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2841,7 +2865,7 @@ msgstr ""
"Pokud budete pokračovat, budete vyzváni abyste zadali současnou hodnotu PIN, "
"poté novou hodnotu pro blokovaný PUK a tu na dalším řádku zopakovali."
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2862,7 +2886,7 @@ msgstr ""
"Pokud budete pokračovat, budete vyzváni abyste zadali současnou hodnotu PUK, "
"poté novou hodnotu pro blokovaný PIN a tu na dalším řádku zopakovali."
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
@@ -2870,19 +2894,19 @@ msgstr ""
"<b>NullPIN je na této kartě stále aktivní</b>.\n"
"Před použitím karty musíte nastavit reálný PIN."
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr "Nastavit výchozí PIN"
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
msgid "scanning ..."
msgstr "skenování ..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr "Čítač opakování SigG PIN:"
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr "Čítač opakování SigG PUK:"
diff --git a/po/de.gmo b/po/de.gmo
index 76ec5c3..d6be27d 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index e8ec06d..6b18e39 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-11-21 09:49+0100\n"
-"PO-Revision-Date: 2014-11-21 09:40+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"PO-Revision-Date: 2014-12-08 17:36+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "Open File"
msgstr "Datei öffnen"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "GPA Meldung"
@@ -41,12 +41,12 @@ msgid "Clipboard"
msgstr "Zwischenablage"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
msgid "_File"
msgstr "_Datei"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
msgid "_Edit"
msgstr "_Bearbeiten"
@@ -83,7 +83,7 @@ msgid "Close the buffer"
msgstr "Das Fenster schliessen"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr "Das Programm beenden"
@@ -115,11 +115,11 @@ 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:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "Schlüsselverwaltung"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Dateien"
@@ -127,35 +127,35 @@ msgstr "Dateien"
msgid "Card"
msgstr "Smartcard"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>Allgemein</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "Standardwerte verwenden"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "Standardwert verwenden"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "Option nicht benutzen"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "Benutzerdefinierte Werte"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "Benutzerdefinierter Wert"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "Standardargument verwenden"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -164,34 +164,58 @@ msgstr ""
"Einstellung ändern, werden diese Veränderungen angewandt. Möchten Sie "
"fortfahren?"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "Konfiguration des Krypto Backend"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "Zurücksetzen"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "Konfigurien Sie die Werkzeuge des GnuPG Systems."
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "Stufe:"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "Grundlegend"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "Fortgeschritten"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "Experte"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr "Es ist kein Schlüssel-Server konfiguriert."
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr "Soll ein Schlüssel-Server konfiguriert werden?"
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nein"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Konfiguration eines Schlüssel-Servers ist fehlgeschlagen"
+
#: src/convert.c:29
msgid "days"
msgstr "Tage"
@@ -212,7 +236,7 @@ msgstr "Jahre"
msgid "never expires"
msgstr "kein Verfallsdatum"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "unbekannt"
@@ -288,7 +312,7 @@ msgstr "Gewählte Datei verschlüsseln"
msgid "Decrypt the selected file"
msgstr "Gewählte Datei entschlüsseln"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr "Das Fenster schliessen"
@@ -420,7 +444,7 @@ msgid ""
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Eine Kopie Ihres geheimen Schlüssels wurde abgespeichert in der Datei:\n"
"\n"
@@ -428,7 +452,7 @@ msgstr ""
"\n"
"Dies ist eine sicherheitskritische Information und muss sicher gespeichert "
"werden\n"
-"(z.B. auf einer Diskette, die an einem sicheren Ort verwahrt wird)."
+"(z.B. auf einem USB Stick, der an einem sicheren Ort verwahrt wird)."
#: src/gpabackupop.c:236
msgid "An error ocurred during the backup operation."
@@ -464,30 +488,24 @@ msgstr "Die Schlüssel wurden exportiert nach %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr "Nur Schlüssel eines Protokolls können zusammen exportiert werden"
-#: src/gpaexportserverop.c:129
+#: src/gpaexportserverop.c:146
#, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
-"Der ausgewählte Schlüssel wird an einen öffentlichen\n"
-"Schlüssel-Server (\"%s\") gesandt.\n"
-"Sind Sie sicher, dass Sie diesen Schlüssel veröffentlichen wollen?"
+"Der oder die ausgewählte(n) Schlüssel wird an einen öffentlichen\n"
+"Schlüssel-Server (\"%s\") gesandt."
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Ja"
+#: src/gpaexportserverop.c:154
+msgid "Are you sure you want to distribute this key?"
+msgstr "Wollen Sie diesen Schlüssel wirklich veröffentlichen?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Nein"
+#: src/gpaexportserverop.c:233
+msgid "Error sending key(s) to the server."
+msgstr "Schlüssel konnte(n) nicht zum Server gesendet werden"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Die Schlüssel wurden zum Server gesandt."
@@ -1314,7 +1332,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Schlüssel erzeugen"
@@ -2108,7 +2126,7 @@ msgstr "Unvollständiger Schlüssel"
#: src/server-access.c:325
msgid "Could not contact keyserver"
-msgstr "Keinve Verbindung zum Schlüssel-Server möglich."
+msgstr "Keine Verbindung zum Schlüssel-Server möglich."
#: src/server-access.c:328
msgid "Unknown Error"
@@ -2285,7 +2303,7 @@ 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:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Einstellungen"
@@ -2323,7 +2341,7 @@ msgstr "Signatur: %s"
msgid "Signatures:"
msgstr "Signaturen (Beglaubigungen)"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
msgid "Card Manager"
msgstr "Kartenverwaltung"
@@ -2336,15 +2354,15 @@ msgstr "%s Karte erkannt."
msgid "Checking for card..."
msgstr "Warten auf Karte..."
-#: src/cardman.c:368
+#: src/cardman.c:369
msgid "No card found."
msgstr "Es wurde keine Karte gefunden."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr "Die ausgewählte Kartenanwendung is momentan nicht verfügbar."
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2358,51 +2376,51 @@ msgstr ""
"Sie können den Anwendungsauswahl-Modus auf \"Auto\" einstellen, um die "
"aktive Anwendung auszuwählen."
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr "Die ausgewählte Kartenanwendung steht nicht zur Verfügung."
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr "Fehler beim Zugriff auf die Karte."
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr "Auf die Karte kann nicht zugegriffen werden"
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr "Keine Karte"
-#: src/cardman.c:647
+#: src/cardman.c:651
msgid "_Card"
msgstr "_Karte"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr "Karteninformationen auffrischen"
-#: src/cardman.c:659
+#: src/cardman.c:663
msgid "Generate new key on card"
msgstr "Neuen Schlüssel auf Karte erzeugen"
-#: src/cardman.c:789
+#: src/cardman.c:793
msgid "This card application is not yet supported."
msgstr "Diese Kartenanwendung wird noch nicht unterstützt."
-#: src/cardman.c:933
+#: src/cardman.c:937
msgid "Application selection:"
msgstr "Anwendungsauswahl:"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr "Auto"
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr "Die verwendete GPGME Bibliothek unterstützt noch keine Smartcards."
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2419,31 +2437,31 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr "PUK Versuche frei:"
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr "CHV2 Versuche frei:"
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr "PIN zurücksetzen"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr "PIN ändern"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr "PUK ändern"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr "PUK zurücksetzen"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
@@ -2452,44 +2470,44 @@ msgstr ""
"Das Speichern der geänderten Werte war nicht erfolgreich.\n"
"(%s <%s>)"
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr "Es sind nur reine ASCII Zeichen erlaubt."
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr "Das \"<\" Zeichen kann nicht verwendet werden."
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr "Doppelte Leerzeichen sind nicht erlaubt."
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
"Die Gesamtlänge der Namensfelder darf nicht größer als 39 Zeichen sein."
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
msgid "Saving the field failed."
msgstr "Das speichern dieses Feldes ist fehlgeschlagen"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr "Ungültige Länge in den Spracheinstellungen."
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
"Die Spracheinstellungen dürfen nur aus den Kleinbuchstaben 'a' bis 'z' "
"bestehen."
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr "Das Feld darf nicht länger als 254 Zeichen sein."
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2503,7 +2521,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2519,7 +2537,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2531,7 +2549,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2541,7 +2559,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2549,7 +2567,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2567,7 +2585,7 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
@@ -2576,7 +2594,7 @@ msgstr ""
"Fehler beim Ändern oder Rücksetzen der PIN/PUK.\n"
"(%s <%s>)"
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
@@ -2585,92 +2603,92 @@ msgstr ""
"Fehler beim Holen des Schlüssels.\n"
"(%s <%s>)"
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr "Gefundene Schlüssel: %d, importiert: %d, nicht geändert: %d"
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr "Schlüssel holen"
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
msgid "<b>General</b>"
msgstr "<b>Allgemein</b>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr "Seriennummer:"
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr "Kartenversion:"
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr "Hersteller:"
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
msgid "<b>Personal</b>"
msgstr "<b>Persona</b>"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr "Anrede:"
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr "Vorname:"
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
msgid "Last name:"
msgstr "Nachname:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr "Sprache:"
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr "Login Daten:"
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
msgid "Public key URL:"
msgstr "URL des öff. Schlüssels:"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
msgid "<b>Keys</b>"
msgstr "<b>Schlüssel</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
msgid "Signature key:"
msgstr "Signaturschlüssel:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
msgid "Encryption key:"
msgstr "Verschlüsselungsschlüssel:"
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
msgid "Authentication key:"
msgstr "Authentifizierungsschlüssel:"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
msgid "Signature counter:"
msgstr "Signaturzähler:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr "<b>PIN</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
msgid "Force signature PIN:"
msgstr "Signatur PIN erzwingen:"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr "PIN Versuche frei:"
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr "Admin PIN Versuche frei:"
@@ -2678,11 +2696,11 @@ msgstr "Admin PIN Versuche frei:"
msgid "blocked"
msgstr "blockiert"
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
msgid "Learn keys"
msgstr "Schlüssel erlernen"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2695,11 +2713,11 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
msgid "Learning keys ..."
msgstr "Schlüssel erlernen..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2735,7 +2753,7 @@ msgstr ""
"\n"
"%s"
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
@@ -2745,7 +2763,7 @@ msgstr ""
"<b>qualifizierte Signaturen</b> zu erzeugen. Es ist anzuraten, die PIN auf "
"denselben Wert zu setzen die Sie auch für den NKS Schlüssel benutzen."
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
@@ -2753,7 +2771,7 @@ msgstr ""
"Sie setzen nun die PIN für den NKS Schlüssel, der für normale Signaturen, "
"zur Verschlüsselung und zur Authentifizierung verwendet wird."
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
@@ -2762,7 +2780,7 @@ msgstr ""
"Das Ändern der NullPIN war nicht erfolgreich.\n"
"(%s <%s>)"
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2775,7 +2793,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2792,7 +2810,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2805,7 +2823,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
@@ -2813,19 +2831,19 @@ msgstr ""
"<b>Eine NullPIN ist noch immer auf dieser Karte gesetzt</b>.\n"
"Sie müßen eine echte PIn setzen, bevor Sie die Karte benutzen können."
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr "Echte PIN setzen"
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
msgid "scanning ..."
msgstr "untersuche..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr "SigG PIN Versuche frei:"
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr "SigG PUK Versuche frei:"
diff --git a/po/es.gmo b/po/es.gmo
index c959441..b1b9a81 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index d157613..b9f0f6d 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+0100\n"
"PO-Revision-Date: 2008-03-11 09:35+0100\n"
"Last-Translator: \n"
"Language-Team: Spanish <es at li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
msgid "Open File"
msgstr "Abrir Archivo"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "Mensaje de GPA"
@@ -46,13 +46,13 @@ msgid "Clipboard"
msgstr "Portapapeles"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Archivo"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/_Editar"
@@ -95,7 +95,7 @@ msgid "Close the buffer"
msgstr "Limpiar buffer"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -129,11 +129,11 @@ msgstr "Descifrar el texto seleccionado"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "Anillo de claves"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Archivos"
@@ -142,35 +142,35 @@ msgstr "Archivos"
msgid "Card"
msgstr "Portapapeles"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>Principal</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "Usar valores predeterminados"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "Usar valor predeterminado"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "No usar la opción"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "Usar valores personalizados"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "Usar valor personalizado"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "Usar argumentos predeterminados"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -178,34 +178,58 @@ msgstr ""
"Hay cambios que no han sido aplicados. Al cambiar la configuración experta "
"estos cambios se aplicarán. ¿Desea continuar?"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "Configuración del motor de cifrado"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "Restablecer"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "Configurar las herramientas del sistema GnuPG."
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "Nivel:"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "Básico"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "Avanzado"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "Experto"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Sí"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_No"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "días"
@@ -226,7 +250,7 @@ msgstr "años"
msgid "never expires"
msgstr "no caduca nunca"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "desconocida"
@@ -303,7 +327,7 @@ msgstr "Cifrar el archivo seleccionado"
msgid "Decrypt the selected file"
msgstr "Descifrar el archivo seleccionado"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -441,14 +465,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Se ha copiado su clave secreta al archivo:\n"
"\n"
@@ -491,30 +515,27 @@ msgstr "Las claves se han exportado a %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"La clave seleccionada se enviará a un servidor de\n"
"claves público (\"%s\").\n"
"¿Está seguro de que quiere distribuir esta clave?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Sí"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Seguro que desea borrar esta clave?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_No"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "E_nviar claves al servidor"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Las claves se han enviado al servidor."
@@ -1355,7 +1376,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Generar clave"
@@ -2315,7 +2336,7 @@ msgstr "El servidor de claves que especificó no es válido"
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Preferencias"
@@ -2354,7 +2375,7 @@ msgstr "Firmas: %s"
msgid "Signatures:"
msgstr "Firmas:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "Gestor de Archivos"
@@ -2368,16 +2389,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "No se encontró ninguna clave."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2386,55 +2407,55 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "Portapapeles"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Generar clave"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Operación no soportada"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Cortar la selección"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2451,75 +2472,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PIN"
msgstr "Restablecer"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PUK"
msgstr "Restablecer"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Firmar archivo seleccionado"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2533,7 +2554,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2549,7 +2570,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2561,7 +2582,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2571,7 +2592,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2579,7 +2600,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2597,117 +2618,117 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "<b>Usar modo _avanzado</b>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Persona"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Nombre de Usuario:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "Claves _Públicas"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "<b>Principal</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Firmas:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Cifrando..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Puede autenticar"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Firmas:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
#, fuzzy
msgid "<b>PIN</b>"
msgstr "<b>Principal</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "firma por _separado"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2715,12 +2736,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "exportar claves"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2733,12 +2754,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Generando Clave..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2758,27 +2779,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2791,7 +2812,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2808,7 +2829,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2821,26 +2842,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Firmando..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index 0d5ca91..4b7ee2c 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 4bd040b..2f3953f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.8.0\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-11-21 09:49+0100\n"
-"PO-Revision-Date: 2011-12-12 10:12+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"PO-Revision-Date: 2014-12-08 17:37+0100\n"
"Last-Translator: Eric Lassauge <lassauge at users.sf.net>\n"
"Language-Team: <fr at li.org>\n"
"Language: fr\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "Open File"
msgstr "Ouvrir fichier"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "Message de GPA"
@@ -45,12 +45,12 @@ msgid "Clipboard"
msgstr "Presse-papiers"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
msgid "_File"
msgstr "_Fichier"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
msgid "_Edit"
msgstr "É_diter"
@@ -87,7 +87,7 @@ msgid "Close the buffer"
msgstr "Fermer tampon"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr "Quitter le programme"
@@ -119,11 +119,11 @@ 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:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "Trousseau de clefs"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Fichiers"
@@ -132,35 +132,35 @@ msgstr "Fichiers"
msgid "Card"
msgstr "Presse-papiers"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>Principal</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "Utiliser les valeurs par défaut"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "Utiliser la valeur par défaut"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "Ne pas utiliser l'option"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "Utiliser des valeurs personnalisées"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "Utiliser la valeur personnalisée"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "Utiliser l'argument par défaut"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -168,34 +168,60 @@ msgstr ""
"Vous avez demandé des changements qui ne sont pas appliqués. Passer au mode "
"expert appliquera ces changements. Désirez-vous continuer ?"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "Configuration du backend de chiffrement"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "Réinitialisation"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "Configurer les outils de votre installation GnuPG"
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "Niveau :"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "Basique"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "Avancé"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "Expert"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+#, fuzzy
+msgid "Configure backend to use a keyserver?"
+msgstr "Configurer les programmes « backend »"
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Oui"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Non"
+
+#: src/confdialog.c:1605
+#, fuzzy
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Configurer les programmes « backend »"
+
#: src/convert.c:29
msgid "days"
msgstr "jours"
@@ -216,7 +242,7 @@ msgstr "années"
msgid "never expires"
msgstr "N'expire jamais"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "Inconnu(e)"
@@ -293,7 +319,7 @@ msgstr "Chiffrer le fichier sélectionné"
msgid "Decrypt the selected file"
msgstr "Déchiffrer le fichier sélectionné"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr "Fermer la fenêtre"
@@ -429,7 +455,7 @@ msgid ""
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Une copie de votre clef secrète a été faite dans le fichier :\n"
"\n"
@@ -472,30 +498,27 @@ msgstr "Les clefs ont été exportées dans %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"La clé sélectionnée sera envoyée au serveur de\n"
"clé publique (« %s »).\n"
"Êtes-vous certain de vouloir distribuer cette clé ?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Oui"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Êtes-vous certain de vouloir effacer cette clef ?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Non"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Envoi de clefs au serveur"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Les clés ont été envoyées au serveur."
@@ -1334,7 +1357,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Générer clef"
@@ -2292,7 +2315,7 @@ 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:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr ""
@@ -2331,7 +2354,7 @@ msgstr "Signatures : %s"
msgid "Signatures:"
msgstr "Signatures :"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "Gestionnaire de fichiers"
@@ -2345,16 +2368,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Clefs introuvables."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2363,56 +2386,56 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "_Presse-papiers"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Générer une nouvelle clef"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Opération non supportée"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Couper la sélection"
-#: src/cardman.c:937
+#: src/cardman.c:941
#, fuzzy
msgid "Auto"
msgstr "Personnalisé"
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2429,75 +2452,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PIN"
msgstr "Réinitialisation"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PUK"
msgstr "Réinitialisation"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Signer le fichier sélectionné"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2511,7 +2534,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2527,7 +2550,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2539,7 +2562,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2549,7 +2572,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2557,7 +2580,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2575,117 +2598,117 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "<b>Interface utilisateur</b>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Personnelle"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Nom d'utilisateur :"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "Clefs _Publiques"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "<b>Principal</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Signatures :"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Chiffrement…"
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Authentifie"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Signatures :"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
#, fuzzy
msgid "<b>PIN</b>"
msgstr "<b>Principal</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "Signature _détachée"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2693,11 +2716,11 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
msgid "Learn keys"
msgstr ""
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2710,12 +2733,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Génération de clef…"
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2735,27 +2758,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2768,7 +2791,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2785,7 +2808,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2798,26 +2821,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Signature…"
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/gpa.pot b/po/gpa.pot
index ca30c5d..645d021 100644
--- a/po/gpa.pot
+++ b/po/gpa.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gpa 0.9.6\n"
+"Project-Id-Version: gpa 0.9.7\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -21,7 +21,7 @@ msgstr ""
msgid "Open File"
msgstr ""
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr ""
@@ -42,12 +42,12 @@ msgid "Clipboard"
msgstr ""
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
msgid "_File"
msgstr ""
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
msgid "_Edit"
msgstr ""
@@ -84,7 +84,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -116,11 +116,11 @@ msgstr ""
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr ""
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr ""
@@ -128,68 +128,92 @@ msgstr ""
msgid "Card"
msgstr ""
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr ""
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr ""
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr ""
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr ""
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr ""
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr ""
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr ""
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr ""
@@ -210,7 +234,7 @@ msgstr ""
msgid "never expires"
msgstr ""
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr ""
@@ -286,7 +310,7 @@ msgstr ""
msgid "Decrypt the selected file"
msgstr ""
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -418,7 +442,7 @@ msgid ""
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
#: src/gpabackupop.c:236
@@ -455,27 +479,22 @@ msgstr ""
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
+#: src/gpaexportserverop.c:146
#, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
+#: src/gpaexportserverop.c:154
+msgid "Are you sure you want to distribute this key?"
msgstr ""
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
+#: src/gpaexportserverop.c:233
+msgid "Error sending key(s) to the server."
msgstr ""
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr ""
@@ -1238,7 +1257,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr ""
@@ -2079,7 +2098,7 @@ msgstr ""
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr ""
@@ -2117,7 +2136,7 @@ msgstr ""
msgid "Signatures:"
msgstr ""
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
msgid "Card Manager"
msgstr ""
@@ -2130,15 +2149,15 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
msgid "No card found."
msgstr ""
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2147,51 +2166,51 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
msgid "_Card"
msgstr ""
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
msgid "Generate new key on card"
msgstr ""
-#: src/cardman.c:789
+#: src/cardman.c:793
msgid "This card application is not yet supported."
msgstr ""
-#: src/cardman.c:933
+#: src/cardman.c:937
msgid "Application selection:"
msgstr ""
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2208,72 +2227,72 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
msgid "Saving the field failed."
msgstr ""
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2287,7 +2306,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2303,7 +2322,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2315,7 +2334,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2325,7 +2344,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2333,7 +2352,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2351,106 +2370,106 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
msgid "<b>General</b>"
msgstr ""
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
msgid "<b>Personal</b>"
msgstr ""
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
msgid "Last name:"
msgstr ""
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
msgid "Public key URL:"
msgstr ""
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
msgid "<b>Keys</b>"
msgstr ""
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
msgid "Signature key:"
msgstr ""
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
msgid "Encryption key:"
msgstr ""
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
msgid "Authentication key:"
msgstr ""
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
msgid "Signature counter:"
msgstr ""
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
msgid "Force signature PIN:"
msgstr ""
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2458,11 +2477,11 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
msgid "Learn keys"
msgstr ""
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2475,11 +2494,11 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
msgid "Learning keys ..."
msgstr ""
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2499,27 +2518,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2532,7 +2551,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2549,7 +2568,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2562,25 +2581,25 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
msgid "scanning ..."
msgstr ""
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/ja.gmo b/po/ja.gmo
index d4e5dd4..0e604f0 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index cfbdb30..daf76e8 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -20,7 +20,7 @@ msgstr ""
msgid "Open File"
msgstr "�ե������"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "GPA ������"
@@ -44,13 +44,13 @@ msgid "Clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/�ե����� (_F)"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/�Խ� (_E)"
@@ -93,7 +93,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -130,12 +130,12 @@ msgstr "
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
#, fuzzy
msgid "Keyring"
msgstr "��«���ǥ���"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "�ե�����"
@@ -144,74 +144,99 @@ msgstr "
msgid "Card"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
#, fuzzy
msgid "Use default values"
msgstr "�ǥե���Ȥθ�������"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
#, fuzzy
msgid "Use default value"
msgstr "�ǥե���Ȥθ�������"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
#, fuzzy
msgid "Use default argument"
msgstr "�ǥե���Ȥΰ��������"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
#, fuzzy
msgid "Level:"
msgstr "��٥�"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
#, fuzzy
msgid "Basic"
msgstr "/�Хå����å�... (_B)"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
#, fuzzy
msgid "Expert"
msgstr "�������ݡ���"
+#: src/confdialog.c:1589
+#, fuzzy
+msgid "A keyserver has not been configured."
+msgstr "�������Ф����ꤵ��Ƥ��ޤ���"
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "�Ϥ� (_Y)"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "������ (_N)"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "��"
@@ -232,7 +257,7 @@ msgstr "ǯ"
msgid "never expires"
msgstr "̵����"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "̤��ǧ"
@@ -310,7 +335,7 @@ msgstr "
msgid "Decrypt the selected file"
msgstr "����ե���������沽����"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -458,14 +483,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"��̩���Υ��ԡ���\n"
"\n"
@@ -508,30 +533,27 @@ msgstr "
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"���줿���ϡ������������Ф���������ޤ���\n"
"(������: \"%s\")\n"
"�����ˤ��θ������ۤ��Ƥ�����Ǥ���?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "�Ϥ� (_Y)"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "�����ˤ��θ��������ޤ���?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "������ (_N)"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/����������... (_N)"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "�����Ф��������ޤ�����"
@@ -1361,7 +1383,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "��������"
@@ -2308,7 +2330,7 @@ msgstr "
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "����"
@@ -2348,7 +2370,7 @@ msgstr "
msgid "Signatures:"
msgstr "��̾:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "�ե�����ޥ͡�����"
@@ -2362,16 +2384,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "�������դ���ޤ���Ǥ�����"
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2380,58 +2402,58 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
#, fuzzy
msgid "The selected card application is not available."
msgstr "�������Ͻ�̾�ˤ����ѤǤ��ޤ���"
-#: src/cardman.c:397
+#: src/cardman.c:399
#, fuzzy
msgid "Error accessing the card."
msgstr "�ե����륢�������Υ��顼"
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
#, fuzzy
msgid "Error accessing card"
msgstr "�ե����륢�������Υ��顼"
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "��������"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "�����ݡ��Ȥ���Ƥ��ޤ���"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "����ե������Ź沽����"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2448,75 +2470,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
#, fuzzy
msgid "Change PIN"
msgstr "�����٤��ѹ� (_T)"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
#, fuzzy
msgid "Change PUK"
msgstr "�����٤��ѹ� (_T)"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "����ե�����˽�̾����"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2530,7 +2552,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2546,7 +2568,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2558,7 +2580,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2568,7 +2590,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2576,7 +2598,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2594,118 +2616,118 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, fuzzy, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr "������顼 \"%s\": %s"
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "���ԥ⡼�ɤ�Ȥ� (_A):"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "�Ŀ�"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
#, fuzzy
msgid "Salutation:"
msgstr "����: "
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
#, fuzzy
msgid "First name:"
msgstr "�ǥ��쥯�ȥ�̾:"
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "�桼��̾:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "������ (_P)"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "��̾���� (_A)"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "��̾:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "�Ź沽��..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "ǧ�ڲ�ǽ"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "��̾:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "��̾�˥��顼"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2713,12 +2735,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "���������ݡ���"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2731,12 +2753,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "����������..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2756,27 +2778,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2789,7 +2811,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2806,7 +2828,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2819,26 +2841,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "��̾��..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
@@ -3815,9 +3837,6 @@ msgstr ""
#~ msgid "No valid public key specified"
#~ msgstr "Ŭ�ڤʸ����������ꤵ��Ƥ��ޤ���"
-#~ msgid "Keyserver not specified"
-#~ msgstr "�������Ф����ꤵ��Ƥ��ޤ���"
-
#~ msgid "No valid secret key specified"
#~ msgstr "Ŭ�ڤ���̩�������ꤵ��Ƥ��ޤ���"
diff --git a/po/nl.gmo b/po/nl.gmo
index b58379a..b08fd69 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 3a50963..fc7a0eb 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -17,7 +17,7 @@ msgstr ""
msgid "Open File"
msgstr "Open bestand"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "GPA Bericht"
@@ -41,13 +41,13 @@ msgid "Clipboard"
msgstr "Naar _klembord"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Bestand"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "Bewerk"
@@ -90,7 +90,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -127,12 +127,12 @@ msgstr "Ontsleutel het geselecteerde bestand"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
#, fuzzy
msgid "Keyring"
msgstr "Keyring Editor"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Bestanden"
@@ -141,74 +141,98 @@ msgstr "Bestanden"
msgid "Card"
msgstr "Naar _klembord"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
#, fuzzy
msgid "Use default values"
msgstr "Stel standaard sleutel in"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
#, fuzzy
msgid "Use default value"
msgstr "Stel standaard sleutel in"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
#, fuzzy
msgid "Use default argument"
msgstr "Stel standaard sleutel in"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
#, fuzzy
msgid "Level:"
msgstr "Niveau"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
#, fuzzy
msgid "Basic"
msgstr "/_Backup...."
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
#, fuzzy
msgid "Expert"
msgstr "Exporteer"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nee"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "dagen"
@@ -229,7 +253,7 @@ msgstr "jaren"
msgid "never expires"
msgstr "vervalt nooit"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "onbekend"
@@ -307,7 +331,7 @@ msgstr "Versleutel het geselecteerde bestand"
msgid "Decrypt the selected file"
msgstr "Ontsleutel het geselecteerde bestand"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -455,14 +479,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Een kopie van uw geheime sleutel is gemaakt naar het bestand:\n"
"\n"
@@ -505,30 +529,27 @@ msgstr "De sleutels werden naar %s ge
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"De geselecteerde sleutel zal naar een publieke\n"
"keyserver gestuurd worden (\"%s\").\n"
"Bent u zeker dat u deze sleutel wilt verspreiden?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Ja"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Weet u zeker dat je deze sleutel wilt verwijderen?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Nee"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Stel keyserver in"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "De sleutels werden naar de server gestuurd."
@@ -1367,7 +1388,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Genereer sleutel"
@@ -2318,7 +2339,7 @@ msgstr "De keyserver die u specifieerde is niet geldig"
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Instellingen"
@@ -2358,7 +2379,7 @@ msgstr "Ondertekeningen"
msgid "Signatures:"
msgstr "Ondertekeningen:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "bestandsbeheerder"
@@ -2372,16 +2393,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Geen sleutels gevonden."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2390,57 +2411,57 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
#, fuzzy
msgid "The selected card application is not available."
msgstr ""
"De sleutel die u geselecteerd hebt is niet beschikbaar voor ondertekening"
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "Naar _klembord"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Genereer sleutel"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Actie niet ondersteund"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Versleutel het geselecteerde bestand"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2457,73 +2478,73 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Onderteken het geselecteerde bestand"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2537,7 +2558,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2553,7 +2574,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2565,7 +2586,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2575,7 +2596,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2583,7 +2604,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2601,118 +2622,118 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, fuzzy, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr "Fout bij het wissen van bestand \"%s\": %s"
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "Gebruik ge_avanceerde mode:"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Persoonlijk"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
#, fuzzy
msgid "Salutation:"
msgstr "Selectie:"
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
#, fuzzy
msgid "First name:"
msgstr "Map naam:"
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Gebruiker naam:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "_Publieke sleutels"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "Ondertekenen_als"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Ondertekeningen:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Aan het versleutelen..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Kan geauthenticeerd worden"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Ondertekeningen:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "_platte text ondertekening"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2720,12 +2741,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "exporteer sleutels"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2738,12 +2759,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Genereren van de sleutel..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2763,27 +2784,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2796,7 +2817,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2813,7 +2834,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2826,26 +2847,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Aan het ondertekenen..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index 63f58ae..7e5f30a 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index e6a2432..b2c2254 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -20,7 +20,7 @@ msgstr ""
msgid "Open File"
msgstr "Otwórz plik"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "Komunikat GPA"
@@ -43,13 +43,13 @@ msgid "Clipboard"
msgstr ""
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Plik"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/_Edycja"
@@ -92,7 +92,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -128,12 +128,12 @@ msgstr "Deszyfruje wybrany plik"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
#, fuzzy
msgid "Keyring"
msgstr "Edytor zbioru kluczy"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Pliki"
@@ -141,71 +141,95 @@ msgstr "Pliki"
msgid "Card"
msgstr ""
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr ""
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr ""
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
#, fuzzy
msgid "Level:"
msgstr "Poziom"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
#, fuzzy
msgid "Basic"
msgstr "/_Kopia zapasowa..."
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
#, fuzzy
msgid "Expert"
msgstr "Eksport"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Tak"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nie"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "dni"
@@ -226,7 +250,7 @@ msgstr "lat"
msgid "never expires"
msgstr "nie traci ważności"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "nieznany"
@@ -304,7 +328,7 @@ msgstr "Szyfruje wybrany plik"
msgid "Decrypt the selected file"
msgstr "Deszyfruje wybrany plik"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -451,14 +475,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Sporządzono kopię twojego tajnego klucza do pliku:\n"
"\n"
@@ -502,30 +526,27 @@ msgstr "Klucze zostały wyeksportowane do %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Wybrany klucz zostanie wysłany do publicznego\n"
"serwera kluczy (\"%s\").\n"
"Na pewno chcesz rozpowszechnić ten klucz?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Tak"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Jesteś pewna/pewien że chcesz usunąć ten klucz?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Nie"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/W_yślij klucze na serwer..."
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Klucze zostały wysłane na serwer."
@@ -1366,7 +1387,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Wygeneruj klucz"
@@ -2315,7 +2336,7 @@ msgstr "Podany serwer kluczy nie jest poprawny."
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Ustawienia"
@@ -2355,7 +2376,7 @@ msgstr "Podpis: %s"
msgid "Signatures:"
msgstr "Podpisy:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "menedżer plików"
@@ -2369,16 +2390,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Nie odnaleziono żadnych kluczy."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2387,55 +2408,55 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "/Okna/Menadżer _plików"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Wygeneruj klucz"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Operacja nie jest obsługiwana"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Szyfruje wybrany plik"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2452,73 +2473,73 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Podpisuje wybrany pliki"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2532,7 +2553,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2548,7 +2569,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2560,7 +2581,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2570,7 +2591,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2578,7 +2599,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2596,116 +2617,116 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "Użyj trybu zaawansowanego:"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Nie sprawdzone"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Nazwa użytkownika:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "Klucze _Publiczne"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "Podpisz _jako "
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Podpisy:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Szyfrowanie..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Można autoryzować"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Podpisy:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "podpisz _czystym tekstem"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2713,12 +2734,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "eksport kluczy"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2731,12 +2752,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Generowanie klucza..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2756,27 +2777,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2789,7 +2810,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2806,7 +2827,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2819,26 +2840,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Podpisywanie..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 6686caf..3513d88 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 37734fd..8a2e0a6 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -19,7 +19,7 @@ msgstr ""
msgid "Open File"
msgstr "Abrir arquivo"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "Mensagem do GPA"
@@ -42,13 +42,13 @@ msgid "Clipboard"
msgstr ""
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/Ar_quivo"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "_Editar"
@@ -91,7 +91,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -127,12 +127,12 @@ msgstr "Desencriptar o arquivo selecionado"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
#, fuzzy
msgid "Keyring"
msgstr "Editor do chaveiro digital"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Arquivos"
@@ -140,74 +140,98 @@ msgstr "Arquivos"
msgid "Card"
msgstr ""
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
#, fuzzy
msgid "Use default values"
msgstr "Indicar chave secreta padr�o."
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
#, fuzzy
msgid "Use default value"
msgstr "Indicar chave secreta padr�o."
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
#, fuzzy
msgid "Use default argument"
msgstr "Indicar destinat�rios default"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
#, fuzzy
msgid "Level:"
msgstr "Nunca"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
#, fuzzy
msgid "Basic"
msgstr "/_Backup..."
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
#, fuzzy
msgid "Expert"
msgstr "Exportar"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Sim"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_N�o"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "dias"
@@ -228,7 +252,7 @@ msgstr "anos"
msgid "never expires"
msgstr "jamais expira"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "desconhecido"
@@ -307,7 +331,7 @@ msgstr "Encriptar o arquivo selecionado"
msgid "Decrypt the selected file"
msgstr "Desencriptar o arquivo selecionado"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -454,14 +478,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Uma c�pia de sua chave secreta foi feita para o arquivo:\n"
"\n"
@@ -506,27 +530,24 @@ msgstr "Esta chave expirou! Imposs
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
+#: src/gpaexportserverop.c:146
#, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Sim"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Voc� est� certo que deseja apagar esta chave?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_N�o"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "_Servidor de chave:"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr ""
@@ -1360,7 +1381,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Gerar chave"
@@ -2321,7 +2342,7 @@ msgstr "O servidor de chaves especificado n
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Configura��o"
@@ -2362,7 +2383,7 @@ msgstr "Assinaturas"
msgid "Signatures:"
msgstr "Assinaturas:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "gerenciador de arquivos"
@@ -2376,16 +2397,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Nenhuma chave foi encontrada."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2394,57 +2415,57 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
#, fuzzy
msgid "The selected card application is not available."
msgstr "A chave que voc� selecionou n�o est� dispon�vel para assinar"
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "/Janelas/_Gerenciador de arquivos"
-#: src/cardman.c:657
+#: src/cardman.c:661
#, fuzzy
msgid "Reload card information"
msgstr "Mostrar as informa��es sobre a garantia\n"
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Gerar chave"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Opera��o n�o suportada"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Encriptar o arquivo selecionado"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2461,75 +2482,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
#, fuzzy
msgid "Change PIN"
msgstr "Alterar _a confian�a"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
#, fuzzy
msgid "Change PUK"
msgstr "Alterar _a confian�a"
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Assinar o arquivo selecionado"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2543,7 +2564,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2559,7 +2580,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2571,7 +2592,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2581,7 +2602,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2589,7 +2610,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2607,117 +2628,117 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, fuzzy, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr "Erro ao apagar o arquivo \"%s\": %s"
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "Usar modo _avan�ado:"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Usar modo _avan�ado:"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
#, fuzzy
msgid "Salutation:"
msgstr "Escolha: "
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
#, fuzzy
msgid "First name:"
msgstr "Nome de Diret�rio"
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Nome do Usu�rio:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "_Chaves p�blicas"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "Assinar _como"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Assinaturas:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Encriptar"
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
msgid "Authentication key:"
msgstr ""
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Assinaturas:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "_assinatura em texto puro"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2725,12 +2746,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "exportar chaves"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2743,12 +2764,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "/Chaves/_Gerar Chave..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2768,27 +2789,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2801,7 +2822,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2818,7 +2839,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2831,26 +2852,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Modo de assinatura"
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/ru.gmo b/po/ru.gmo
index c3fa01b..668168d 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index f2147d0..1467f7f 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -23,7 +23,7 @@ msgstr ""
msgid "Open File"
msgstr "Открыть файл"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "Сообщение GPA"
@@ -44,13 +44,13 @@ msgid "Clipboard"
msgstr "Буфер"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Файл"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/_Правка"
@@ -93,7 +93,7 @@ msgid "Close the buffer"
msgstr "Очистить буфер"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -127,11 +127,11 @@ msgstr "Расшифровать выбранный текст"
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "Ключи"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Файлы"
@@ -140,35 +140,35 @@ msgstr "Файлы"
msgid "Card"
msgstr "Буфер"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>Главное</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "Использовать значения по умолчанию"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "Использовать значение по умолчанию"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "Не использовать опцию"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "Использовать свои значения"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "Использовать свое значение"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "Использовать аргумент по умолчанию"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -176,34 +176,58 @@ msgstr ""
"Есть незафиксированные изменения. Изменение экспертной установки поможет их "
"запомнить. Продолжить?"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "Настройки шифровальной программы"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "Сбросить"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "Настройки инструментов GnuPG."
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "Уровень:"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "Обычный"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "Расширенный"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "Экспертный"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "Да"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "Нет"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "дней"
@@ -224,7 +248,7 @@ msgstr "лет"
msgid "never expires"
msgstr "неогр."
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "неизвестно"
@@ -301,7 +325,7 @@ msgstr "Зашифровать выбранный файл"
msgid "Decrypt the selected file"
msgstr "Расшифровать выбранный файл"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -439,14 +463,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Копия вашего закрытого ключа сохранена в файл:\n"
"\n"
@@ -489,30 +513,27 @@ msgstr "Ключи экспортированы в %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Выбранный ключ будет отправлен на открытый сервер открытых ключей\n"
"(\"%s\").\n"
"Действительно хотите распространить данный ключ?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "Да"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Вы действительно хотите удалить этот ключ?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "Нет"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/Отправить на сервер..."
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Ключи успешно отправлены на сервер."
@@ -1351,7 +1372,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Генерация ключа"
@@ -2297,7 +2318,7 @@ msgstr "Некорректно задан сервер ключей"
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Настройки"
@@ -2336,7 +2357,7 @@ msgstr "Подпись: %s"
msgid "Signatures:"
msgstr "Подписи:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "Менеджер _файлов"
@@ -2350,16 +2371,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Ключи не обнаружены."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2368,55 +2389,55 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "Буфер"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Генерация ключа"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Действие не поддерживается"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Вырезать выделенное в буфер"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2433,75 +2454,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PIN"
msgstr "Сбросить"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PUK"
msgstr "Сбросить"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Подписать выбранный файл"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2515,7 +2536,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2531,7 +2552,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2543,7 +2564,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2553,7 +2574,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2561,7 +2582,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2579,117 +2600,117 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "<b>Рас_ширенный режим</b>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Персон."
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Имя:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "_Открытые ключи"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "<b>Главное</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Подписи:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Шифрование..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Может авториз."
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Подписи:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
#, fuzzy
msgid "<b>PIN</b>"
msgstr "<b>Главное</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "_отделяемая подпись"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2697,12 +2718,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "экспорт ключей"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2715,12 +2736,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Создание ключа..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2740,27 +2761,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2773,7 +2794,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2790,7 +2811,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2803,26 +2824,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Подпись..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/sv.gmo b/po/sv.gmo
index c5f21c2..a4b0dea 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 1d3c0f1..fc803f7 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -22,7 +22,7 @@ msgstr ""
msgid "Open File"
msgstr "Öppna fil"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "GPA-meddelande"
@@ -43,12 +43,12 @@ msgid "Clipboard"
msgstr "Urklipp"
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
msgid "_File"
msgstr "_Arkiv"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
msgid "_Edit"
msgstr "R_edigera"
@@ -85,7 +85,7 @@ msgid "Close the buffer"
msgstr "Stäng bufferten"
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr "Avsluta programmet"
@@ -117,11 +117,11 @@ 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:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
msgid "Keyring"
msgstr "Nyckelring"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Filer"
@@ -130,35 +130,35 @@ msgstr "Filer"
msgid "Card"
msgstr "Urklipp"
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr "<b>Allmänt</b>"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr "Använd standardvärden"
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr "Använd standardvärde"
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr "Använd inte flaggan"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr "Använd anpassade värden"
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr "Använd anpassat värde"
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr "Använd standardargument"
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
@@ -166,34 +166,60 @@ msgstr ""
"Det finns ändringar som inte verkställts. Ändring av expertinställningen "
"kommer att verkställa dessa ändringar. Vill du fortsätta?"
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr "Konfiguration av krypteringsbakände"
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr "Återställ"
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr "Konfigurera verktygen för GnuPG-systemet."
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
msgid "Level:"
msgstr "Nivå:"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
msgid "Basic"
msgstr "Enkel"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr "Avancerat"
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
msgid "Expert"
msgstr "Expert"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+#, fuzzy
+msgid "Configure backend to use a keyserver?"
+msgstr "Konfigurera bakändesprogram"
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nej"
+
+#: src/confdialog.c:1605
+#, fuzzy
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Konfigurera bakändesprogram"
+
#: src/convert.c:29
msgid "days"
msgstr "dagar"
@@ -214,7 +240,7 @@ msgstr "år"
msgid "never expires"
msgstr "går aldrig ut"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "okänt"
@@ -291,7 +317,7 @@ msgstr "Kryptera markerad fil"
msgid "Decrypt the selected file"
msgstr "Dekryptera markerad fil"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr "Stäng fönstret"
@@ -419,14 +445,14 @@ msgid "Configure the backend programs"
msgstr "Konfigurera bakändesprogram"
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"En kopia av din hemliga nyckel har skapats i filen:\n"
"\n"
@@ -469,30 +495,27 @@ msgstr "Nycklarna har exporterats till %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Den valda nyckeln kommer att skickas till en\n"
"publik nyckelserver (\"%s\").\n"
"Är du säker på att du vill distribuera nyckeln?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Ja"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Är du säker på att du vill ta bort denna nyckel?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Nej"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Skicka nycklar till server"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Nycklarna har skickats till servern."
@@ -1319,7 +1342,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Skapa nyckel"
@@ -2268,7 +2291,7 @@ msgstr "URL:en angiven för nyckelservern är inte giltig."
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:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Inställningar"
@@ -2307,7 +2330,7 @@ msgstr "Signatur: %s"
msgid "Signatures:"
msgstr "Signaturer:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "Filhanterare"
@@ -2321,16 +2344,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Inga nycklar hittades."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2339,57 +2362,57 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
#, fuzzy
msgid "The selected card application is not available."
msgstr "Vald nyckel kan ej användas för signering."
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "_Urklipp"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Generera en ny nyckel"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "Åtgärden stöds inte"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "_Automatiskt val"
-#: src/cardman.c:937
+#: src/cardman.c:941
#, fuzzy
msgid "Auto"
msgstr "Anpassad"
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2406,75 +2429,75 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PIN"
msgstr "Återställ"
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
#, fuzzy
msgid "Reset PUK"
msgstr "Återställ"
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Signera markerad fil"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2488,7 +2511,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2504,7 +2527,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2516,7 +2539,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2526,7 +2549,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2534,7 +2557,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2552,117 +2575,117 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "<b>Användargränssnitt</b>"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Personligen"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Användarnamn:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "_Publika nycklar"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "<b>Allmänt</b>"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "Signaturer:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "Krypterar..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Kan authentisera"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "Signaturer:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
#, fuzzy
msgid "<b>PIN</b>"
msgstr "<b>Allmänt</b>"
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "_Frikopplad signatur"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2670,12 +2693,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "exportera nycklar"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2688,12 +2711,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Genererar nyckel..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2713,27 +2736,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2746,7 +2769,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2763,7 +2786,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2776,26 +2799,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "Signerar..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/tr.gmo b/po/tr.gmo
index cc9e5a5..b35fa6b 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index eaa927e..504271a 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -20,7 +20,7 @@ msgstr ""
msgid "Open File"
msgstr "Dosyay� A�"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "GPA Mesaj�"
@@ -43,13 +43,13 @@ msgid "Clipboard"
msgstr ""
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/_Dosya"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/D�_zen"
@@ -92,7 +92,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -128,12 +128,12 @@ msgstr "Se
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
#, fuzzy
msgid "Keyring"
msgstr "Anahtarl�k D�zenleyicisi"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "Dosyalar"
@@ -141,71 +141,95 @@ msgstr "Dosyalar"
msgid "Card"
msgstr ""
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr ""
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr ""
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
#, fuzzy
msgid "Level:"
msgstr "Seviye"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
#, fuzzy
msgid "Basic"
msgstr "/_Yedekle..."
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
#, fuzzy
msgid "Expert"
msgstr "D��ar� Yaz"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Evet"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Hay�r"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "g�n"
@@ -226,7 +250,7 @@ msgstr "y
msgid "never expires"
msgstr "asla bitmez"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "bilinmeyen"
@@ -304,7 +328,7 @@ msgstr "Se
msgid "Decrypt the selected file"
msgstr "Se�ili dosyay� ��z"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -451,14 +475,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Gizli anahtar�n�z�n bir kopyas� �u dosyaya yaz�ld�:\n"
"\n"
@@ -501,30 +525,27 @@ msgstr "Anahtarlar %s isimli dosyaya aktar
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Se�ili anahtar \"%s\" genel anahtar\n"
"sunucusuna g�nderilecektir.\n"
"Bu anahtar� da��tmak istedi�inizden emin misiniz?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "_Evet"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Bu anahtar� silmek istedi�inize emin misiniz?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "_Hay�r"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/Anahtarlar� Sunucuya _G�nder..."
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "Anahtarlar sunucuya yolland�."
@@ -1360,7 +1381,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "Anahtar yarat"
@@ -2308,7 +2329,7 @@ msgstr "Belitti
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "Ayarlar"
@@ -2348,7 +2369,7 @@ msgstr "
msgid "Signatures:"
msgstr "�mzalar:"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "dosya y�neticisi"
@@ -2362,16 +2383,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "Hi�bir anahtar bulunamad�."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2380,55 +2401,55 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "/Pencereler/_Dosya Y�neticisi"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "Anahtar yarat"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "��lem desteklenmiyor"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "Se�ili dosyay� �ifrele"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2445,73 +2466,73 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "Se�ili dosyay� imzala"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2525,7 +2546,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2541,7 +2562,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2553,7 +2574,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2563,7 +2584,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2571,7 +2592,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2589,116 +2610,116 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "U_zman modunu kullan:"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "Ki�isel"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "Kullan�c� Ad�:"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "Genel Anahtarlar"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "_Farkl� �mzala"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "�mzalar:"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "�ifreliyor..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "Do�rulayabilir"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "�mzalar:"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "_temiz yaz� imzas�"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2706,12 +2727,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "anahtarlar� d��ar� yaz"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2724,12 +2745,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "Anahtar Yarat�l�yor..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2749,27 +2770,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2782,7 +2803,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2799,7 +2820,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2812,26 +2833,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "�ifreliyor..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 01f57cc..446108f 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 c98b0f1..3673aac 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-11-21 09:49+0100\n"
+"POT-Creation-Date: 2014-12-12 08:51+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"
@@ -19,7 +19,7 @@ msgstr ""
msgid "Open File"
msgstr "�}���ɮ�"
-#: src/clipboard.c:413 src/confdialog.c:1285
+#: src/clipboard.c:413 src/confdialog.c:1286
msgid "GPA Message"
msgstr "GPA �T��"
@@ -42,13 +42,13 @@ msgid "Clipboard"
msgstr ""
#: src/clipboard.c:761 src/fileman.c:511 src/keymanager.c:925
-#: src/cardman.c:645
+#: src/cardman.c:649
#, fuzzy
msgid "_File"
msgstr "/�ɮ�"
#: src/clipboard.c:762 src/fileman.c:512 src/keymanager.c:926
-#: src/cardman.c:646
+#: src/cardman.c:650
#, fuzzy
msgid "_Edit"
msgstr "/�s��"
@@ -91,7 +91,7 @@ msgid "Close the buffer"
msgstr ""
#: src/clipboard.c:782 src/fileman.c:530 src/keymanager.c:936
-#: src/cardman.c:653
+#: src/cardman.c:657
msgid "Quit the program"
msgstr ""
@@ -127,12 +127,12 @@ msgstr "
msgid "Select the entire document"
msgstr ""
-#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:739
+#: src/clipboard.c:915 src/fileman.c:628 src/cardman.c:743
#, fuzzy
msgid "Keyring"
msgstr "�_��s�边"
-#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:741
+#: src/clipboard.c:917 src/keymanager.c:1133 src/cardman.c:745
msgid "Files"
msgstr "�ɮ�"
@@ -140,71 +140,95 @@ msgstr "
msgid "Card"
msgstr ""
-#: src/confdialog.c:1002
+#: src/confdialog.c:1003
msgid "<b>Main</b>"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default values"
msgstr ""
-#: src/confdialog.c:1159
+#: src/confdialog.c:1160
msgid "Use default value"
msgstr ""
-#: src/confdialog.c:1162
+#: src/confdialog.c:1163
msgid "Do not use option"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom values"
msgstr ""
-#: src/confdialog.c:1167
+#: src/confdialog.c:1168
msgid "Use custom value"
msgstr ""
-#: src/confdialog.c:1171
+#: src/confdialog.c:1172
msgid "Use default argument"
msgstr ""
-#: src/confdialog.c:1299
+#: src/confdialog.c:1300
msgid ""
"There are unapplied changes by you. Changing the expert setting will apply "
"those changes. Do you want to continue?"
msgstr ""
-#: src/confdialog.c:1344
+#: src/confdialog.c:1345
msgid "Crypto Backend Configuration"
msgstr ""
-#: src/confdialog.c:1350
+#: src/confdialog.c:1351
msgid "Reset"
msgstr ""
-#: src/confdialog.c:1369
+#: src/confdialog.c:1370
msgid "Configure the tools of the GnuPG system."
msgstr ""
-#: src/confdialog.c:1373
+#: src/confdialog.c:1374
#, fuzzy
msgid "Level:"
msgstr "�{��"
-#: src/confdialog.c:1382
+#: src/confdialog.c:1383
#, fuzzy
msgid "Basic"
msgstr "/�ƥ�... (&B)"
-#: src/confdialog.c:1383
+#: src/confdialog.c:1384
msgid "Advanced"
msgstr ""
-#: src/confdialog.c:1384
+#: src/confdialog.c:1385
#, fuzzy
msgid "Expert"
msgstr "��X"
+#: src/confdialog.c:1589
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#: src/confdialog.c:1590
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+#: src/confdialog.c:1592 src/gpaexportserverop.c:158
+#: src/gpafileencryptop.c:476 src/gpafileverifyop.c:183 src/gpgmetools.c:175
+#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "�O (&Y)"
+
+#: src/confdialog.c:1593 src/gpaexportserverop.c:159
+#: src/gpafileencryptop.c:477 src/gpafileverifyop.c:184 src/gpgmetools.c:176
+#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "�_ (&N)"
+
+#: src/confdialog.c:1605
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
#: src/convert.c:29
msgid "days"
msgstr "��"
@@ -225,7 +249,7 @@ msgstr "
msgid "never expires"
msgstr "�û��ͮ�"
-#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:514
+#: src/convert.c:115 src/cm-netkey.c:138 src/cm-netkey.c:516
msgid "unknown"
msgstr "�����W"
@@ -303,7 +327,7 @@ msgstr "
msgid "Decrypt the selected file"
msgstr "�ѱK�w����ɮ�"
-#: src/fileman.c:528 src/cardman.c:651
+#: src/fileman.c:528 src/cardman.c:655
msgid "Close the window"
msgstr ""
@@ -450,14 +474,14 @@ msgid "Configure the backend programs"
msgstr ""
#: src/gpabackupop.c:221
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"�K�_�w�g�Q�ƻs��s�ɮ� :\n"
"\n"
@@ -500,30 +524,27 @@ msgstr "
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#: src/gpaexportserverop.c:129
-#, c-format
+#: src/gpaexportserverop.c:146
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"�Q��ܪ����_�|�H�줽�_�F�A�� :\n"
"(\"%s\")��.\n"
"�n�T�w�o��o�Ǥ��_�� ?"
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:476
-#: src/gpafileverifyop.c:183 src/gpgmetools.c:175 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:61
-msgid "_Yes"
-msgstr "�O (&Y)"
+#: src/gpaexportserverop.c:154
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "�z�T�w�n�R���o�K�_?"
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:477
-#: src/gpafileverifyop.c:184 src/gpgmetools.c:176 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:63
-msgid "_No"
-msgstr "�_ (&N)"
+#: src/gpaexportserverop.c:233
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "�H�X���_����A��... (&N)"
-#: src/gpaexportserverop.c:187
+#: src/gpaexportserverop.c:268
msgid "The keys have been sent to the server."
msgstr "���_�w�Q�Ǩ줽�_�F�A��."
@@ -1347,7 +1368,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:658
+#: src/keygenwizard.c:450 src/cardman.c:662
msgid "Generate key"
msgstr "�إ߷s�_"
@@ -2276,7 +2297,7 @@ msgstr "
msgid "The data given for \"Auto key locate\" is not valid."
msgstr ""
-#: src/settingsdlg.c:928
+#: src/settingsdlg.c:929
msgid "Settings"
msgstr "�]�w"
@@ -2316,7 +2337,7 @@ msgstr "ñ
msgid "Signatures:"
msgstr "ñ�p"
-#: src/cardman.c:167 src/cardman.c:925
+#: src/cardman.c:167 src/cardman.c:929
#, fuzzy
msgid "Card Manager"
msgstr "�ɮz��"
@@ -2330,16 +2351,16 @@ msgstr ""
msgid "Checking for card..."
msgstr ""
-#: src/cardman.c:368
+#: src/cardman.c:369
#, fuzzy
msgid "No card found."
msgstr "�䤣��K�_."
-#: src/cardman.c:374
+#: src/cardman.c:375
msgid "The selected card application is currently not available."
msgstr ""
-#: src/cardman.c:375
+#: src/cardman.c:376
msgid ""
"Another process is using a different card application than the selected "
"one.\n"
@@ -2348,55 +2369,55 @@ msgid ""
"active application."
msgstr ""
-#: src/cardman.c:385
+#: src/cardman.c:386
msgid "The selected card application is not available."
msgstr ""
-#: src/cardman.c:397
+#: src/cardman.c:399
msgid "Error accessing the card."
msgstr ""
-#: src/cardman.c:398 src/cardman.c:432
+#: src/cardman.c:400 src/cardman.c:434
msgid "Error accessing card"
msgstr ""
-#: src/cardman.c:427
+#: src/cardman.c:429
msgid "No card"
msgstr ""
-#: src/cardman.c:647
+#: src/cardman.c:651
#, fuzzy
msgid "_Card"
msgstr "/����/�ɮz (&F)"
-#: src/cardman.c:657
+#: src/cardman.c:661
msgid "Reload card information"
msgstr ""
-#: src/cardman.c:659
+#: src/cardman.c:663
#, fuzzy
msgid "Generate new key on card"
msgstr "�إ߷s�_"
-#: src/cardman.c:789
+#: src/cardman.c:793
#, fuzzy
msgid "This card application is not yet supported."
msgstr "�ާ@���䴩"
-#: src/cardman.c:933
+#: src/cardman.c:937
#, fuzzy
msgid "Application selection:"
msgstr "�[�K�w����ɮ�"
-#: src/cardman.c:937
+#: src/cardman.c:941
msgid "Auto"
msgstr ""
-#: src/cardman.c:1014
+#: src/cardman.c:1018
msgid "The GPGME library is too old to support smartcards."
msgstr ""
-#: src/cm-openpgp.c:162
+#: src/cm-openpgp.c:170
msgid ""
"<b>Admin-PIN Required</b>\n"
"\n"
@@ -2413,73 +2434,73 @@ msgid ""
"This notice will be shown only once per session."
msgstr ""
-#: src/cm-openpgp.c:281 src/cm-netkey.c:968
+#: src/cm-openpgp.c:289 src/cm-netkey.c:973
msgid "PUK retry counter:"
msgstr ""
-#: src/cm-openpgp.c:282
+#: src/cm-openpgp.c:290
msgid "CHV2 retry counter: "
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-netkey.c:156
+#: src/cm-openpgp.c:402 src/cm-netkey.c:156
msgid "Reset PIN"
msgstr ""
-#: src/cm-openpgp.c:394 src/cm-openpgp.c:416 src/cm-netkey.c:157
+#: src/cm-openpgp.c:402 src/cm-openpgp.c:424 src/cm-netkey.c:157
msgid "Change PIN"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:157
+#: src/cm-openpgp.c:412 src/cm-netkey.c:157
msgid "Change PUK"
msgstr ""
-#: src/cm-openpgp.c:404 src/cm-netkey.c:156
+#: src/cm-openpgp.c:412 src/cm-netkey.c:156
msgid "Reset PUK"
msgstr ""
-#: src/cm-openpgp.c:677
+#: src/cm-openpgp.c:685
#, c-format
msgid ""
"Error saving the changed values.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:700
+#: src/cm-openpgp.c:708
msgid "Only plain ASCII is currently allowed."
msgstr ""
-#: src/cm-openpgp.c:702
+#: src/cm-openpgp.c:710
msgid "The \"<\" character may not be used."
msgstr ""
-#: src/cm-openpgp.c:704
+#: src/cm-openpgp.c:712
msgid "Double spaces are not allowed."
msgstr ""
-#: src/cm-openpgp.c:736
+#: src/cm-openpgp.c:744
msgid ""
"Total length of first and last name may not be longer than 39 characters."
msgstr ""
-#: src/cm-openpgp.c:739 src/cm-openpgp.c:777 src/cm-openpgp.c:804
-#: src/cm-openpgp.c:828 src/cm-openpgp.c:853 src/cm-openpgp.c:874
+#: src/cm-openpgp.c:747 src/cm-openpgp.c:785 src/cm-openpgp.c:812
+#: src/cm-openpgp.c:836 src/cm-openpgp.c:861 src/cm-openpgp.c:882
#, fuzzy
msgid "Saving the field failed."
msgstr "ñ�p�w����ɮ�"
-#: src/cm-openpgp.c:763
+#: src/cm-openpgp.c:771
msgid "Invalid length of the language preference."
msgstr ""
-#: src/cm-openpgp.c:771
+#: src/cm-openpgp.c:779
msgid "The language preference may only contain the letters 'a' through 'z'."
msgstr ""
-#: src/cm-openpgp.c:823 src/cm-openpgp.c:848
+#: src/cm-openpgp.c:831 src/cm-openpgp.c:856
msgid "The field may not be longer than 254 characters."
msgstr ""
-#: src/cm-openpgp.c:1074
+#: src/cm-openpgp.c:1082
msgid ""
"<b>Unblocking the PIN</b>\n"
"\n"
@@ -2493,7 +2514,7 @@ msgid ""
"at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1088
+#: src/cm-openpgp.c:1096
msgid ""
"<b>Changing the PIN</b>\n"
"\n"
@@ -2509,7 +2530,7 @@ msgid ""
"PIN. Please check the instructions of your issuer."
msgstr ""
-#: src/cm-openpgp.c:1105
+#: src/cm-openpgp.c:1113
msgid ""
"<b>Changing the Reset Code</b>\n"
"\n"
@@ -2521,7 +2542,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-openpgp.c:1115
+#: src/cm-openpgp.c:1123
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2531,7 +2552,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -2539,7 +2560,7 @@ msgid ""
"repeat that new value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1132
+#: src/cm-openpgp.c:1140
msgid ""
"<b>Changing the Admin-PIN</b>\n"
"\n"
@@ -2557,116 +2578,116 @@ msgid ""
"value at another prompt."
msgstr ""
-#: src/cm-openpgp.c:1175 src/cm-netkey.c:793
+#: src/cm-openpgp.c:1185 src/cm-netkey.c:798
#, c-format
msgid ""
"Error changing or resetting the PIN/PUK.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1289
+#: src/cm-openpgp.c:1299
#, c-format
msgid ""
"Error fetching the key.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-openpgp.c:1302
+#: src/cm-openpgp.c:1312
#, c-format
msgid "Keys found: %d, imported: %d, unchanged: %d"
msgstr ""
-#: src/cm-openpgp.c:1324
+#: src/cm-openpgp.c:1334
msgid "Fetch Key"
msgstr ""
-#: src/cm-openpgp.c:1401 src/cm-netkey.c:889 src/cm-dinsig.c:255
+#: src/cm-openpgp.c:1411 src/cm-netkey.c:894 src/cm-dinsig.c:255
#, fuzzy
msgid "<b>General</b>"
msgstr "�ϥζi���Ҧ� (&A):"
-#: src/cm-openpgp.c:1411 src/cm-netkey.c:898 src/cm-dinsig.c:264
+#: src/cm-openpgp.c:1421 src/cm-netkey.c:903 src/cm-dinsig.c:264
msgid "Serial number:"
msgstr ""
-#: src/cm-openpgp.c:1415 src/cm-netkey.c:902
+#: src/cm-openpgp.c:1425 src/cm-netkey.c:907
msgid "Card version:"
msgstr ""
-#: src/cm-openpgp.c:1419
+#: src/cm-openpgp.c:1429
msgid "Manufacturer:"
msgstr ""
-#: src/cm-openpgp.c:1428
+#: src/cm-openpgp.c:1438
#, fuzzy
msgid "<b>Personal</b>"
msgstr "�p��"
-#: src/cm-openpgp.c:1442
+#: src/cm-openpgp.c:1452
msgid "Salutation:"
msgstr ""
-#: src/cm-openpgp.c:1447
+#: src/cm-openpgp.c:1457
msgid "First name:"
msgstr ""
-#: src/cm-openpgp.c:1452
+#: src/cm-openpgp.c:1462
#, fuzzy
msgid "Last name:"
msgstr "�Ϊ̦W�� :"
-#: src/cm-openpgp.c:1457
+#: src/cm-openpgp.c:1467
msgid "Language:"
msgstr ""
-#: src/cm-openpgp.c:1462
+#: src/cm-openpgp.c:1472
msgid "Login data:"
msgstr ""
-#: src/cm-openpgp.c:1467
+#: src/cm-openpgp.c:1477
#, fuzzy
msgid "Public key URL:"
msgstr "���_ (&P)"
-#: src/cm-openpgp.c:1475 src/cm-netkey.c:934
+#: src/cm-openpgp.c:1485 src/cm-netkey.c:939
#, fuzzy
msgid "<b>Keys</b>"
msgstr "ñ�p�� (&a)"
-#: src/cm-openpgp.c:1492
+#: src/cm-openpgp.c:1502
#, fuzzy
msgid "Signature key:"
msgstr "ñ�p"
-#: src/cm-openpgp.c:1496
+#: src/cm-openpgp.c:1506
#, fuzzy
msgid "Encryption key:"
msgstr "�[�K��..."
-#: src/cm-openpgp.c:1500
+#: src/cm-openpgp.c:1510
#, fuzzy
msgid "Authentication key:"
msgstr "���\�o��"
-#: src/cm-openpgp.c:1504
+#: src/cm-openpgp.c:1514
#, fuzzy
msgid "Signature counter:"
msgstr "ñ�p"
-#: src/cm-openpgp.c:1512 src/cm-netkey.c:950
+#: src/cm-openpgp.c:1522 src/cm-netkey.c:955
msgid "<b>PIN</b>"
msgstr ""
-#: src/cm-openpgp.c:1524
+#: src/cm-openpgp.c:1534
#, fuzzy
msgid "Force signature PIN:"
msgstr "�¤�rñ�p (&C)"
-#: src/cm-openpgp.c:1528 src/cm-netkey.c:960
+#: src/cm-openpgp.c:1538 src/cm-netkey.c:965
msgid "PIN retry counter:"
msgstr ""
-#: src/cm-openpgp.c:1542
+#: src/cm-openpgp.c:1552
msgid "Admin-PIN retry counter:"
msgstr ""
@@ -2674,12 +2695,12 @@ msgstr ""
msgid "blocked"
msgstr ""
-#: src/cm-netkey.c:373
+#: src/cm-netkey.c:374
#, fuzzy
msgid "Learn keys"
msgstr "��X�K�_"
-#: src/cm-netkey.c:375
+#: src/cm-netkey.c:376
msgid ""
"For some or all of the keys available on the card, the GnuPG crypto engine "
"does not yet know the corresponding certificates.\n"
@@ -2692,12 +2713,12 @@ msgid ""
"If you are unsure what to do, just click the button."
msgstr ""
-#: src/cm-netkey.c:594
+#: src/cm-netkey.c:596
#, fuzzy
msgid "Learning keys ..."
msgstr "�إ߷s�_..."
-#: src/cm-netkey.c:637
+#: src/cm-netkey.c:639
#, c-format
msgid ""
"<b>Setting the Initial PIN</b> (%s)\n"
@@ -2717,27 +2738,27 @@ msgid ""
"%s"
msgstr ""
-#: src/cm-netkey.c:651
+#: src/cm-netkey.c:653
msgid ""
"You are now setting the PIN for the SigG key used to create <b>qualified "
"signatures</b>. You may want to set the PIN to the same value as used for "
"the NKS keys."
msgstr ""
-#: src/cm-netkey.c:654
+#: src/cm-netkey.c:656
msgid ""
"You are now setting the PIN for the NKS keys used for standard signatures, "
"encryption and authentication."
msgstr ""
-#: src/cm-netkey.c:683
+#: src/cm-netkey.c:686
#, c-format
msgid ""
"Error changing the NullPIN.\n"
"(%s <%s>)"
msgstr ""
-#: src/cm-netkey.c:733
+#: src/cm-netkey.c:736
msgid ""
"<b>Changing a PIN or PUK</b>\n"
"\n"
@@ -2750,7 +2771,7 @@ msgid ""
"way to unblock them!"
msgstr ""
-#: src/cm-netkey.c:745
+#: src/cm-netkey.c:748
msgid ""
"<b>Resetting a PUK</b>\n"
"\n"
@@ -2767,7 +2788,7 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:759
+#: src/cm-netkey.c:762
msgid ""
"<b>Resetting a PIN</b>\n"
"\n"
@@ -2780,26 +2801,26 @@ msgid ""
"another prompt."
msgstr ""
-#: src/cm-netkey.c:913
+#: src/cm-netkey.c:918
msgid ""
"<b>A NullPIN is still active on this card</b>.\n"
"You need to set a real PIN before you can make use of the card."
msgstr ""
-#: src/cm-netkey.c:919
+#: src/cm-netkey.c:924
msgid "Set initial PIN"
msgstr ""
-#: src/cm-netkey.c:940
+#: src/cm-netkey.c:945
#, fuzzy
msgid "scanning ..."
msgstr "ñ�p��..."
-#: src/cm-netkey.c:976
+#: src/cm-netkey.c:981
msgid "SigG PIN retry counter:"
msgstr ""
-#: src/cm-netkey.c:984
+#: src/cm-netkey.c:989
msgid "SigG PUK retry counter:"
msgstr ""
diff --git a/src/cardman.c b/src/cardman.c
index 844a44a..382284a 100644
--- a/src/cardman.c
+++ b/src/cardman.c
@@ -289,7 +289,7 @@ card_reload_finish_idle_cb (void *user_data)
static void
card_reload (GpaCardManager *cardman)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
const char *application;
char *command_buf = NULL;
const char *command;
@@ -327,14 +327,14 @@ card_reload (GpaCardManager *cardman)
}
else
auto_app = 1;
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- command,
- scd_data_cb, NULL,
- scd_inq_cb, NULL,
- scd_status_cb, cardman);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ command,
+ scd_data_cb, NULL,
+ scd_inq_cb, NULL,
+ scd_status_cb, cardman, &operr);
if (!err)
{
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
if (!auto_app
&& gpg_err_source (err) == GPG_ERR_SOURCE_SCD
&& gpg_err_code (err) == GPG_ERR_CONFLICT)
@@ -344,19 +344,20 @@ card_reload (GpaCardManager *cardman)
again to display an application selection conflict
error only if it is not due to our own connection to
the scdaemon. */
- if (!gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD RESTART",
- NULL, NULL, NULL, NULL,
- NULL, NULL)
- && !gpgme_op_assuan_result (cardman->gpgagent)->err)
+ if (!gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD RESTART",
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, &operr)
+ && !operr)
{
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- command,
- scd_data_cb, NULL,
- scd_inq_cb, NULL,
- scd_status_cb, cardman);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ command,
+ scd_data_cb, NULL,
+ scd_inq_cb, NULL,
+ scd_status_cb, cardman,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
}
}
}
@@ -388,9 +389,10 @@ card_reload (GpaCardManager *cardman)
{
g_debug ("assuan command `%s' failed: %s <%s>\n",
command, gpg_strerror (err), gpg_strsource (err));
- if (!gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD SERIALNO undefined",
- NULL, NULL, NULL, NULL, NULL, NULL))
+ if (!gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD SERIALNO undefined",
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, &operr) && !operr)
err = 0;
else
{
@@ -405,22 +407,22 @@ card_reload (GpaCardManager *cardman)
{
/* Get the event counter to avoid a duplicate reload due to
the ticker. */
- gpgme_op_assuan_transact (cardman->gpgagent,
- "GETEVENTCOUNTER",
- NULL, NULL,
- NULL, NULL,
- scd_status_cb, cardman);
+ gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "GETEVENTCOUNTER",
+ NULL, NULL,
+ NULL, NULL,
+ scd_status_cb, cardman, NULL);
/* Now we need to get the APPTYPE of the card so that the
correct GpaCM* object can can act on the data. */
command = "SCD GETATTR APPTYPE";
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- command,
- scd_data_cb, NULL,
- scd_inq_cb, NULL,
- scd_status_cb, cardman);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ command,
+ scd_data_cb, NULL,
+ scd_inq_cb, NULL,
+ scd_status_cb, cardman, &operr);
if (!err)
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT
|| gpg_err_code (err) == GPG_ERR_CARD_REMOVED)
@@ -522,11 +524,11 @@ ticker_cb (gpointer user_data)
/* Note that we are single threaded and thus there is no need to
lock the assuan context. */
- gpgme_op_assuan_transact (cardman->gpgagent,
- "GETEVENTCOUNTER",
- NULL, NULL,
- NULL, NULL,
- geteventcounter_status_cb, cardman);
+ gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "GETEVENTCOUNTER",
+ NULL, NULL,
+ NULL, NULL,
+ geteventcounter_status_cb, cardman, NULL);
return TRUE; /* Keep on ticking. */
}
@@ -564,8 +566,8 @@ card_genkey_completed (GpaCardManager *cardman, gpg_error_t err)
static void
card_genkey (GpaCardManager *cardman)
{
+ gpg_error_t err, operr;
GpaGenKeyCardOperation *op;
- gpg_error_t err;
char *keyattr;
if (cardman->cardtype != GPA_CM_OPENPGP_TYPE)
@@ -578,11 +580,13 @@ card_genkey (GpaCardManager *cardman)
/* Note: This test works only with GnuPG > 2.0.10 but that version
is anyway required for the card manager to work correctly. */
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD GETINFO deny_admin",
- NULL, NULL, NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD GETINFO deny_admin",
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
+
if (!err)
{
gpa_window_error ("Admin commands are disabled in scdamon.\n"
@@ -844,7 +848,7 @@ setup_app_selector_data_cb (void *opaque, const void *data, size_t datalen)
static void
setup_app_selector (GpaCardManager *cardman)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
membuf_t mb;
char *string;
char *p, *p0, *p1;
@@ -854,11 +858,11 @@ setup_app_selector (GpaCardManager *cardman)
init_membuf (&mb, 256);
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD GETINFO app_list",
- setup_app_selector_data_cb, &mb,
- NULL, NULL, NULL, NULL);
- if (err || gpgme_op_assuan_result (cardman->gpgagent)->err)
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD GETINFO app_list",
+ setup_app_selector_data_cb, &mb,
+ NULL, NULL, NULL, NULL, &operr);
+ if (err || operr)
{
g_free (get_membuf (&mb, NULL));
return;
diff --git a/src/cm-dinsig.c b/src/cm-dinsig.c
index 0a4a866..a8d1e14 100644
--- a/src/cm-dinsig.c
+++ b/src/cm-dinsig.c
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/* DINSIG is the old and still used standard for smartcards to create
@@ -32,7 +32,7 @@
#include <string.h>
#include <assert.h>
-#include "gpa.h"
+#include "gpa.h"
#include "gtktools.h"
#include "convert.h"
@@ -48,12 +48,12 @@ enum
ENTRY_SERIALNO,
ENTRY_LAST
- };
+ };
/* Object's class definition. */
-struct _GpaCMDinsigClass
+struct _GpaCMDinsigClass
{
GpaCMObjectClass parent_class;
};
@@ -81,7 +81,7 @@ static void gpa_cm_dinsig_finalize (GObject *object);
-/************************************************************
+/************************************************************
******************* Implementation *********************
************************************************************/
@@ -126,17 +126,17 @@ scd_getattr_cb (void *opaque, const char *status, const char *args)
if (parm->updfnc)
parm->updfnc (parm->card, entry_id, tmp);
else if (GTK_IS_LABEL (parm->card->entries[entry_id]))
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (parm->card->entries[entry_id]), tmp);
else
- gtk_entry_set_text
+ gtk_entry_set_text
(GTK_ENTRY (parm->card->entries[entry_id]), tmp);
xfree (tmp);
}
}
return 0;
-}
+}
/* Use the assuan machinery to load the bulk of the OpenPGP card data. */
@@ -152,7 +152,7 @@ reload_data (GpaCMDinsig *card)
{ NULL }
};
int attridx;
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
struct scd_getattr_parm parm;
gpgme_ctx_t gpgagent;
@@ -168,13 +168,13 @@ reload_data (GpaCMDinsig *card)
parm.entry_id = attrtbl[attridx].entry_id;
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err)
{
@@ -182,7 +182,7 @@ reload_data (GpaCMDinsig *card)
; /* Lost the card. */
else
{
- g_debug ("assuan command `%s' failed: %s <%s>\n",
+ g_debug ("assuan command `%s' failed: %s <%s>\n",
command, gpg_strerror (err), gpg_strsource (err));
}
clear_card_data (card);
@@ -206,12 +206,12 @@ add_table_row (GtkWidget *table, int *rowidx,
label = gtk_label_new (labelstr);
gtk_label_set_width_chars (GTK_LABEL (label), 22);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1,
- *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1,
+ *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
if (is_label)
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-
+
if (readonly)
{
if (!is_label && GTK_IS_ENTRY (widget))
@@ -225,7 +225,7 @@ add_table_row (GtkWidget *table, int *rowidx,
if (is_label)
gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
}
-
+
gtk_table_attach (GTK_TABLE (table), widget, 1, 2,
*rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
if (widget2)
@@ -259,18 +259,18 @@ construct_data_widget (GpaCMDinsig *card)
gtk_container_set_border_width (GTK_CONTAINER (table), 10);
gtk_container_add (GTK_CONTAINER (frame), table);
rowidx = 0;
-
+
card->entries[ENTRY_SERIALNO] = gtk_label_new (NULL);
add_table_row (table, &rowidx, _("Serial number:"),
card->entries[ENTRY_SERIALNO], NULL, 0);
gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
-
+
/* Info frame. */
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
vbox = gtk_vbox_new (FALSE, 5);
- text = g_strdup_printf
+ text = g_strdup_printf
(_("There is not much information to display for a %s card. "
"You may want to use the application selector button to "
"switch to another application available on this card."), "DINSIG");
@@ -281,12 +281,12 @@ construct_data_widget (GpaCMDinsig *card)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
-
+
}
-/************************************************************
+/************************************************************
****************** Object Management ********************
************************************************************/
@@ -296,7 +296,7 @@ gpa_cm_dinsig_class_init (void *class_ptr, void *class_data)
GpaCMDinsigClass *klass = class_ptr;
parent_class = g_type_class_peek_parent (klass);
-
+
G_OBJECT_CLASS (klass)->finalize = gpa_cm_dinsig_finalize;
}
@@ -313,7 +313,7 @@ gpa_cm_dinsig_init (GTypeInstance *instance, void *class_ptr)
static void
gpa_cm_dinsig_finalize (GObject *object)
-{
+{
/* GpaCMDinsig *card = GPA_CM_DINSIG (object); */
parent_class->finalize (object);
@@ -325,7 +325,7 @@ GType
gpa_cm_dinsig_get_type (void)
{
static GType this_type = 0;
-
+
if (!this_type)
{
static const GTypeInfo this_info =
@@ -340,23 +340,23 @@ gpa_cm_dinsig_get_type (void)
0, /* n_preallocs */
gpa_cm_dinsig_init
};
-
+
this_type = g_type_register_static (GPA_CM_OBJECT_TYPE,
"GpaCMDinsig",
&this_info, 0);
}
-
+
return this_type;
}
-/************************************************************
+/************************************************************
********************** Public API ************************
************************************************************/
GtkWidget *
gpa_cm_dinsig_new ()
{
- return GTK_WIDGET (g_object_new (GPA_CM_DINSIG_TYPE, NULL));
+ return GTK_WIDGET (g_object_new (GPA_CM_DINSIG_TYPE, NULL));
}
diff --git a/src/cm-geldkarte.c b/src/cm-geldkarte.c
index aebfb7c..577b4c8 100644
--- a/src/cm-geldkarte.c
+++ b/src/cm-geldkarte.c
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
-#include "gpa.h"
+#include "gpa.h"
#include "convert.h"
#include "cm-object.h"
@@ -52,12 +52,12 @@ enum
ENTRY_MAXAMOUNT1,
ENTRY_LAST
- };
+ };
/* Object's class definition. */
-struct _GpaCMGeldkarteClass
+struct _GpaCMGeldkarteClass
{
GpaCMObjectClass parent_class;
};
@@ -84,7 +84,7 @@ static void gpa_cm_geldkarte_finalize (GObject *object);
-/************************************************************
+/************************************************************
******************* Implementation *********************
************************************************************/
@@ -125,13 +125,13 @@ scd_getattr_cb (void *opaque, const char *status, const char *args)
if (parm->updfnc)
parm->updfnc (parm->card, entry_id, args);
else
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (parm->card->entries[entry_id]), args);
}
}
return 0;
-}
+}
/* Use the assuan machinery to load the bulk of the OpenPGP card data. */
@@ -158,7 +158,7 @@ reload_data (GpaCMGeldkarte *card, gpgme_ctx_t gpgagent)
{ NULL }
};
int attridx;
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
struct scd_getattr_parm parm;
@@ -169,13 +169,13 @@ reload_data (GpaCMGeldkarte *card, gpgme_ctx_t gpgagent)
parm.entry_id = attrtbl[attridx].entry_id;
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err)
{
@@ -183,7 +183,7 @@ reload_data (GpaCMGeldkarte *card, gpgme_ctx_t gpgagent)
; /* Lost the card. */
else
{
- g_debug ("assuan command `%s' failed: %s <%s>\n",
+ g_debug ("assuan command `%s' failed: %s <%s>\n",
command, gpg_strerror (err), gpg_strsource (err));
}
clear_card_data (card);
@@ -206,8 +206,8 @@ add_table_row (GtkWidget *table, int *rowidx, const char *labelstr)
label = gtk_label_new (labelstr);
gtk_label_set_width_chars (GTK_LABEL (label), 22);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1,
- *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1,
+ *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
@@ -253,35 +253,35 @@ construct_data_widget (GpaCMGeldkarte *card)
amount_table = gtk_table_new (3, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (amount_table), 10);
-
+
/* General frame. */
rowidx = 0;
- card->entries[ENTRY_CARDNO] = add_table_row
+ card->entries[ENTRY_CARDNO] = add_table_row
(general_table, &rowidx, _("Card number: "));
- card->entries[ENTRY_KBLZ] = add_table_row
+ card->entries[ENTRY_KBLZ] = add_table_row
(general_table, &rowidx, _("Short Bank Code number: "));
- card->entries[ENTRY_BANKTYPE] = add_table_row
+ card->entries[ENTRY_BANKTYPE] = add_table_row
(general_table, &rowidx, _("Bank type: "));
- card->entries[ENTRY_VALIDFROM] = add_table_row
+ card->entries[ENTRY_VALIDFROM] = add_table_row
(general_table, &rowidx, _("Card valid from: "));
- card->entries[ENTRY_EXPIRES] = add_table_row
+ card->entries[ENTRY_EXPIRES] = add_table_row
(general_table, &rowidx, _("Card expires: "));
- card->entries[ENTRY_COUNTRY] = add_table_row
+ card->entries[ENTRY_COUNTRY] = add_table_row
(general_table, &rowidx, _("Issuing country: "));
- card->entries[ENTRY_CURRENCY] = add_table_row
+ card->entries[ENTRY_CURRENCY] = add_table_row
(general_table, &rowidx, _("Currency: "));
- card->entries[ENTRY_ZKACHIPID] = add_table_row
+ card->entries[ENTRY_ZKACHIPID] = add_table_row
(general_table, &rowidx, _("ZKA chip Id: "));
- card->entries[ENTRY_OSVERSION] = add_table_row
+ card->entries[ENTRY_OSVERSION] = add_table_row
(general_table, &rowidx, _("Chip OS version: "));
gtk_container_add (GTK_CONTAINER (general_frame), general_table);
@@ -290,13 +290,13 @@ construct_data_widget (GpaCMGeldkarte *card)
/* Amount frame. */
rowidx = 0;
- card->entries[ENTRY_BALANCE] = add_table_row
+ card->entries[ENTRY_BALANCE] = add_table_row
(amount_table, &rowidx, _("Balance: "));
- card->entries[ENTRY_MAXAMOUNT] = add_table_row
+ card->entries[ENTRY_MAXAMOUNT] = add_table_row
(amount_table, &rowidx, _("General limit: "));
- card->entries[ENTRY_MAXAMOUNT1] = add_table_row
+ card->entries[ENTRY_MAXAMOUNT1] = add_table_row
(amount_table, &rowidx, _("Transaction limit: "));
gtk_container_add (GTK_CONTAINER (amount_frame), amount_table);
@@ -309,7 +309,7 @@ construct_data_widget (GpaCMGeldkarte *card)
-/************************************************************
+/************************************************************
****************** Object Management ********************
************************************************************/
@@ -319,7 +319,7 @@ gpa_cm_geldkarte_class_init (void *class_ptr, void *class_data)
GpaCMGeldkarteClass *klass = class_ptr;
parent_class = g_type_class_peek_parent (klass);
-
+
G_OBJECT_CLASS (klass)->finalize = gpa_cm_geldkarte_finalize;
}
@@ -336,7 +336,7 @@ gpa_cm_geldkarte_init (GTypeInstance *instance, void *class_ptr)
static void
gpa_cm_geldkarte_finalize (GObject *object)
-{
+{
/* GpaCMGeldkarte *card = GPA_CM_GELDKARTE (object); */
parent_class->finalize (object);
@@ -348,7 +348,7 @@ GType
gpa_cm_geldkarte_get_type (void)
{
static GType this_type = 0;
-
+
if (!this_type)
{
static const GTypeInfo this_info =
@@ -363,23 +363,23 @@ gpa_cm_geldkarte_get_type (void)
0, /* n_preallocs */
gpa_cm_geldkarte_init
};
-
+
this_type = g_type_register_static (GPA_CM_OBJECT_TYPE,
"GpaCMGeldkarte",
&this_info, 0);
}
-
+
return this_type;
}
-/************************************************************
+/************************************************************
********************** Public API ************************
************************************************************/
GtkWidget *
gpa_cm_geldkarte_new ()
{
- return GTK_WIDGET (g_object_new (GPA_CM_GELDKARTE_TYPE, NULL));
+ return GTK_WIDGET (g_object_new (GPA_CM_GELDKARTE_TYPE, NULL));
}
diff --git a/src/cm-netkey.c b/src/cm-netkey.c
index 8ddbcb7..656010b 100644
--- a/src/cm-netkey.c
+++ b/src/cm-netkey.c
@@ -319,7 +319,7 @@ reload_more_data_cb (void *opaque, const char *status, const char *args)
static void
reload_more_data (GpaCMNetkey *card)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
gpgme_ctx_t gpgagent;
GtkWidget *vbox;
struct reload_more_data_parm parm;
@@ -355,13 +355,14 @@ reload_more_data (GpaCMNetkey *card)
g_debug (" parm.ctx=%p", parm.ctx);
- err = gpgme_op_assuan_transact (gpgagent,
- "SCD LEARN --keypairinfo",
- NULL, NULL, NULL, NULL,
- reload_more_data_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ "SCD LEARN --keypairinfo",
+ NULL, NULL, NULL, NULL,
+ reload_more_data_cb, &parm, &operr);
g_debug (" assuan ret=%d", err);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (err)
g_debug ("SCD LEARN failed: %s", gpg_strerror (err));
@@ -479,6 +480,7 @@ reload_data (GpaCMNetkey *card)
};
int attridx;
gpg_error_t err = 0;
+ gpg_error_t operr;
char command[100];
struct scd_getattr_parm parm;
gpgme_ctx_t gpgagent;
@@ -497,13 +499,13 @@ reload_data (GpaCMNetkey *card)
parm.entry_id = attrtbl[attridx].entry_id;
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err && attrtbl[attridx].entry_id == ENTRY_NKS_VERSION)
{
@@ -616,7 +618,7 @@ learn_keys_clicked_cb (GtkButton *button, void *user_data)
static void
change_nullpin (GpaCMNetkey *card)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
GtkWidget *dialog;
gpgme_ctx_t gpgagent;
int is_sigg;
@@ -666,15 +668,16 @@ change_nullpin (GpaCMNetkey *card)
okay = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (okay)
{
- err = gpgme_op_assuan_transact (gpgagent,
- is_sigg
- ? "SCD PASSWD --nullpin PW1.CH.SIG"
- : "SCD PASSWD --nullpin PW1.CH",
- NULL, NULL,
- NULL, NULL,
- NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ is_sigg
+ ? "SCD PASSWD --nullpin PW1.CH.SIG"
+ : "SCD PASSWD --nullpin PW1.CH",
+ NULL, NULL,
+ NULL, NULL,
+ NULL, NULL, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (gpg_err_code (err) == GPG_ERR_CANCELED)
okay = 0; /* No need to reload the data. */
else if (err)
@@ -696,7 +699,7 @@ change_nullpin (GpaCMNetkey *card)
static void
change_or_reset_pin (GpaCMNetkey *card, int info_idx)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
GtkWidget *dialog;
gpgme_ctx_t gpgagent;
int reset_mode;
@@ -781,10 +784,12 @@ change_or_reset_pin (GpaCMNetkey *card, int info_idx)
snprintf (command, sizeof command, "SCD PASSWD%s %s",
reset_mode? " --reset":"", pwidstr);
- err = gpgme_op_assuan_transact (gpgagent, command,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent, command,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (gpg_err_code (err) == GPG_ERR_CANCELED)
okay = 0; /* No need to reload the data. */
else if (err)
diff --git a/src/cm-openpgp.c b/src/cm-openpgp.c
index 39ea38d..55a3081 100644
--- a/src/cm-openpgp.c
+++ b/src/cm-openpgp.c
@@ -132,12 +132,20 @@ get_manufacturer (unsigned int no)
case 0x0001: return "PPC Card Systems";
case 0x0002: return "Prism";
case 0x0003: return "OpenFortress";
- case 0x0004: return "Wewid AB";
+ case 0x0004: return "Wewid";
case 0x0005: return "ZeitControl";
+ case 0x0006: return "Yubico";
+ case 0x0007: return "OpenKMS";
+ case 0x0008: return "LogoEmail";
case 0x002A: return "Magrathea";
- /* 0x00000 and 0xFFFF are defined as test cards per spec,
- 0xFFF00 to 0xFFFE are assigned for use with randomly created
+
+ case 0x1337: return "Warsaw Hackerspace";
+
+ case 0xF517: return "FSIJ";
+
+ /* 0x0000 and 0xFFFF are defined as test cards per spec,
+ 0xFF00 to 0xFFFE are assigned for use with randomly created
serial numbers. */
case 0x0000:
case 0xffff: return "test card";
@@ -589,7 +597,7 @@ reload_data (GpaCMOpenpgp *card)
{ NULL }
};
int attridx;
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
struct scd_getattr_parm parm;
gpgme_ctx_t gpgagent;
@@ -608,13 +616,13 @@ reload_data (GpaCMOpenpgp *card)
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err)
{
@@ -640,7 +648,7 @@ static gpg_error_t
save_attr (GpaCMOpenpgp *card, const char *name,
const char *value, int is_escaped)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
char *command;
gpgme_ctx_t gpgagent;
@@ -662,13 +670,13 @@ save_attr (GpaCMOpenpgp *card, const char *name,
command = g_strdup_printf ("SCD SETATTR %s %s", name, p);
xfree (p);
}
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ NULL, NULL, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err && !(gpg_err_code (err) == GPG_ERR_CANCELED
&& gpg_err_source (err) == GPG_ERR_SOURCE_PINENTRY))
@@ -1042,7 +1050,7 @@ edit_focus_cb (GtkWidget *widget, GtkDirectionType direction, void *opaque)
static void
change_pin (GpaCMOpenpgp *card, int pinno)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
GtkWidget *dialog;
gpgme_ctx_t gpgagent;
int reset_mode = 0;
@@ -1121,7 +1129,7 @@ change_pin (GpaCMOpenpgp *card, int pinno)
"A fresh standard card has set the Admin-PIN to the value "
"<i>12345678</i>. However, the issuer of your card might "
"have initialized the card with a different Admin-PIN and "
- "that Admin-PIN might only be nown to the issuer. "
+ "that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current "
@@ -1163,10 +1171,12 @@ change_pin (GpaCMOpenpgp *card, int pinno)
snprintf (command, sizeof command, "SCD PASSWD%s %d",
reset_mode? " --reset":"", pinno+1);
- err = gpgme_op_assuan_transact (gpgagent, command,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent, command,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (gpg_err_code (err) == GPG_ERR_CANCELED)
okay = 0; /* No need to reload the data. */
else if (err)
diff --git a/src/cm-unknown.c b/src/cm-unknown.c
index 70ac99e..db27058 100644
--- a/src/cm-unknown.c
+++ b/src/cm-unknown.c
@@ -86,7 +86,7 @@ scd_atr_data_cb (void *opaque, const void *data, size_t datalen)
static void
reload_data (GpaCMUnknown *card)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
gpgme_ctx_t gpgagent;
membuf_t mb;
@@ -99,12 +99,12 @@ reload_data (GpaCMUnknown *card)
init_membuf (&mb, 512);
- err = gpgme_op_assuan_transact (gpgagent,
- "SCD APDU --dump-atr",
- scd_atr_data_cb, &mb,
- NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ "SCD APDU --dump-atr",
+ scd_atr_data_cb, &mb,
+ NULL, NULL, NULL, NULL, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (!err)
{
diff --git a/src/confdialog.c b/src/confdialog.c
index 892aee6..005d55d 100644
--- a/src/confdialog.c
+++ b/src/confdialog.c
@@ -32,6 +32,7 @@
#include "i18n.h"
#include "gpgmetools.h"
+#include "gtktools.h"
#include "options.h"
/* Violation of GNOME standards: Cancel does not revert previous
@@ -1569,3 +1570,44 @@ gpa_store_configured_keyserver (const char *value)
gpa_store_gpgconf_string ("gpg", "keyserver", value);
#endif
}
+
+
+/* Ask the user whether to configure GnuPG to use a keyserver. Return
+ NULL if it could or shall not be configured or the name of the
+ keyserver which needs to be g_freed. */
+char *
+gpa_configure_keyserver (GtkWidget *parent)
+{
+#ifdef ENABLE_KEYSERVER_SUPPORT
+ GtkWidget *msgbox;
+ char *keyserver;
+
+ msgbox = gtk_message_dialog_new
+ (GTK_WINDOW(parent), GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ "%s\n\n%s",
+ _("A keyserver has not been configured."),
+ _("Configure backend to use a keyserver?"));
+ gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
+ _("_Yes"), GTK_RESPONSE_YES,
+ _("_No"), GTK_RESPONSE_NO, NULL);
+ if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+ {
+ gtk_widget_destroy (msgbox);
+ return NULL;
+ }
+ gtk_widget_destroy (msgbox);
+ gpa_store_configured_keyserver ("hkp://keys.gnupg.net");
+ keyserver = gpa_load_configured_keyserver ();
+ if (!keyserver)
+ {
+ gpa_show_warning
+ (parent, _("Configuring the backend to use a keyserver failed"));
+ return NULL;
+ }
+ return keyserver;
+#else
+ (void)parent;
+ return NULL
+#endif
+}
diff --git a/src/confdialog.h b/src/confdialog.h
index 1d7857e..5a91650 100644
--- a/src/confdialog.h
+++ b/src/confdialog.h
@@ -25,13 +25,14 @@ GtkWidget *gpa_backend_config_dialog_new (void);
char *gpa_load_gpgconf_string (const char *cname, const char *name);
-void gpa_store_gpgconf_string (const char *cname,
+void gpa_store_gpgconf_string (const char *cname,
const char *name, const char *value);
char *gpa_load_configured_keyserver (void);
void gpa_store_configured_keyserver (const char *value);
+char *gpa_configure_keyserver (GtkWidget *parent);
#endif
diff --git a/src/gpa.c b/src/gpa.c
index 73335bd..d9db079 100644
--- a/src/gpa.c
+++ b/src/gpa.c
@@ -592,7 +592,8 @@ main (int argc, char *argv[])
gpa_options_update_default_key (gpa_options_get_instance ());
/* Now, make sure there are reasonable defaults for the default key
and keyserver. */
- if (!gpa_options_get_default_keyserver (gpa_options_get_instance ()))
+ if (!is_gpg_version_at_least ("2.1.0")
+ && !gpa_options_get_default_keyserver (gpa_options_get_instance ()))
{
GList *keyservers = keyserver_get_as_glist ();
gpa_options_set_default_keyserver (gpa_options_get_instance (),
diff --git a/src/gpabackupop.c b/src/gpabackupop.c
index 46aeba3..316dbb0 100644
--- a/src/gpabackupop.c
+++ b/src/gpabackupop.c
@@ -223,7 +223,7 @@ gpa_backup_operation_do_backup (GpaBackupOperation *op, gchar *filename)
"\t\"%s\"\n\n"
"This is sensitive information, "
"and should be stored carefully\n"
- "(for example, in a floppy disk "
+ "(for example, on a USB stick "
"kept in a safe place)."),
filename);
gpa_window_message (message, GPA_OPERATION (op)->window);
diff --git a/src/gpaexportserverop.c b/src/gpaexportserverop.c
index 9500ccb..4691423 100644
--- a/src/gpaexportserverop.c
+++ b/src/gpaexportserverop.c
@@ -27,6 +27,7 @@
#include "gtktools.h"
#include "gpgmetools.h"
#include "server-access.h"
+#include "confdialog.h"
#include "gpaexportserverop.h"
static GObjectClass *parent_class = NULL;
@@ -121,15 +122,38 @@ gpa_export_server_operation_get_type (void)
/* Internal */
static gboolean
-confirm_send (GtkWidget * parent, const gchar *server)
+confirm_send (GtkWidget *parent, const gchar *server)
{
- GtkWidget *msgbox = gtk_message_dialog_new
- (GTK_WINDOW(parent), GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
- _("The selected key will be sent to a public key\n"
- "server (\"%s\").\n"
- "Are you sure you want to distribute this key?"),
- server);
+ GtkWidget *msgbox;
+ char *info;
+ char *keyserver = NULL;
+
+ if (is_gpg_version_at_least ("2.1.0"))
+ {
+ keyserver = gpa_load_configured_keyserver ();
+ server = keyserver;
+ }
+
+ if (!server)
+ {
+ keyserver = gpa_configure_keyserver (parent);
+ if (!keyserver)
+ return FALSE;
+ server = keyserver;
+ }
+
+
+ info = g_strdup_printf (_("The selected key(s) will be sent to a public key\n"
+ "server (\"%s\")."), server);
+ g_free (keyserver);
+ msgbox = gtk_message_dialog_new
+ (GTK_WINDOW(parent), GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ "%s\n\n%s",
+ info,
+ _("Are you sure you want to distribute this key?"));
+ g_free (info);
+
gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
_("_Yes"), GTK_RESPONSE_YES,
_("_No"), GTK_RESPONSE_NO, NULL);
@@ -172,21 +196,77 @@ gpa_export_server_operation_get_destination (GpaExportOperation *operation,
}
}
+
+/* GnuPG 2.1 method to send keys to the keyserver. KEYLIST has a list
+ of keys to be sent. Returns true on success. */
+static gboolean
+send_keys (GpaExportServerOperation *op, GList *keylist)
+{
+ gpg_error_t err;
+ GList *item;
+ gpgme_key_t *keyarray;
+ gpgme_key_t key;
+ int i;
+
+ keyarray = g_malloc0_n (g_list_length (keylist)+1, sizeof *keyarray);
+ i = 0;
+ for (item = keylist; item; i++, item = g_list_next (item))
+ {
+ key = (gpgme_key_t) item->data;
+ if (!key || key->protocol != GPGME_PROTOCOL_OpenPGP)
+ continue;
+ gpgme_key_ref (key);
+ keyarray[i++] = key;
+ }
+
+ gpgme_set_protocol (GPA_OPERATION (op)->context->ctx, GPGME_PROTOCOL_OpenPGP);
+ err = gpgme_op_export_keys (GPA_OPERATION (op)->context->ctx,
+ keyarray, GPGME_KEYLIST_MODE_EXTERN, NULL);
+ for (i=0; keyarray[i]; i++)
+ gpgme_key_unref (keyarray[i]);
+ g_free (keyarray);
+
+ if (err)
+ {
+ gpa_show_warning (GPA_OPERATION (op)->window,
+ "%s\n\n(%s <%s>)",
+ _("Error sending key(s) to the server."),
+ gpg_strerror (err), gpg_strsource (err));
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+
static void
gpa_export_server_operation_complete_export (GpaExportOperation *operation)
{
GpaExportServerOperation *op = GPA_EXPORT_SERVER_OPERATION (operation);
- gpgme_key_t key;
- op->server = g_strdup (gpa_options_get_default_keyserver
- (gpa_options_get_instance ()));
+ int okay = 0;
- key = (gpgme_key_t) operation->keys->data;
- if (server_send_keys (op->server, key->subkeys->keyid, operation->dest,
- GPA_OPERATION (op)->window))
+ if (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 sending keys. */
+ if (send_keys (op, operation->keys))
+ okay = 1;
+ }
+ else
{
- gpa_window_message (_("The keys have been sent to the server."),
- GPA_OPERATION (op)->window);
+ gpgme_key_t key = (gpgme_key_t) operation->keys->data;
+
+ op->server = g_strdup (gpa_options_get_default_keyserver
+ (gpa_options_get_instance ()));
+ if (server_send_keys (op->server, key->subkeys->keyid, operation->dest,
+ GPA_OPERATION (op)->window))
+ okay = 1;
}
+
+ if (okay)
+ gpa_window_message (_("The keys have been sent to the server."),
+ GPA_OPERATION (op)->window);
}
/* API */
diff --git a/src/options.c b/src/options.c
index ccdd183..fc67c46 100644
--- a/src/options.c
+++ b/src/options.c
@@ -3,17 +3,17 @@
Copyright (C) 2005, 2008 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/>. */
@@ -61,7 +61,7 @@ GType
gpa_options_get_type (void)
{
static GType style_type = 0;
-
+
if (!style_type)
{
static const GTypeInfo style_info =
@@ -76,12 +76,12 @@ gpa_options_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_options_init,
};
-
+
style_type = g_type_register_static (G_TYPE_OBJECT,
"GpaOptions",
&style_info, 0);
}
-
+
return style_type;
}
@@ -105,7 +105,7 @@ static void
gpa_options_class_init (GpaOptionsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gpa_options_finalize;
@@ -121,7 +121,7 @@ gpa_options_class_init (GpaOptionsClass *klass)
make_signal (CHANGED_UI_MODE, object_class,
"changed_ui_mode",
G_STRUCT_OFFSET (GpaOptionsClass, changed_ui_mode));
- make_signal (CHANGED_SHOW_ADVANCED_OPTIONS, object_class,
+ make_signal (CHANGED_SHOW_ADVANCED_OPTIONS, object_class,
"changed_show_advanced_options",
G_STRUCT_OFFSET (GpaOptionsClass,
changed_show_advanced_options));
@@ -156,12 +156,12 @@ static void
gpa_options_finalize (GObject *object)
{
GpaOptions *options = GPA_OPTIONS (object);
-
+
g_free (options->options_file);
gpgme_key_unref (options->default_key);
g_free (options->default_key_fpr);
g_free (options->default_keyserver);
-
+
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -176,7 +176,7 @@ static GpaOptions *
gpa_options_new (void)
{
GpaOptions *options;
-
+
options = g_object_new (GPA_OPTIONS_TYPE, NULL);
return options;
@@ -300,7 +300,7 @@ determine_default_key (void)
err = gpgme_op_keylist_end (ctx);
if (gpg_err_code (err) != GPG_ERR_NO_ERROR)
{
- gpa_gpgme_warning (err);
+ gpa_gpgme_warning (err);
}
}
else if (gpg_err_code (err) != GPG_ERR_EOF)
@@ -323,7 +323,7 @@ gpa_options_update_default_key (GpaOptions *options)
if (! options->default_key_fpr)
update = TRUE;
- else if (gpg_err_code (gpgme_get_key (ctx, options->default_key_fpr,
+ else if (gpg_err_code (gpgme_get_key (ctx, options->default_key_fpr,
&key, TRUE)) == GPG_ERR_EOF)
{
gpa_window_error (_("The private key you selected as default is no "
@@ -357,6 +357,9 @@ gpa_options_update_default_key (GpaOptions *options)
void
gpa_options_set_default_keyserver (GpaOptions *options, const gchar *keyserver)
{
+ if (is_gpg_version_at_least ("2.1.0"))
+ return;
+
if (options->default_keyserver)
{
g_free (options->default_keyserver);
@@ -404,7 +407,7 @@ static void
gpa_options_save_settings (GpaOptions *options)
{
FILE *options_file;
-
+
g_assert(options->options_file != NULL);
options_file = g_fopen (options->options_file, "w");
if (!options_file)
@@ -420,7 +423,7 @@ gpa_options_save_settings (GpaOptions *options)
}
if (options->default_keyserver)
{
- /* we do not write the keyserver anymore to gpg.conf. */
+ /* we do not write the keyserver anymore to gpa.conf. */
/* fprintf (options_file, "keyserver %s\n", */
/* options->default_keyserver); */
}
@@ -444,7 +447,7 @@ gpa_options_save_settings (GpaOptions *options)
}
/* Write the keyserver to the backend. */
- if (options->default_keyserver)
+ if (options->default_keyserver && !is_gpg_version_at_least ("2.1.0"))
gpa_store_configured_keyserver (options->default_keyserver);
}
@@ -472,12 +475,12 @@ read_next_word (FILE *file, char *buffer, int size)
buffer[i++] = c;
}
buffer[i] = '\0';
-
+
return TRUE;
}
}
-typedef enum
+typedef enum
{
PARSE_OPTIONS_STATE_START,
PARSE_OPTIONS_STATE_HAVE_KEY,
@@ -490,7 +493,7 @@ static void
gpa_options_read_settings (GpaOptions *options)
{
FILE *options_file;
-
+
g_assert(options->options_file != NULL);
options_file = g_fopen (options->options_file, "r");
if (!options_file)
@@ -558,5 +561,7 @@ gpa_options_read_settings (GpaOptions *options)
/* Read the keyserver from the abckend. */
g_free (options->default_keyserver);
- options->default_keyserver = gpa_load_configured_keyserver ();
+ options->default_keyserver = NULL;
+ if (!is_gpg_version_at_least ("2.1.0"))
+ options->default_keyserver = gpa_load_configured_keyserver ();
}
diff --git a/src/settingsdlg.c b/src/settingsdlg.c
index fe9e529..ce57ee6 100644
--- a/src/settingsdlg.c
+++ b/src/settingsdlg.c
@@ -798,8 +798,9 @@ save_settings (SettingsDlg *dialog)
#ifdef ENABLE_KEYSERVER_SUPPORT
- gpa_options_set_default_keyserver (gpa_options_get_instance (),
- dialog->keyserver.url);
+ if (!dialog->gnupg21)
+ gpa_options_set_default_keyserver (gpa_options_get_instance (),
+ dialog->keyserver.url);
#endif /*ENABLE_KEYSERVER_SUPPORT*/
if (!dialog->akl.enabled)
--
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