diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-06-10 10:32:36 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-10 10:32:36 +0000 |
| commit | 683e7b30784648453426f3c6d117b7e284417263 (patch) | |
| tree | d0aceae9fa344f1843c97cf12bffa3977147c92a | |
| parent | 895519a83e186071a6144917806250fb8da59036 (diff) | |
| download | gitlab-ce-683e7b30784648453426f3c6d117b7e284417263.tar.gz | |
List ssh-ed25519 example
| -rw-r--r-- | app/views/profiles/keys/_form.html.haml | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml index 7846cdbcd52..63ef5eaa172 100644 --- a/app/views/profiles/keys/_form.html.haml +++ b/app/views/profiles/keys/_form.html.haml @@ -4,8 +4,8 @@ .form-group = f.label :key, s_('Profiles|Key'), class: 'label-bold' - %p= _("Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key.") - = f.text_area :key, class: "form-control js-add-ssh-key-validation-input qa-key-public-key-field", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"') + %p= _("Paste your public SSH key, which is usually contained in the file '~/.ssh/id_ed25519.pub' or '~/.ssh/id_rsa.pub' and begins with 'ssh-ed25519' or 'ssh-rsa'. Don't use your private SSH key.") + = f.text_area :key, class: "form-control js-add-ssh-key-validation-input qa-key-public-key-field", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-ed25519 …" or "ssh-rsa …"') .form-group = f.label :title, _('Title'), class: 'label-bold' = f.text_field :title, class: "form-control input-lg qa-key-title-field", required: true, placeholder: s_('Profiles|e.g. My MacBook key') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4a4626e5ab6..20c8a834d04 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6955,7 +6955,7 @@ msgstr "" msgid "Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}" msgstr "" -msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key." +msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_ed25519.pub' or '~/.ssh/id_rsa.pub' and begins with 'ssh-ed25519' or 'ssh-rsa'. Don't use your private SSH key." msgstr "" msgid "Path" @@ -7642,7 +7642,7 @@ msgstr "" msgid "Profiles|Type your %{confirmationValue} to confirm:" msgstr "" -msgid "Profiles|Typically starts with \"ssh-rsa …\"" +msgid "Profiles|Typically starts with \"ssh-ed25519 …\" or \"ssh-rsa …\"" msgstr "" msgid "Profiles|Update profile settings" |