Correct SSH Username to be just Username

Slightly clarify the UI to just say Username now, since that's
the name we use internally in the code, and in the database.

Change-Id: Ide4a10f6b2795ea8ba30d3aff22c0672bba5bd91
Signed-off-by: Shawn O. Pearce <sop@google.com>

Documentation/cmd-show-connections.txt

@@ -49,9 +49,9 @@ Idle::
 	alive resets the idle timer, about once a minute.
 
 User::
-	The SSH User Name of the account that is authenticated on
-	this connection.  If the -n option is used, this column
-	shows the Account Id instead.
+	The username of the account that is authenticated on this
+	connection.  If the -n option is used, this column shows
+	the Account Id instead.
 
 Remote Host::
 	Reverse lookup hostname, or if -n option is used, the remote

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java

@@ -45,9 +45,9 @@ public interface AccountConstants extends Constants {
   String buttonOpenSshKey();
   String buttonAddSshKey();
 
-  String sshUserName();
-  String buttonChangeSshUserName();
-  String invalidSshUserName();
+  String userName();
+  String buttonChangeUserName();
+  String invalidUserName();
 
   String sshKeyInvalid();
   String sshKeyAlgorithm();

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties

@@ -25,9 +25,9 @@ buttonClearSshKeyInput = Clear
 buttonOpenSshKey = Open Key ...
 buttonAddSshKey = Add
 
-sshUserName = SSH Username
-buttonChangeSshUserName = Change Username
-invalidSshUserName = SSH username must contain only letters, numbers, _, - or .
+userName = Username
+buttonChangeUserName = Change Username
+invalidUserName = Username must contain only letters, numbers, _, - or .
 
 sshKeyInvalid = Invalid Key
 sshKeyAlgorithm = Algorithm

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java

@@ -97,13 +97,13 @@ class SshPanel extends Composite {
     final FlowPanel body = new FlowPanel();
 
     userNameTxt = new NpTextBox();
-    userNameTxt.addKeyPressHandler(new SshUserNameValidator());
+    userNameTxt.addKeyPressHandler(new UserNameValidator());
     userNameTxt.addStyleName(Gerrit.RESOURCES.css().sshPanelUsername());
     userNameTxt.setVisibleLength(16);
-    userNameTxt.setReadOnly(!canEditSshUserName());
+    userNameTxt.setReadOnly(!canEditUserName());
 
-    changeUserName = new Button(Util.C.buttonChangeSshUserName());
-    changeUserName.setVisible(canEditSshUserName());
+    changeUserName = new Button(Util.C.buttonChangeUserName());
+    changeUserName.setVisible(canEditUserName());
     changeUserName.setEnabled(false);
     changeUserName.addClickHandler(new ClickHandler() {
       @Override
@@ -122,7 +122,7 @@ class SshPanel extends Composite {
     userNameRow.add(userNameTxt);
     userNameRow.add(changeUserName);
 
-    row(userInfo, 0, Util.C.sshUserName(), userNameRow);
+    row(userInfo, 0, Util.C.userName(), userNameRow);
     userInfo.getCellFormatter().addStyleName(0, 0,
         Gerrit.RESOURCES.css().topmost());
     userInfo.getCellFormatter().addStyleName(0, 0,
@@ -220,7 +220,7 @@ class SshPanel extends Composite {
     initWidget(body);
   }
 
-  private boolean canEditSshUserName() {
+  private boolean canEditUserName() {
     return Gerrit.getConfig().canEdit(Account.FieldName.USER_NAME);
   }
 
@@ -239,7 +239,7 @@ class SshPanel extends Composite {
   }
 
   void doChangeUserName() {
-    if (!canEditSshUserName()) {
+    if (!canEditUserName()) {
       return;
     }
 
@@ -279,7 +279,7 @@ class SshPanel extends Composite {
 
   void invalidUserName() {
     userNameTxt.setFocus(true);
-    new ErrorDialog(Util.C.invalidSshUserName()).center();
+    new ErrorDialog(Util.C.invalidUserName()).center();
   }
 
   void doBrowse() {
@@ -477,7 +477,7 @@ class SshPanel extends Composite {
     addKeyBlock.setVisible(show);
   }
 
-  private final class SshUserNameValidator implements KeyPressHandler {
+  private final class UserNameValidator implements KeyPressHandler {
     @Override
     public void onKeyPress(final KeyPressEvent event) {
       final char code = event.getCharCode();

gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html

@@ -34,7 +34,7 @@
     <h2>Sign In</h2>
     <table border="0">
       <tr>
-        <th>SSH Username:</th>
+        <th>Username:</th>
         <td>
           <form method="GET">
             <input type="text" size="30" name="ssh_user_name" />