English sentences update

Change-Id: I0266479d2515a227ddadcdcf720499f525dd8a27

jams-react-client/public/locales/en/translation.json

@@ -3,7 +3,7 @@
     "password": "Password",
     "confirm_password": "Confirm password",
     "continue": "Continue",
-    "users": "Users",
+    "users": "users",
     "groups": "Groups",
     "blueprints": "Blueprints",
     "settings": "Settings",
@@ -34,7 +34,7 @@
     "select_option_setting_up_certificate_authority": "Select an option for setting-up the certificate authority that will be used to sign all Jami accounts generated on this JAMS instance.",
     "import_certificate_authority": "Import Certificate Authority",
     "must_be_60_characters_or_less": "Must be 60 characters or less",
-    "username_is_required": "Username is required.",
+    "username_is_required": "Username is required!",
     "must_be_50_characters_or_less": "Must be 50 characters or less",
     "password_must_match": "Passwords must match",
     "password_confirmation_required": "Password confirmation is required.",
@@ -66,15 +66,15 @@
     "15_minutes": "15 minutes",
     "30_minutes": "30 minutes",
     "60_minutes": "60 minutes",
-    "1_month": "1 Month",
-    "3_months": "3 Months",
-    "6_months": "6 Months",
-    "1_year": "1 Year",
+    "1_month": "1 month",
+    "3_months": "3 months",
+    "6_months": "6 months",
+    "1_year": "1 year",
     "please_enter_valid_cors_domain_url": "Please enter a valid CORS domain URL.",
     "global_parameters_cover_general_configuration_of_servers_engine": "The global parameters cover the general configuration of the server's engine.",
     "cors_domain_name": "CORS domain name",
     "set_domain_of_web_cleint_server_to_connect_to_hans_admin_dashboard_and_jami_accounts_also_to_set_client_crls_ocsps": "Set the domain of the web client-server to connect to the JAMS admin dashboard and Jami accounts. It is also used to define where the clients should download CRLs and submit OCSP queries. In case you are running a proxied instance (i.e. JAMS behind IIS), please make sure to set this field correctly, otherwise devices will not be able to download CRLs or validate certificates.",
-    "domain_name_of_web_client_server": "The domain name of your web client server. Requires http:// or https://",
+    "domain_name_of_web_client_server": "The domain name of your web client server.",
     "domain": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
     "set_liftetime_crl_list_certificates_revoked": "Set the lifetime of the CRL which contains the list of the certificates that have been revoked before their scheduled expiration date.",
@@ -86,7 +86,7 @@
     "search_users_using": "Search users using (username, first name, last name)",
     "search_users": "Search users",
     "servername_is_required": "Server name is required.",
-    "password_is_required": "Password is required.",
+    "password_is_required": "Password is required!",
     "domain_name_is_required": "Domain name is required.",
     "port_must_be_a_number": "Port must be a number.",
     "port_must_be_positive": "Port must be positive.",
@@ -135,8 +135,8 @@
     "allow_video_calls": "Allow video calls",
     "allow_incoming_calls_from_unknown_contacts": "Allow incoming calls from unknown contacts",
     "auto_answer_calss": "Auto answer calls",
-    "allow_use_of_jami_in_local_lan": "Allow Jami usage on the local LAN",
-    "convert_your_account_into_a_rendezvous_point": "Activate this account into rendezvous mode",
+    "allow_use_of_jami_in_local_lan": "Allow discovery of other peers on a local network",
+    "convert_your_account_into_a_rendezvous_point": "Set the account as a Rendezvous point",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
     "remove_blueprint": "Remove blueprint",
@@ -179,7 +179,7 @@
     "admin_password_updated_successfully": "Administrator password successfully updated.",
     "updating_user": "Updating user ",
     "password_failed": " password failed with error: ",
-    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information below to change your admin password.",
+    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information to change your admin password.",
     "Confirm password": "Confirm password",
     "generate": "Generate",
     "copy_to_clipboard": "Copy to clipboard",
@@ -192,7 +192,7 @@
     "are_you_sure_want_revoke": "Are you sure you want to revoke",
     "revoke": "Revoke",
     "revoke_user": "Revoke user",
