Change "Anonymous Coward" with "Anonymous User" text

Gerrit may offend people by calling them "Anonymous Coward"

Task-Number: QTQAINFRA-232
Change-Id: I9ce24d604344de5676688011ec35a2a218b2e9db
Reviewed-on: http://dev-codereview.qt.nokia.com/162
Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com>

8 files changed, 14 insertions, 14 deletions

diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java
index 39c5d9c3ed..d06fb032a2 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java
@@ -26,7 +26,7 @@ public class AccountInfo {
   }
 
   /**
-   * Create an 'Anonymous Coward' account info, when only the id is known.
+   * Create an 'Anonymous User' account info, when only the id is known.
    * <p>
    * This constructor should only be a last-ditch effort, when the usual account
    * lookup has failed and a stale account id has been discovered in the data
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
index c915d1e17c..072d37dd1b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
@@ -102,8 +102,8 @@ public class FormatUtil {
    * <ul>
    * <li><code>A U. Thor &lt;author@example.com&gt;</code>: full populated</li>
    * <li><code>A U. Thor (12)</code>: missing email address</li>
-   * <li><code>Anonymous Coward &lt;author@example.com&gt;</code>: missing name</li>
-   * <li><code>Anonymous Coward (12)</code>: missing name and email address</li>
+   * <li><code>Anonymous User &lt;author@example.com&gt;</code>: missing name</li>
+   * <li><code>Anonymous User (12)</code>: missing name and email address</li>
    * </ul>
    */
   public static String nameEmail(final AccountInfo acct) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
index 9d5f4522bb..186fe2570c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
@@ -61,7 +61,7 @@ searchHint = Change #, SHA-1, tr:id, owner:email or reviewer:email
 searchButton = Search
 
 rpcStatusLoading = Loading ...
-anonymousCoward = Anonymous Coward
+anonymousCoward = Anonymous User
 
 sectionNavigation = Navigation
 sectionActions = Actions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
index 8205946ec8..9c65fcd67b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
@@ -449,14 +449,14 @@ public class ChangeHookRunner {
      */
     private String getDisplayName(final Account account) {
         if (account != null) {
-            String result = (account.getFullName() == null) ? "Anonymous Coward" : account.getFullName();
+            String result = (account.getFullName() == null) ? "Anonymous User" : account.getFullName();
             if (account.getPreferredEmail() != null) {
                 result += " (" + account.getPreferredEmail() + ")";
             }
             return result;
         }
 
-        return "Anonymous Coward";
+        return "Anonymous User";
     }
 
   /**
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
index 5fb5a7fa8f..16b7301ee0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
@@ -326,7 +326,7 @@ public class IdentifiedUser extends CurrentUser {
       name = ua.getPreferredEmail();
     }
     if (name == null || name.isEmpty()) {
-      name = "Anonymous Coward";
+      name = "Anonymous User";
     }
 
     String user = getUserName();
@@ -386,7 +386,7 @@ public class IdentifiedUser extends CurrentUser {
       if (0 < at) {
         name = email.substring(0, at);
       } else {
-        name = "Anonymous Coward";
+        name = "Anonymous User";
       }
     }
 
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
index afcfccd340..a064749adb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
@@ -141,7 +141,7 @@ public class FromAddressGeneratorProvider implements
         final Account account = accountCache.get(fromId).getAccount();
         String fullName = account.getFullName();
         if (fullName == null || "".equals(fullName)) {
-          fullName = "Anonymous Coward";
+          fullName = "Anonymous User";
         }
         senderName = namePattern.replace("user", fullName).toString();
 
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
index e6a1ebcf75..57817fabf5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
@@ -226,7 +226,7 @@ public abstract class OutgoingEmail {
   /** Lookup a human readable name for an account, usually the "full name". */
   protected String getNameFor(final Account.Id accountId) {
     if (accountId == null) {
-      return "Anonymous Coward";
+      return "Anonymous User";
     }
 
     final Account userAccount = args.accountCache.get(accountId).getAccount();
@@ -235,7 +235,7 @@ public abstract class OutgoingEmail {
       name = userAccount.getPreferredEmail();
     }
     if (name == null) {
-      name = "Anonymous Coward #" + accountId;
+      name = "Anonymous User #" + accountId;
     }
     return name;
   }
@@ -254,7 +254,7 @@ public abstract class OutgoingEmail {
       return email;
 
     } else /* (name == null && email == null) */{
-      return "Anonymous Coward #" + accountId;
+      return "Anonymous User #" + accountId;
     }
   }
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
index 6d56b4a11e..8a2424161d 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
@@ -192,7 +192,7 @@ public class FromAddressGeneratorProviderTest extends TestCase {
     replay(accountCache);
     final Address r = create().from(user);
     assertNotNull(r);
-    assertEquals("Anonymous Coward (Code Review)", r.name);
+    assertEquals("Anonymous User (Code Review)", r.name);
     assertEquals(ident.getEmailAddress(), r.email);
     verify(accountCache);
   }
@@ -245,7 +245,7 @@ public class FromAddressGeneratorProviderTest extends TestCase {
     replay(accountCache);
     final Address r = create().from(user);
     assertNotNull(r);
-    assertEquals("A Anonymous Coward B", r.name);
+    assertEquals("A Anonymous User B", r.name);
     assertEquals("my.server@email.address", r.email);
     verify(accountCache);
   }