doc: Consistently use 'keyserver'.

--
GnuPG-bug-id: 2383

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-06-14 09:06:44 +02:00
parent 8d0ff5c2c2
commit 5ddccf4fc6
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
34 changed files with 100 additions and 100 deletions

View File

@ -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. */

View File

@ -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;

View File

@ -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

View File

@ -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", "@"),

View File

@ -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,

View File

@ -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)

View File

@ -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:

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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")),