-    "edit_profile": "Edit Profile",
+    "edit_profile": "Edit profile",
     "change_password": "Change password",
     "minimum_3_characters": "Minimum 3 characters!",
     "maximum_32_characters": "Maximum 32 characters!",
@@ -201,9 +201,9 @@
     "last_name_is_too_short": "Last Name is too short!",
     "invalid_email": "Invalid email!",
     "organization_name_too_short": "Organization name is too short!",
-    "fax_not_valid": "Fax not valid!",
-    "phone_not_valid": "Phone not valid!",
-    "mobile_not_valid": "Mobile not valid!",
+    "fax_not_valid": "Fax number not valid!",
+    "phone_not_valid": "Phone number not valid!",
+    "mobile_not_valid": "Mobile number not valid!",
     "crop_image": "Crop image",
     "zoom": "Zoom",
     "rotation": "Rotation",
@@ -240,11 +240,17 @@
     "remove_moderator": "Remove moderator",
     "rendezvous": "Rendezvous",
     "standalone": "Standalone",
-    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls will be allowed.",
-    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list will be allowed to contact you.",
-    "auto_answer_calls_info": "If this option is enabled, incomming calls will be automaticly answered. This option can be usefull if you want for example to monitor your house or a particular room when you are away from home.",
-    "local_lan_info": "If this option is enabled, you will be able to communicate with connected contacts on you local lan, even if your lan is disconnected from internet.",
-    "rendezvous_info": "If this option is enabled, incomming calls will automaticly be added to a conference room.",
-    "rendezvous_moderators_info": "Moderators are people allowed to manage rendezvous points and conferences even if they are not hosted on their devices.",
-    "allow_jami_user_to_search_for_other_contacts": "Allow Jami user to search for other contacts"
+    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls are allowed.",
+    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list can contact you.",
+    "auto_answer_calls_info": "If this option is enabled, incoming calls are automatically answered. This option can be useful to monitor your house or a particular room when you are away from home for example.",
+    "local_lan_info": "If this option is enabled, you can communicate with connected contacts on you local lan, even if your lan is disconnected from the Internet.",
+    "rendezvous_info": "If this option is enabled, incoming calls are automatically added to a conference room.",
+    "rendezvous_moderators_info": "Moderators can manage the Rendezvous point.",
+    "allow_jami_user_to_search_for_other_contacts": "Allow user to add new contacts",
+    "upnp_custom_popup": "UPnP allows Jami to automatically open network ports to establish peer-to-peer communications.",
+    "turn_server_configuration_popup": "Configure a TURN server to establish a connection when peer-to-peer communication is not possible",
+    "dht_configuration_popup": "Configure the DHT proxy server used by this account",
+    "contact_management": "Contact management",
+    "lookup_info": "If this option is disabled, user can not search and add new contacts",
+    "local_lan": "Local LAN"
 }

jams-react-client/public/locales/fr/translation.json

@@ -246,5 +246,11 @@
     "local_lan_info": "Si activé, il sera possible de communiquer avec les personnes connectées sur votre réseau local, même si ce dernier est isolé d'internet",
     "rendezvous_info": "Si activé, les appels entrants sont automatiquement ajoutés à une salle de conférence",
     "rendezvous_moderators_info": "Les modérateurs sont les personnes autorisées à administrer le point de rendez-vous et les conférences hébergées depuis ce compte",
-    "allow_jami_user_to_search_for_other_contacts": "Allow Jami user to search for other contacts"
+    "allow_jami_user_to_search_for_other_contacts": "Allow Jami user to search for other contacts",
+    "upnp_custom_popup": "UPnP allows Jami to automatically open network ports to establish peer-to-peer communications.",
+    "turn_server_configuration_popup": "Configure a TURN server to establish a connection when peer-to-peer communication is not possible",
+    "dht_configuration_popup": "Configure the DHT proxy server used by this account",
+    "contact_management": "Contact management",
+    "lookup_info": "If this option is disabled, user can not search and add new contacts",
+    "local_lan": "Local LAN"
 }

jams-react-client/public/locales/uk/translation.json

@@ -135,8 +135,8 @@
     "allow_video_calls": "Allow video calls",
     "allow_incoming_calls_from_unknown_contacts": "Allow incoming calls from unknown contacts",
     "auto_answer_calss": "Auto answer calls",
