diff options
author | Antoine GIRARD <sapk@users.noreply.github.com> | 2017-09-05 15:45:18 +0200 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-09-05 21:45:18 +0800 |
commit | 7c417bbb0d8f3213f34db50f62013e20492d044f (patch) | |
tree | 45898dac8949fdd6c8c948f7d2a737e1871c7331 /options/locale | |
parent | 5f4210a9b0c8c42fb8f157c233ddc5aec6d9972d (diff) | |
download | gitea-7c417bbb0d8f3213f34db50f62013e20492d044f.tar.gz gitea-7c417bbb0d8f3213f34db50f62013e20492d044f.zip |
Only check at least one email gpg key (#2266)
* Only require one email (possibly not yet validated)
* Update message error and check validation of commit
* Add integrations tests
* Complete integration for import
* Add pre-check/optimization
* Add some test (not finished)
* Finish
* Fix fixtures
* Fix typo
* Don't guess key ID
Diffstat (limited to 'options/locale')
-rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 21e886b5bf..6cf41d8b90 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -378,7 +378,7 @@ add_new_gpg_key = Add GPG Key ssh_key_been_used = This public key has already been used. ssh_key_name_used = A public key with same name already exists. gpg_key_id_used = A public GPG key with same id already exists. -gpg_key_email_not_found = The email attached to the GPG key couldn't be found or is not confirmed yet: %s +gpg_no_key_email_found = None of the emails attached to the GPG key could be found. subkeys = Subkeys key_id = Key ID key_name = Key Name |