summaryrefslogtreecommitdiffstats
path: root/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
diff options
context:
space:
mode:
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties')
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties25
1 files changed, 24 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
index 8b32174c3c..fd54363387 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
@@ -60,7 +60,27 @@ buttonDeleteIdentity = Delete
buttonLinkIdentity = Link Another Identity
addSshKeyPanelHeader = Add SSH Public Key
-addSshKeyHelp = (<a href="http://help.github.com/key-setup-redirect" target="_blank">GitHub's Guide to SSH Keys</a>)
+addSshKeyHelpTitle = How to Generate an SSH Key
+addSshKeyHelp = \
+ <ol>\
+ <li>\
+ From the Terminal or Git Bash, run <em>ssh-keygen</em>\
+ </li>\
+ <li>\
+ Confirm the default path <em>.ssh/id_rsa</em>\
+ </li>\
+ <li>\
+ Enter a passphrase (recommended) or leave it blank.<br>\
+ Remember this passphrase, as you will need it to unlock the<br>\
+ key whenever you use it.\
+ </li>\
+ <li>\
+ Open <em>~/.ssh/id_rsa.pub</em> and copy & paste the contents into<br>\
+ the box below, then click on "Add".<br>\
+ Note that <em>id_rsa.pub</em> is your public key and can be shared,<br>\
+ while <em>id_rsa</em> is your private key and should be kept secret.\
+ </li>\
+ <\ol>
invalidSshKeyError = Invalid SSH Key
sshJavaAppletNotAvailable = Open Key Unavailable: Java not enabled
@@ -75,8 +95,10 @@ watchedProjectName = Project Name
watchedProjectFilter = Only If
watchedProjectColumnEmailNotifications = Email Notifications
watchedProjectColumnNewChanges = New Changes
+watchedProjectColumnNewPatchSets = New Patch Sets
watchedProjectColumnAllComments = All Comments
watchedProjectColumnSubmittedChanges = Submitted Changes
+watchedProjectColumnAbandonedChanges = Abandoned Changes
contactFieldFullName = Full Name
contactFieldEmail = Preferred Email
@@ -99,6 +121,7 @@ titleRegisterNewEmail = Register Email Address
descRegisterNewEmail = \
<p>A confirmation link will be sent by email to this address.</p>\
<p>You must click on the link to complete the registration and make the address available for selection.</p>
+errorDialogTitleRegisterNewEmail = Email Registration Failed
newAgreement = New Contributor Agreement