-    "allow_use_of_jami_in_local_lan": "Allow Jami usage on the local LAN",
-    "convert_your_account_into_a_rendezvous_point": "Activate this account into rendezvous mode",
+    "allow_use_of_jami_in_local_lan": "Allow discovery of other peers on a local network",
+    "convert_your_account_into_a_rendezvous_point": "Set the account as a Rendezvous point",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
     "remove_blueprint": "Remove blueprint",
@@ -179,7 +179,7 @@
     "admin_password_updated_successfully": "Administrator password successfully updated.",
     "updating_user": "Updating user ",
     "password_failed": " password failed with error: ",
-    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information below to change your admin password.",
+    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information to change your admin password.",
     "Confirm password": "Confirm password",
     "generate": "Generate",
     "copy_to_clipboard": "Copy to clipboard",
@@ -201,9 +201,9 @@
     "last_name_is_too_short": "Last Name is too short!",
     "invalid_email": "Invalid email!",
     "organization_name_too_short": "Organization name is too short!",
-    "fax_not_valid": "Fax not valid!",
-    "phone_not_valid": "Phone not valid!",
-    "mobile_not_valid": "Mobile not valid!",
+    "fax_not_valid": "Fax number not valid!",
+    "phone_not_valid": "Phone number not valid!",
+    "mobile_not_valid": "Mobile number not valid!",
     "crop_image": "Crop image",
     "zoom": "Zoom",
     "rotation": "Rotation",
@@ -240,10 +240,10 @@
     "remove_moderator": "Remove moderator",
     "rendezvous": "Rendezvous",
     "standalone": "Standalone",
-    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls will be allowed.",
-    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list will be allowed to contact you.",
-    "auto_answer_calls_info": "If this option is enabled, incomming calls will be automaticly answered. This option can be usefull if you want for example to monitor your house or a particular room when you are away from home.",
-    "local_lan_info": "If this option is enabled, you will be able to communicate with connected contacts on you local lan, even if your lan is disconnected from internet.",
-    "rendezvous_info": "If this option is enabled, incomming calls will automaticly be added to a conference room.",
-    "rendezvous_moderators_info": "Moderators are people allowed to manage rendezvous points and conferences even if they are not hosted on their devices."
+    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls are allowed.",
+    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list can contact you.",
+    "auto_answer_calls_info": "If this option is enabled, incoming calls are automatically answered. This option can be useful to monitor your house or a particular room when you are away from home for example.",
+    "local_lan_info": "If this option is enabled, you can communicate with connected contacts on you local lan, even if your lan is disconnected from the Internet.",
+    "rendezvous_info": "If this option is enabled, incoming calls are automatically added to a conference room.",
+    "rendezvous_moderators_info": "Moderators can manage the Rendezvous point."
 }

jams-react-client/src/components/CreateAdmin/CreateAdmin.js

