[git] GnuPG - branch, master, updated. gnupg-2.1.12-79-g5ddccf4
by Werner Koch
cvs at cvs.gnupg.org
Tue Jun 14 09:09:20 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 5ddccf4fc650eeb08bee7bea3e6cd889e4e32fab (commit)
from 8d0ff5c2c23f556c8c88a8f7f0ab1555f8a17e74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5ddccf4fc650eeb08bee7bea3e6cd889e4e32fab
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jun 14 09:06:44 2016 +0200
doc: Consistently use 'keyserver'.
--
GnuPG-bug-id: 2383
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h
index e200d6b..f8b86e1 100644
--- a/common/openpgpdefs.h
+++ b/common/openpgpdefs.h
@@ -106,7 +106,7 @@ typedef enum
SIGSUBPKT_PREF_HASH = 21, /* Preferred hash algorithms. */
SIGSUBPKT_PREF_COMPR = 22, /* Preferred compression algorithms. */
SIGSUBPKT_KS_FLAGS = 23, /* Key server preferences. */
- SIGSUBPKT_PREF_KS = 24, /* Preferred key server. */
+ SIGSUBPKT_PREF_KS = 24, /* Preferred keyserver. */
SIGSUBPKT_PRIMARY_UID = 25, /* Primary user id. */
SIGSUBPKT_POLICY = 26, /* Policy URL. */
SIGSUBPKT_KEY_FLAGS = 27, /* Key flags. */
diff --git a/dirmngr/http.c b/dirmngr/http.c
index f0fcd0d..941ad4f 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -937,7 +937,7 @@ http_wait_response (http_t hd)
/* Shutdown one end of the socket is desired. As per HTTP/1.0 this
is not required but some very old servers (e.g. the original pksd
- key server didn't worked without it. */
+ keyserver didn't worked without it. */
if ((hd->flags & HTTP_FLAG_SHUTDOWN))
shutdown (hd->sock->fd, 1);
hd->in_data = 0;
diff --git a/doc/DETAILS b/doc/DETAILS
index 2fcdb28..4b3f0af 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1266,7 +1266,7 @@ Status codes are:
/pks/lookup/<gnupg_formatierte_user_id>?op=<operation>
This can be implemented using Hurd's translator mechanism.
- However, I think the whole key server stuff has to be re-thought;
+ However, I think the whole keyserver stuff has to be re-thought;
I have some ideas and probably create a white paper.
** Algorithm names for the "keygen.algo" prompt
diff --git a/g10/gpg.c b/g10/gpg.c
index 62e3227..1f2d416 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -448,10 +448,10 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aPasswd, "passwd", N_("change a passphrase")),
ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
ARGPARSE_c (aExport, "export" , N_("export keys") ),
- ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a key server") ),
- ARGPARSE_c (aRecvKeys, "recv-keys" , N_("import keys from a key server") ),
+ ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ),
+ ARGPARSE_c (aRecvKeys, "recv-keys" , N_("import keys from a keyserver") ),
ARGPARSE_c (aSearchKeys, "search-keys" ,
- N_("search for keys on a key server") ),
+ N_("search for keys on a keyserver") ),
ARGPARSE_c (aRefreshKeys, "refresh-keys",
N_("update all keys from a keyserver")),
ARGPARSE_c (aLocateKeys, "locate-keys", "@"),
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index 7d8b1b7..cd5346f 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -1509,10 +1509,10 @@ static struct option sig_options[] = {
"that VALUE is a file to read the data from. "
"(RFC 4880, Section 5.2.3.16)" },
{ "--key-server-preferences", sig_big_endian_arg,
- "Big-endian number encoding the key server preferences. "
+ "Big-endian number encoding the keyserver preferences. "
"(RFC 4880, Section 5.2.3.17)" },
{ "--key-server", sig_string_arg,
- "The preferred key server. (RFC 4880, Section 5.2.3.18)" },
+ "The preferred keyserver. (RFC 4880, Section 5.2.3.18)" },
{ "--primary-user-id", sig_flag,
"Sets the primary user id flag. (RFC 4880, Section 5.2.3.19)" },
{ "--policy-uri", sig_string_arg,
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 40659f0..d7105de 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1841,7 +1841,7 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs)
/* Loop over all URLs in STRLIST and fetch the key at that URL. Note
- that the fetch operation ignores the configured key servers and
+ that the fetch operation ignores the configured keyservers and
instead directly retrieves the keys. */
int
keyserver_fetch (ctrl_t ctrl, strlist_t urilist)
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index c30abcb..e02238b 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1374,12 +1374,12 @@ dump_sig_subpkt (int hashed, int type, int critical,
es_fprintf (listfp, " %d", buffer[i]);
break;
case SIGSUBPKT_KS_FLAGS:
- es_fputs ("key server preferences:", listfp);
+ es_fputs ("keyserver preferences:", listfp);
for (i = 0; i < length; i++)
es_fprintf (listfp, " %02X", buffer[i]);
break;
case SIGSUBPKT_PREF_KS:
- es_fputs ("preferred key server: ", listfp);
+ es_fputs ("preferred keyserver: ", listfp);
es_write_sanitized (listfp, buffer, length, ")", NULL);
break;
case SIGSUBPKT_PRIMARY_UID:
diff --git a/po/ca.po b/po/ca.po
index 0a64bc4..e5fcd81 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2033,13 +2033,13 @@ msgstr "canvia la contrasenya"
msgid "export keys"
msgstr "exporta claus"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exporta claus a un servidor de claus"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importa claus d'un servidor de claus"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "cerca claus en un servidor de claus"
msgid "update all keys from a keyserver"
diff --git a/po/cs.po b/po/cs.po
index 535f74c..211fb54 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1869,13 +1869,13 @@ msgstr "změnit heslo"
msgid "export keys"
msgstr "exportovat klÃÄe"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exportovat klÃÄe na server klÃÄů"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importovat klÃÄe ze serveru klÃÄů"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "vyhledat klÃÄe na serveru klÃÄů"
msgid "update all keys from a keyserver"
diff --git a/po/da.po b/po/da.po
index 7e6ff4b..8dfdaaf 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1985,13 +1985,13 @@ msgstr "ændr en adgangsfrase"
msgid "export keys"
msgstr "eksporter nøgler"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "eksporter nøgler til en nøgletjener"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importer nøgler fra en nøgleserver"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "søg efter nøgler på en nøgleserver"
msgid "update all keys from a keyserver"
diff --git a/po/de.po b/po/de.po
index f5886ef..c2fcf34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1861,13 +1861,13 @@ msgstr "Die Passphrase ändern"
msgid "export keys"
msgstr "Schlüssel exportieren"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "Schlüssel zu einem Schlü.server exportieren"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "Schlüssel von einem Schlü.server importieren"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "Schlüssel auf einem Schlü.server suchen"
msgid "update all keys from a keyserver"
diff --git a/po/el.po b/po/el.po
index d4316dd..99373ad 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1963,13 +1963,13 @@ msgstr "
msgid "export keys"
msgstr "åîáãùãÞ êëåéäéþí"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "åîáãùãÞ êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "åéóáãùãÞ êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "áíáæÞôçóç êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
msgid "update all keys from a keyserver"
diff --git a/po/eo.po b/po/eo.po
index 43b29a8..02ee245 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1949,13 +1949,13 @@ msgstr "
msgid "export keys"
msgstr "eksporti þlosilojn"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "eksporti þlosilojn al þlosilservilo"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importi þlosilojn de þlosilservilo"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "seræi þlosilojn æe þlosilservilo"
msgid "update all keys from a keyserver"
diff --git a/po/es.po b/po/es.po
index 09fc298..0d2ce38 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2004,13 +2004,13 @@ msgstr "cambia una frase contrase
msgid "export keys"
msgstr "exporta claves"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exporta claves a un servidor de claves"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importa claves desde un servidor de claves"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "busca claves en un servidor de claves"
msgid "update all keys from a keyserver"
diff --git a/po/et.po b/po/et.po
index ccd011b..c4a195b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1956,13 +1956,13 @@ msgstr "muuda parooli"
msgid "export keys"
msgstr "ekspordi võtmed"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "ekspordi võtmed võtmeserverisse"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "impordi võtmed võtmeserverist"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "otsi võtmeid võtmeserverist"
msgid "update all keys from a keyserver"
diff --git a/po/fi.po b/po/fi.po
index 48b8b2e..de8dcf4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1971,13 +1971,13 @@ msgstr "muuta salasanaa"
msgid "export keys"
msgstr "vie avaimia"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "vie avaimia palvelimelle"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "nouda avaimia avainpalvelimelta"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "etsi avaimia avainpalvelimelta"
msgid "update all keys from a keyserver"
diff --git a/po/fr.po b/po/fr.po
index 33eea36..0bd0e38 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1898,13 +1898,13 @@ msgstr "modifier une phrase secrète"
msgid "export keys"
msgstr "exporter les clefs"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exporter les clefs vers un serveur de clefs"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importer les clefs d'un serveur de clefs"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "chercher les clefs avec un serveur de clefs"
msgid "update all keys from a keyserver"
diff --git a/po/gl.po b/po/gl.po
index 7ea0c18..4293f23 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1964,13 +1964,13 @@ msgstr "cambia-lo contrasinal"
msgid "export keys"
msgstr "exportar chaves"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exportar chaves a un servidor de chaves"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importar chaves dun servidor de chaves"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "buscar chaves nun servidor de chaves"
msgid "update all keys from a keyserver"
diff --git a/po/hu.po b/po/hu.po
index 539aa00..21c66bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1952,13 +1952,13 @@ msgstr "jelsz
msgid "export keys"
msgstr "kulcsok exportálása"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "kulcsok exportálása kulcsszerverre"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "kulcsok importálása kulcsszerverrõl"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "kulcsok keresése kulcsszerveren"
msgid "update all keys from a keyserver"
diff --git a/po/id.po b/po/id.po
index c017cd4..619bfd5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -344,7 +344,7 @@ msgstr ""
#, fuzzy
msgid "use a log file for the server"
-msgstr "cari kunci di key server"
+msgstr "cari kunci di keyserver"
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
@@ -1955,14 +1955,14 @@ msgstr "ubah passphrase"
msgid "export keys"
msgstr "ekspor kunci"
-msgid "export keys to a key server"
-msgstr "ekspor kunci ke key server"
+msgid "export keys to a keyserver"
+msgstr "ekspor kunci ke keyserver"
-msgid "import keys from a key server"
-msgstr "impor kunci dari key server"
+msgid "import keys from a keyserver"
+msgstr "impor kunci dari keyserver"
-msgid "search for keys on a key server"
-msgstr "cari kunci di key server"
+msgid "search for keys on a keyserver"
+msgstr "cari kunci di keyserver"
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
diff --git a/po/it.po b/po/it.po
index 6b30fbd..df563ed 100644
--- a/po/it.po
+++ b/po/it.po
@@ -339,7 +339,7 @@ msgstr ""
#, fuzzy
msgid "use a log file for the server"
-msgstr "cerca delle chiavi su un key server"
+msgstr "cerca delle chiavi su un keyserver"
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
@@ -1962,17 +1962,17 @@ msgstr "cambia la passphrase"
msgid "export keys"
msgstr "esporta delle chiavi"
-msgid "export keys to a key server"
-msgstr "esporta le chiavi a un key server"
+msgid "export keys to a keyserver"
+msgstr "esporta le chiavi a un keyserver"
-msgid "import keys from a key server"
-msgstr "importa le chiavi da un key server"
+msgid "import keys from a keyserver"
+msgstr "importa le chiavi da un keyserver"
-msgid "search for keys on a key server"
-msgstr "cerca delle chiavi su un key server"
+msgid "search for keys on a keyserver"
+msgstr "cerca delle chiavi su un keyserver"
msgid "update all keys from a keyserver"
-msgstr "aggiorna tutte le chiavi da un key server"
+msgstr "aggiorna tutte le chiavi da un keyserver"
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
diff --git a/po/ja.po b/po/ja.po
index 889cd8b..49b2e1e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1802,13 +1802,13 @@ msgstr "パスフレーズã®å¤‰æ›´"
msgid "export keys"
msgstr "éµã‚’エクスãƒãƒ¼ãƒˆã™ã‚‹"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "éµã‚µãƒ¼ãƒã«éµã‚’エクスãƒãƒ¼ãƒˆã™ã‚‹"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "éµã‚µãƒ¼ãƒã‹ã‚‰éµã‚’インãƒãƒ¼ãƒˆã™ã‚‹"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "éµã‚µãƒ¼ãƒã®éµã‚’検索ã™ã‚‹"
msgid "update all keys from a keyserver"
diff --git a/po/nb.po b/po/nb.po
index 970241e..5d813db 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1915,13 +1915,13 @@ msgstr "endre passfrasen"
msgid "export keys"
msgstr "eksportere nøkler"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "eksportere nøkler til en nøkkelserver"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importere nøkler fra en nøkkelserver"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "søke etter nøkler på en nøkkelserver"
msgid "update all keys from a keyserver"
diff --git a/po/pl.po b/po/pl.po
index 2b8c12c..771d340 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1970,13 +1970,13 @@ msgstr "zmiana has
msgid "export keys"
msgstr "eksport kluczy do pliku"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "eksport kluczy do serwera kluczy"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "import kluczy z serwera kluczy"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "szukanie kluczy na serwerze"
msgid "update all keys from a keyserver"
diff --git a/po/pt.po b/po/pt.po
index c271492..17021a3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1954,13 +1954,13 @@ msgstr "muda a frase secreta"
msgid "export keys"
msgstr "exportar chaves"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exportar chaves para um servidor de chaves"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importar chaves de um servidor de chaves"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "procurar chaves num servidor de chaves"
msgid "update all keys from a keyserver"
diff --git a/po/ro.po b/po/ro.po
index 79d9bae..a40a28d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1954,13 +1954,13 @@ msgstr "schimb
msgid "export keys"
msgstr "exportã chei"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exportã chei pentru un server de chei"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importã chei de la un server de chei"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "cautã pentru chei pe un server de chei"
msgid "update all keys from a keyserver"
diff --git a/po/ru.po b/po/ru.po
index f311cd1..55a7e75 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1836,13 +1836,13 @@ msgstr "Ñменить фразу-пароль"
msgid "export keys"
msgstr "ÑкÑпортировать ключи"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "ÑкÑпортировать ключи на Ñервер ключей"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "импортировать ключи Ñ Ñервера ключей"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "иÑкать ключи на Ñервере ключей"
msgid "update all keys from a keyserver"
diff --git a/po/sk.po b/po/sk.po
index 3bf2c2b..0c0e13f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1960,13 +1960,13 @@ msgstr "zmeni
msgid "export keys"
msgstr "exportova» kµúèe"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exportova» kµúèe na server kµúèov"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importova» kµúèe zo servera kµúèov"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "vyhµada» kµúèe na serveri kµúèov"
msgid "update all keys from a keyserver"
diff --git a/po/sv.po b/po/sv.po
index a88dd81..bac433f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2019,13 +2019,13 @@ msgstr "ändra en lösenfras"
msgid "export keys"
msgstr "exportera nycklar"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "exportera nycklar till en nyckelserver"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "importera nycklar från en nyckelserver"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "sök efter nycklar hos en nyckelserver"
msgid "update all keys from a keyserver"
diff --git a/po/tr.po b/po/tr.po
index c9417fb..f522850 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1964,13 +1964,13 @@ msgstr "anahtar parolası değiştirir"
msgid "export keys"
msgstr "anahtarları gönderir"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan indirir"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "bir anahtar sunucusunda anahtarları arar"
msgid "update all keys from a keyserver"
diff --git a/po/uk.po b/po/uk.po
index b2d6860..2cb2202 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1857,13 +1857,13 @@ msgstr "змінити пароль"
msgid "export keys"
msgstr "екÑпортувати ключі"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "екÑпортувати ключі на Ñервер ключів"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "імпортувати ключі з Ñервера ключів"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "шукати ключі на Ñервері ключів"
msgid "update all keys from a keyserver"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d5f8bc..51364a7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1924,13 +1924,13 @@ msgstr "更改密ç "
msgid "export keys"
msgstr "导出密钥"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "把密钥导出到æŸä¸ªå…¬é’¥æœåŠ¡å™¨ä¸Š"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "从公钥æœåŠ¡å™¨ä¸Šå¯¼å…¥å¯†é’¥"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "在公钥æœåŠ¡å™¨ä¸Šæœå¯»å¯†é’¥"
msgid "update all keys from a keyserver"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 22aebfa..991db81 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1823,13 +1823,13 @@ msgstr "更改密語"
msgid "export keys"
msgstr "匯出金鑰"
-msgid "export keys to a key server"
+msgid "export keys to a keyserver"
msgstr "把金鑰匯出至金鑰伺æœå™¨"
-msgid "import keys from a key server"
+msgid "import keys from a keyserver"
msgstr "從金鑰伺æœå™¨åŒ¯å…¥é‡‘é‘°"
-msgid "search for keys on a key server"
+msgid "search for keys on a keyserver"
msgstr "在金鑰伺æœå™¨ä¸Šæœå°‹é‡‘é‘°"
msgid "update all keys from a keyserver"
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index e6fd703..8663ac8 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -211,8 +211,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aKeygen, "gen-key", N_("generate a new key pair")),
ARGPARSE_c (aDeleteKey, "delete-keys",
N_("remove keys from the public keyring")),
-/*ARGPARSE_c (aSendKeys, "send-keys", N_("export keys to a key server")),*/
-/*ARGPARSE_c (aRecvKeys, "recv-keys", N_("import keys from a key server")),*/
+/*ARGPARSE_c (aSendKeys, "send-keys", N_("export keys to a keyserver")),*/
+/*ARGPARSE_c (aRecvKeys, "recv-keys", N_("import keys from a keyserver")),*/
ARGPARSE_c (aImport, "import", N_("import certificates")),
ARGPARSE_c (aExport, "export", N_("export certificates")),
-----------------------------------------------------------------------
Summary of changes:
common/openpgpdefs.h | 2 +-
dirmngr/http.c | 2 +-
doc/DETAILS | 2 +-
g10/gpg.c | 6 +++---
g10/gpgcompose.c | 4 ++--
g10/keyserver.c | 2 +-
g10/parse-packet.c | 4 ++--
po/ca.po | 6 +++---
po/cs.po | 6 +++---
po/da.po | 6 +++---
po/de.po | 6 +++---
po/el.po | 6 +++---
po/eo.po | 6 +++---
po/es.po | 6 +++---
po/et.po | 6 +++---
po/fi.po | 6 +++---
po/fr.po | 6 +++---
po/gl.po | 6 +++---
po/hu.po | 6 +++---
po/id.po | 14 +++++++-------
po/it.po | 16 ++++++++--------
po/ja.po | 6 +++---
po/nb.po | 6 +++---
po/pl.po | 6 +++---
po/pt.po | 6 +++---
po/ro.po | 6 +++---
po/ru.po | 6 +++---
po/sk.po | 6 +++---
po/sv.po | 6 +++---
po/tr.po | 6 +++---
po/uk.po | 6 +++---
po/zh_CN.po | 6 +++---
po/zh_TW.po | 6 +++---
sm/gpgsm.c | 4 ++--
34 files changed, 100 insertions(+), 100 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list