diff options
| -rw-r--r-- | common/openpgpdefs.h | 2 | ||||
| -rw-r--r-- | dirmngr/http.c | 2 | ||||
| -rw-r--r-- | doc/DETAILS | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 6 | ||||
| -rw-r--r-- | g10/gpgcompose.c | 4 | ||||
| -rw-r--r-- | g10/keyserver.c | 2 | ||||
| -rw-r--r-- | g10/parse-packet.c | 4 | ||||
| -rw-r--r-- | po/ca.po | 6 | ||||
| -rw-r--r-- | po/cs.po | 6 | ||||
| -rw-r--r-- | po/da.po | 6 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/el.po | 6 | ||||
| -rw-r--r-- | po/eo.po | 6 | ||||
| -rw-r--r-- | po/es.po | 6 | ||||
| -rw-r--r-- | po/et.po | 6 | ||||
| -rw-r--r-- | po/fi.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/gl.po | 6 | ||||
| -rw-r--r-- | po/hu.po | 6 | ||||
| -rw-r--r-- | po/id.po | 14 | ||||
| -rw-r--r-- | po/it.po | 16 | ||||
| -rw-r--r-- | po/ja.po | 6 | ||||
| -rw-r--r-- | po/nb.po | 6 | ||||
| -rw-r--r-- | po/pl.po | 6 | ||||
| -rw-r--r-- | po/pt.po | 6 | ||||
| -rw-r--r-- | po/ro.po | 6 | ||||
| -rw-r--r-- | po/ru.po | 6 | ||||
| -rw-r--r-- | po/sk.po | 6 | ||||
| -rw-r--r-- | po/sv.po | 6 | ||||
| -rw-r--r-- | po/tr.po | 6 | ||||
| -rw-r--r-- | po/uk.po | 6 | ||||
| -rw-r--r-- | po/zh_CN.po | 6 | ||||
| -rw-r--r-- | po/zh_TW.po | 6 | ||||
| -rw-r--r-- | sm/gpgsm.c | 4 |
34 files changed, 100 insertions, 100 deletions
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index e200d6b3b..f8b86e1bd 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 f0fcd0d75..941ad4f5e 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 2fcdb2830..4b3f0afbe 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 @@ -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 7d8b1b769..cd5346fb0 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 40659f092..d7105de02 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 c30abcbe3..e02238bfd 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: @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -1949,13 +1949,13 @@ msgstr "ani la pasfrazon" 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 "seri losilojn e losilservilo" msgid "update all keys from a keyserver" @@ -2004,13 +2004,13 @@ msgstr "cambia una frase contrasea" 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" @@ -1956,13 +1956,13 @@ msgstr "muuda parooli" msgid "export keys" msgstr "ekspordi vtmed" -msgid "export keys to a key server" +msgid "export keys to a keyserver" msgstr "ekspordi vtmed vtmeserverisse" -msgid "import keys from a key server" +msgid "import keys from a keyserver" msgstr "impordi vtmed vtmeserverist" -msgid "search for keys on a key server" +msgid "search for keys on a keyserver" msgstr "otsi vtmeid vtmeserverist" msgid "update all keys from a keyserver" @@ -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" @@ -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" @@ -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" @@ -1952,13 +1952,13 @@ msgstr "jelszvltoztats" msgid "export keys" msgstr "kulcsok exportlsa" -msgid "export keys to a key server" +msgid "export keys to a keyserver" msgstr "kulcsok exportlsa kulcsszerverre" -msgid "import keys from a key server" +msgid "import keys from a keyserver" msgstr "kulcsok importlsa kulcsszerverrl" -msgid "search for keys on a key server" +msgid "search for keys on a keyserver" msgstr "kulcsok keresse kulcsszerveren" msgid "update all keys from a keyserver" @@ -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" @@ -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" @@ -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" @@ -1915,13 +1915,13 @@ msgstr "endre passfrasen" msgid "export keys" msgstr "eksportere nkler" -msgid "export keys to a key server" +msgid "export keys to a keyserver" msgstr "eksportere nkler til en nkkelserver" -msgid "import keys from a key server" +msgid "import keys from a keyserver" msgstr "importere nkler fra en nkkelserver" -msgid "search for keys on a key server" +msgid "search for keys on a keyserver" msgstr "ske etter nkler p en nkkelserver" msgid "update all keys from a keyserver" @@ -1970,13 +1970,13 @@ msgstr "zmiana hasa" 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" @@ -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" @@ -1954,13 +1954,13 @@ msgstr "schimb fraza-parol" 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" @@ -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" @@ -1960,13 +1960,13 @@ msgstr "zmeni heslo" msgid "export keys" msgstr "exportova ke" -msgid "export keys to a key server" +msgid "export keys to a keyserver" msgstr "exportova ke na server kov" -msgid "import keys from a key server" +msgid "import keys from a keyserver" msgstr "importova ke zo servera kov" -msgid "search for keys on a key server" +msgid "search for keys on a keyserver" msgstr "vyhada ke na serveri kov" msgid "update all keys from a keyserver" @@ -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" @@ -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" @@ -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 3d5f8bce3..51364a728 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 22aebfaa6..991db815c 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 e6fd70360..8663ac8dc 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")), |