diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-02 08:29:50 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-05-04 15:01:53 -0500 |
| commit | 9e2078b1796dbc8dee201710b4680fb79114cbf3 (patch) | |
| tree | 56442f9b5ef99233aa2e73b407b37b968f267450 | |
| parent | 3f202c780834557557baa4b3503690b629bf4222 (diff) | |
pacman-key: clarify messages, s/keychain/keyring/
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/pacman-key.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 87d7658f..7d6f3875 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -116,11 +116,11 @@ get_from() { generate_master_key() { # Generate the master key, which will be in both pubring and secring "${GPG_PACMAN[@]}" --gen-key --batch <<EOF -%echo Generating pacman keychain master key... +%echo Generating pacman keyring master key... Key-Type: RSA Key-Length: 2048 Key-Usage: sign -Name-Real: Pacman Keychain Master Key +Name-Real: Pacman Keyring Master Key Name-Email: pacman@localhost Expire-Date: 0 %commit @@ -315,7 +315,7 @@ populate_keyring() { add_keys() { if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}" ; then - error "$(gettext "A specified keyfile could not be added to the gpg keychain.")" + error "$(gettext "A specified keyfile could not be added to the keyring.")" exit 1 fi } @@ -323,7 +323,7 @@ add_keys() { delete_keys() { check_keyids_exist if ! "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}" ; then - error "$(gettext "A specified key could not be removed from the gpg keychain.")" + error "$(gettext "A specified key could not be removed from the keyring.")" exit 1 fi } @@ -345,7 +345,7 @@ edit_keys() { export_keys() { check_keyids_exist if ! "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}" ; then - error "$(gettext "A specified key could not be exported from the gpg keychain.")" + error "$(gettext "A specified key could not be exported from the keyring.")" exit 1 fi } |