Merge pull request #5479 from Delizald/5389_project_account_identifier_fix

Change 'eMail' to 'email address'

Author: AenBleidd

Diff for: android/BOINC/app/src/main/java/edu/berkeley/boinc/utils/BOINCErrors.kt

@@ -34,7 +34,7 @@ const val ERR_CONNECT = -107 // connection problems
 const val ERR_GETHOSTBYNAME = -113
 
 // can not resolve name. no DNS -> no Internet?!
-const val ERR_DB_NOT_FOUND = -136 // e.g. eMail invalid
+const val ERR_DB_NOT_FOUND = -136 // e.g. email invalid
 const val ERR_DB_NOT_UNIQUE = -137 // name not unique, i.e. email already in use
 const val ERR_PROJECT_DOWN = -183 // i.e. project error
 const val ERR_HTTP_TRANSIENT = -184 // connection problems

Diff for: android/BOINC/app/src/main/res/values-en/strings.xml

@@ -65,7 +65,7 @@
     <string name="attachproject_login_header_description">Description:</string>
     <string name="attachproject_login_header_home">Home:</string>
     <string name="attachproject_login_header_url">Website:</string>
-    <string name="attachproject_login_header_id_email">eMail:</string>
+    <string name="attachproject_login_header_id_email">Email address:</string>
     <string name="attachproject_login_header_id_name">Name:</string>
     <string name="attachproject_login_header_pwd">Password:</string>
     <string name="attachproject_login_button_registration">Register</string>
@@ -84,14 +84,14 @@
     <string name="attachproject_error_short_pwd">Password too short</string>
     <string name="attachproject_error_no_internet">Connection failure</string>
     <string name="attachproject_error_no_url">Please enter URL</string>
-    <string name="attachproject_error_no_email">Please enter eMail address</string>
+    <string name="attachproject_error_no_email">Please enter Email address</string>
     <string name="attachproject_error_no_pwd">Please enter a password</string>
     <string name="attachproject_error_no_name">Please enter user name</string>
     <string name="attachproject_error_unknown">failed</string>
     <string name="attachproject_error_bad_username">User name refused</string>
-    <string name="attachproject_error_email_in_use">eMail is already in use</string>
+    <string name="attachproject_error_email_in_use">Email address is already in use</string>
     <string name="attachproject_error_project_down">Project is offline</string>
-    <string name="attachproject_error_email_bad_syntax">eMail refused</string>
+    <string name="attachproject_error_email_bad_syntax">Email address refused</string>
     <string name="attachproject_error_bad_pwd">Password refused</string>
     <string name="attachproject_error_creation_disabled">Account creation is disabled on this project</string>
     <string name="attachproject_error_invalid_url">Invalid URL</string>

Diff for: android/BOINC/app/src/main/res/values/strings.xml

@@ -65,7 +65,7 @@
     <string name="attachproject_login_header_description">Description:</string>
     <string name="attachproject_login_header_home">Home:</string>
     <string name="attachproject_login_header_url">Website:</string>
-    <string name="attachproject_login_header_id_email">eMail:</string>
+    <string name="attachproject_login_header_id_email">Email address:</string>
     <string name="attachproject_login_header_id_name">Name:</string>
     <string name="attachproject_login_header_pwd">Password:</string>
     <string name="attachproject_login_button_registration">Register</string>
@@ -84,14 +84,14 @@
     <string name="attachproject_error_short_pwd">Password too short</string>
     <string name="attachproject_error_no_internet">Connection failure</string>
     <string name="attachproject_error_no_url">Please enter URL</string>
-    <string name="attachproject_error_no_email">Please enter eMail address</string>
+    <string name="attachproject_error_no_email">Please enter Email address</string>
     <string name="attachproject_error_no_pwd">Please enter a password</string>
     <string name="attachproject_error_no_name">Please enter user name</string>
     <string name="attachproject_error_unknown">failed</string>
     <string name="attachproject_error_bad_username">User name refused</string>
-    <string name="attachproject_error_email_in_use">eMail is already in use</string>
+    <string name="attachproject_error_email_in_use">Email address is already in use</string>
     <string name="attachproject_error_project_down">Project is offline</string>
-    <string name="attachproject_error_email_bad_syntax">eMail refused</string>
+    <string name="attachproject_error_email_bad_syntax">Email address refused</string>
     <string name="attachproject_error_bad_pwd">Password refused</string>
     <string name="attachproject_error_creation_disabled">Account creation is disabled on this project</string>
     <string name="attachproject_error_invalid_url">Invalid URL</string>