@@ -52,7 +52,7 @@ export default function CreateAdmin(props) {
     validationSchema: Yup.object({
       username: Yup.string()
         .max(60, i18next.t("must_be_60_characters_or_less", "Must be 60 characters or less"))
-        .required(i18next.t("username_is_required", "Username is required.")),
+        .required(i18next.t("username_is_required", "Username is required!")),
       password: Yup.string()
         .max(50, i18next.t("must_be_50_characters_or_less", "Must be 50 characters or less"))
         .required("Password is required"),

jams-react-client/src/components/IdentityManagement/IdentityManagement.js

@@ -64,8 +64,8 @@ export default function IdentityManagement(props) {
 
   const validationSchemaLDAPform = Yup.object().shape({
     servername: Yup.string().required(i18next.t("servername_is_required", "Server name is required.")),
-    ldapadminusername: Yup.string().required(i18next.t("username_is_required", "Username is required.")),
-    ldappassword: Yup.string().required(i18next.t("password_is_required", "Password is required.")),
+    ldapadminusername: Yup.string().required(i18next.t("username_is_required", "Username is required!")),
+    ldappassword: Yup.string().required(i18next.t("password_is_required", "Password is required!")),
     basedn: Yup.string().required(i18next.t("domain_name_is_required", "Domain name is required.")),
   });
 
@@ -76,9 +76,9 @@ export default function IdentityManagement(props) {
       .integer(i18next.t("port_must_be_an_integer", "Port must be an integer."))
       .required(i18next.t("port_number_is_required", "Port number is required.")),
     host: Yup.string().required(i18next.t("host_is_required", "Host is required.")),
-    adadminusername: Yup.string().required(i18next.t("username_is_required", "Username is required.")),
+    adadminusername: Yup.string().required(i18next.t("username_is_required", "Username is required!")),
     domainname: Yup.string().required(i18next.t("domain_name_is_required", "Domain name is required.")),
-    adpassword: Yup.string().required(i18next.t("password_is_required", "Password is required.")),
+    adpassword: Yup.string().required(i18next.t("password_is_required", "Password is required!")),
   });
 
   const directoryTypes = [

jams-react-client/src/globalUrls.js

@@ -2,7 +2,7 @@ const uri = "";
 const current_uri = window.location.href;
 const backend_address = new URL(window.location.href);
 const url_path = backend_address.protocol + "//" + backend_address.hostname;
-const url_port = backend_address.port;
+const url_port = "8080"; //backend_address.port;
 const api_path_post_install_admin = "/api/install/start";
 const api_path_post_auth_login = "/api/login";
 const api_path_post_install_ca = "/api/install/ca";

jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js

@@ -394,7 +394,7 @@ export default function EditBlueprintConfiguration(props) {
               <div className={classes.root}>
                 <Grid container spacing={2}>
                   <Grid item xs={12} sm={12} md={12}>
-                    <FormLabel component="legend">UPnP <CustomPopupState message="UPnP allows networked devices to seamlessly discover each other's presence on the network and establish communications." /></FormLabel>
+                    <FormLabel component="legend">UPnP <CustomPopupState message={i18next.t("upnp_custom_popup", "UPnP allows Jami to automatically open network ports to establish peer-to-peer communications.")} /></FormLabel>
                     <FormControlLabel
                       control={
                         <Switch
@@ -417,7 +417,7 @@ export default function EditBlueprintConfiguration(props) {
                   </Grid>
                   <Grid item xs={12} sm={12} md={12}>
                     <FormControl component="fieldset">
-                      <FormLabel component="legend">TURN <CustomPopupState message="TURN is a protocol that assists your devices in traversing NATs (Network address translators) or firewalls." /></FormLabel>
+                      <FormLabel component="legend">TURN <CustomPopupState message={i18next.t("turn_server_configuration_popup", "Configure a TURN server to establish a connection when peer-to-peer communication is not possible")} /></FormLabel>
                       <RadioGroup
                         value={selectedTurnOption}
                         aria-label="gender"
@@ -556,7 +556,7 @@ export default function EditBlueprintConfiguration(props) {
                   <Grid item xs={12} sm={12} md={4}></Grid>
                   <Grid item xs={12} sm={12} md={12}>
                     <FormControl component="fieldset">
-                      <FormLabel component="legend">DHT Proxy <CustomPopupState message="Configure custom settings for a given Distributed Hash Table (DHT) proxy server." /></FormLabel>
+                      <FormLabel component="legend">DHT Proxy <CustomPopupState message={i18next.t("dht_configuration_popup", "Configure the DHT proxy server used by this account")} /></FormLabel>
                       <RadioGroup
                         value={selectedDHTProxyOption}
                         aria-label="gender"

jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js

@@ -382,7 +382,7 @@ export default function EditBlueprintPermissions(props) {
                         }
                         label={i18next.t("allow_video_calls", "Allow video calls")}
                       />
-                      <CustomPopupState message={i18next.t("allow_incoming_calls_from_unknown_allow_video_calls_info", "If this option is disabled, only audio calls will be allowed.")} />
+                      <CustomPopupState message={i18next.t("allow_incoming_calls_from_unknown_allow_video_calls_info", "If this option is disabled, only audio calls are allowed.")} />
                     </FormGroup>
                     <FormGroup row>
                       <FormControlLabel
@@ -402,7 +402,7 @@ export default function EditBlueprintPermissions(props) {
                         }
                         label={i18next.t("allow_incoming_calls_from_unknown_contacts", "Allow incoming calls from unknown contacts")}
                       />
-                      <CustomPopupState message={i18next.t("allow_incoming_calls_from_unknown_contacts_info", "If this option is disabled, only contacts from your list will be allowed to contact you.")} />
+                      <CustomPopupState message={i18next.t("allow_incoming_calls_from_unknown_contacts_info", "If this option is disabled, only contacts from your list can contact you.")} />
                     </FormGroup>
                     <FormGroup row>
                       <FormControlLabel
@@ -422,11 +422,11 @@ export default function EditBlueprintPermissions(props) {
                         }
                         label={i18next.t("auto_answer_calss", "Auto answer calls")}
                       />
-                      <CustomPopupState message={i18next.t("auto_answer_calls_info", "If this option is enabled, incomming calls will be automaticly answered. This option can be usefull if you want for example to monitor your house or a particular room when you are away from home.")} />
+                      <CustomPopupState message={i18next.t("auto_answer_calls_info", "If this option is enabled, incoming calls are automatically answered. This option can be useful to monitor your house or a particular room when you are away from home for example.")} />
                     </FormGroup>
                     </Grid>
                     <Grid item xs={12} sm={12} md={12}>
-                    <FormLabel component="legend">Local LAN</FormLabel>
+                    <FormLabel component="legend">{i18next.t("local_lan","Local LAN")}</FormLabel>
                     <FormGroup row>
                       <FormControlLabel
                         control={
@@ -443,13 +443,13 @@ export default function EditBlueprintPermissions(props) {
                             name="peerDiscovery"
                           />
                         }
-                        label={i18next.t("allow_use_of_jami_in_local_lan", "Allow Jami usage on the local LAN")}
+                        label={i18next.t("allow_use_of_jami_in_local_lan", "Allow discovery of other peers on a local network")}
                       />
-                      <CustomPopupState message={i18next.t("local_lan_info", "If this option is enabled, you will be able to communicate with connected contacts on you local lan, even if your lan is disconnected from internet.")} />
+                      <CustomPopupState message={i18next.t("local_lan_info", "If this option is enabled, you can communicate with connected contacts on you local lan, even if your lan is disconnected from the Internet.")} />
                     </FormGroup>
                     </Grid>
                     <Grid item xs={12} sm={12} md={12}>
-                    <FormLabel component="legend">Allow Lookup</FormLabel>
+                    <FormLabel component="legend">{i18next.t("contact_management", "Contact management")}</FormLabel>
                     <FormGroup row>
                       <FormControlLabel
                         control={
@@ -466,9 +466,9 @@ export default function EditBlueprintPermissions(props) {
                             name="allowLookup"
                           />
                         }
-                        label={i18next.t("allow_jami_user_to_search_for_other_contacts", "Allow Jami user to search for other contacts")}
+                        label={i18next.t("allow_jami_user_to_search_for_other_contacts", "Allow user to add new contacts")}
                       />
-                      <CustomPopupState message={i18next.t("local_lan_info", "If this option is enabled, users will be able to search for other contacts and add them.")} />
+                      <CustomPopupState message={i18next.t("lookup_info", "If this option is disabled, user can not search and add new contacts")} />
                     </FormGroup>
                     </Grid>
                     <Grid item xs={12} sm={12} md={12}>
@@ -501,11 +501,11 @@ export default function EditBlueprintPermissions(props) {
                             inputProps={{ "aria-label": "secondary checkbox" }}
                           />
                           }
-                          label={i18next.t("convert_your_account_into_a_rendezvous_point", "Activate this account into rendezvous mode")}
+                          label={i18next.t("convert_your_account_into_a_rendezvous_point", "Set the account as a Rendezvous point")}
                         />
-                        <CustomPopupState message={i18next.t("rendezvous_info", "If this option is enabled, incomming calls will automaticly be added to a conference room.")}/>
+                        <CustomPopupState message={i18next.t("rendezvous_info", "If this option is enabled, incoming calls are automatically added to a conference room.")}/>
                         <Button disabled={!rendezVous} color="primary" onClick={() => {setOpenDrawer(true)}}><AddCircleOutlineIcon /> {i18next.t("add_moderator_to", "Add moderator to")} {props.blueprintName}</Button>
-                        <CustomPopupState message={i18next.t("rendezvous_moderators_info", "Moderators are people allowed to manage rendezvous points and conferences even if they are not hosted on their devices.")} />
+                        <CustomPopupState message={i18next.t("rendezvous_moderators_info", "Moderators can manage the Rendezvous point.")} />
                         </FormGroup>
                     <Table className={classes.table}>
                         <TableHead>

jams-react-client/src/views/Settings/General.js

@@ -100,7 +100,7 @@ export default function General(props) {
    */
 
   const passwordSchema = Yup.object().shape({
-    password: Yup.string().required(i18next.t("password_is_required", "Password is required")),
+    password: Yup.string().required(i18next.t("password_is_required", "Password is required!")),
     passwordConfirmation: Yup.string().oneOf(
       [Yup.ref("password"), null],
       i18next.t("password_must_match", "Passwords must match")
@@ -147,7 +147,7 @@ export default function General(props) {
             <Grid item lg={6} ><LanguagePicker navigationTarget={"/admin/settings"} /></Grid>
             <Grid item lg={6} >
               <Typography variant="p" gutterBottom color="primary">
-                {i18next.t("enter_the_following_information_below_to_change_your_admin_password", "Change administrator password")}
+                {i18next.t("enter_the_following_information_below_to_change_your_admin_password", "Enter the following information to change your admin password.")}
               </Typography>
             </Grid>
             <Grid item lg={6} >

jams-react-client/src/views/UserProfile/DisplayUserProfile.js

@@ -670,7 +670,7 @@ export default function DisplayUserProfile(props) {
                       className={classes.whiteButtonText}
                       onClick={() => props.setDisplayUser(false)}
                     >
-                      <EditIcon /> {i18next.t("edit_profile", "Edit Profile")}
+                      <EditIcon /> {i18next.t("edit_profile", "Edit profile")}
                     </Button>
                   )}
                   </Grid>

jams-react-client/src/views/UserProfile/EditCreateUserProfile.js

@@ -472,7 +472,7 @@ export default function EditCreateUserProfile(props) {
       .required(i18next.t("username_is_required", "Username is required!"))
       .matches(/^[A-Za-z_][A-Za-z0-9_]*$/, i18next.t("only_alphanumeric_characters", "Only alphanumeric characters!")),
     password: props.createUser
-      ? Yup.string().required(i18next.t("only_alphanumeric_characters", "Password is required!"))
+      ? Yup.string().required(i18next.t("password_is_required", "Password is required!"))
       : null,
     confirmPassword: props.createUser
       ? Yup.string().oneOf([Yup.ref("password"), null], i18next.t("password_must_match", "Passwords must match"))
@@ -484,16 +484,16 @@ export default function EditCreateUserProfile(props) {
     organization: Yup.string().min(2, i18next.t("organization_name_too_short", "Organization name is too short!")),
     faxNumber: Yup.string().matches(
       /^(\+\d{1,2}\s?)?1?\-?\.?\s?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}$/,
-      i18next.t("fax_not_valid", "Fax not valid!")
+      i18next.t("fax_not_valid", "Fax number not valid!")
     ),
     phoneNumber: Yup.string().matches(
       /^(\+\d{1,2}\s?)?1?\-?\.?\s?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}$/,
-      i18next.t("phone_not_valid", "Phone not valid!")
+      i18next.t("phone_not_valid", "Phone number not valid!")
     ),
     phoneNumberExtension: Yup.number().positive().integer(),
     mobileNumber: Yup.string().matches(
       /^(\+\d{1,2}\s?)?1?\-?\.?\s?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}$/,
-      i18next.t("mobile_not_valid", "Mobile not valid!")
+      i18next.t("mobile_not_valid", "Mobile number not valid!")
     ),
   });
 
@@ -697,8 +697,8 @@ export default function EditCreateUserProfile(props) {
                             <FormikField
                               type={passwordVisible ? "text" : "password"}
                               name="confirmPassword"
-                              label={i18next.t("confirm_password", "Confirm Password")}
-                              placeholder={i18next.t("confirm_password", "Confirm Password")}
+                              label={i18next.t("confirm_password", "Confirm password")}
+                              placeholder={i18next.t("confirm_password", "Confirm password")}
                               startAdornment={
                                 <InputAdornment position="start">
                                   <VpnKeyIcon />