diff --git a/.gitignore b/.gitignore
index 2060fbffb24f9ea81a9e736f30d04becde30e3bb..9a1891de42bf7ddf4a97082fa5ca8b290fc75535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,7 @@ versions.json
 # React client
 jams-react-client/node_modules/
 jams-react-client/build/
+jams-react-client/public/locales/
 jams-react-client/package-lock.json
 jams-server/src/main/resources/webapp/
 
diff --git a/jams-react-client/package.json b/jams-react-client/package.json
index 6dc68de4f3416614588fa181e4532c2a8ecb1f8a..a1e79e5847708f7b430104237764a14e4ead8542 100644
--- a/jams-react-client/package.json
+++ b/jams-react-client/package.json
@@ -44,7 +44,7 @@
   },
   "scripts": {
     "start": "NODE_PATH=./src react-scripts start",
-    "build": "react-scripts build && ./node_modules/.bin/i18next-scanner",
+    "build": "react-scripts build && ./node_modules/.bin/i18next-scanner && cp -R src/locales public/",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
diff --git a/jams-react-client/public/available_languages.json b/jams-react-client/public/available_languages.json
new file mode 100644
index 0000000000000000000000000000000000000000..22e5650164ec2686d39e3e23d450629d61f4df0a
--- /dev/null
+++ b/jams-react-client/public/available_languages.json
@@ -0,0 +1 @@
+{"id":171629,"name":"JAMS - Jami Account Management  Server","slug":"jams-jami-account-management-server","tags":[],"languages":[{"code":"sq_AL","name":"Albanian (Albania)"},{"code":"ar","name":"Arabic"},{"code":"be","name":"Belarusian"},{"code":"bn","name":"Bengali"},{"code":"bg","name":"Bulgarian"},{"code":"ca","name":"Catalan"},{"code":"zh","name":"Chinese"},{"code":"zh_TW","name":"Chinese (Taiwan)"},{"code":"cs_CZ","name":"Czech (Czech Republic)"},{"code":"da","name":"Danish"},{"code":"nl","name":"Dutch"},{"code":"eo","name":"Esperanto"},{"code":"et","name":"Estonian"},{"code":"fi","name":"Finnish"},{"code":"fr","name":"French"},{"code":"de","name":"German"},{"code":"el","name":"Greek"},{"code":"he","name":"Hebrew"},{"code":"hi_IN","name":"Hindi (India)"},{"code":"hu","name":"Hungarian"},{"code":"id","name":"Indonesian"},{"code":"it","name":"Italian"},{"code":"ja","name":"Japanese"},{"code":"ko","name":"Korean"},{"code":"lt","name":"Lithuanian"},{"code":"nb","name":"Norwegian Bokmål"},{"code":"oc","name":"Occitan (post 1500)"},{"code":"pa","name":"Panjabi (Punjabi)"},{"code":"fa","name":"Persian"},{"code":"pl","name":"Polish"},{"code":"pt","name":"Portuguese"},{"code":"pt_BR","name":"Portuguese (Brazil)"},{"code":"ro","name":"Romanian"},{"code":"ro_RO","name":"Romanian (Romania)"},{"code":"ru","name":"Russian"},{"code":"sr","name":"Serbian"},{"code":"sk","name":"Slovak"},{"code":"sl","name":"Slovenian"},{"code":"es","name":"Spanish"},{"code":"sw","name":"Swahili"},{"code":"sv","name":"Swedish"},{"code":"ta","name":"Tamil"},{"code":"tt","name":"Tatar"},{"code":"te","name":"Telugu"},{"code":"tr","name":"Turkish"},{"code":"tr_TR","name":"Turkish (Turkey)"},{"code":"uk","name":"Ukrainian"},{"code":"vi","name":"Vietnamese"}],"total_resources":1,"source_language":{"code":"en","name":"English"},"type":"file","logo_url":"","description":"JAMS - Jami Account Management Server","stringcount":232,"wordcount":933,"long_description":"","website_url":"","maintainers":["cyrilleberaud","Gharib"],"created":"2020-10-02T13:44:14.802635Z","last_update":"2020-10-21T15:18:20.718031Z","private":false,"repository_url":"https://review.jami.net","archived":false,"team":{"name":"Jami App Team","id":49466},"stats":{"ar":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":10,"wordcount":12,"percentage":0.04310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"be":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"bg":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":1,"wordcount":1,"percentage":0.004310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"bn":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"ca":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"cs_CZ":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"da":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"de":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"el":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"eo":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"es":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":10,"wordcount":12,"percentage":0.04310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"et":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"fa":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"fi":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":41,"wordcount":174,"percentage":0.17672413793103448,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"fr":{"reviewed_1":{"stringcount":3,"wordcount":8,"percentage":0.01293103448275862,"last_activity":"2020-10-14T03:23:06.818499Z","name":"reviewed"},"translated":{"stringcount":202,"wordcount":739,"percentage":0.8706896551724138,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"he":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":10,"wordcount":19,"percentage":0.04310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"hi_IN":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"hu":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":220,"wordcount":805,"percentage":0.9482758620689655,"last_activity":"2020-10-20T21:04:59.223207Z","name":"translated"}},"id":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"it":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"ja":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":44,"wordcount":191,"percentage":0.1896551724137931,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"ko":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"lt":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"nb":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"nl":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"oc":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":55,"wordcount":116,"percentage":0.23706896551724138,"last_activity":"2020-10-20T17:50:32.344146Z","name":"translated"}},"pa":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"pl":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"pt":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"pt_BR":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":44,"wordcount":191,"percentage":0.1896551724137931,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"ro":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"ro_RO":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":101,"wordcount":387,"percentage":0.4353448275862069,"last_activity":"2020-10-21T15:18:20.718031Z","name":"translated"}},"ru":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"sk":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"sl":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"sq_AL":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":1,"wordcount":1,"percentage":0.004310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"sr":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"sv":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":1,"wordcount":1,"percentage":0.004310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"sw":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"ta":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"te":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"tr":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"tr_TR":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"tt":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"uk":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"vi":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"zh":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}},"zh_TW":{"reviewed_1":{"stringcount":0,"wordcount":0,"percentage":0.0,"last_activity":null,"name":"reviewed"},"translated":{"stringcount":10,"wordcount":12,"percentage":0.04310344827586207,"last_activity":"2020-10-20T15:33:48.125059Z","name":"translated"}}}}
\ No newline at end of file
diff --git a/jams-react-client/src/components/CreateAdmin/CreateAdmin.js b/jams-react-client/src/components/CreateAdmin/CreateAdmin.js
index 490db0a733501b65f436d47f015f77a47e0a4f5a..ee9cd909c62b43f877fd2a265bd8541151511451 100644
--- a/jams-react-client/src/components/CreateAdmin/CreateAdmin.js
+++ b/jams-react-client/src/components/CreateAdmin/CreateAdmin.js
@@ -52,14 +52,14 @@ 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"),
       confirmPassword: Yup.string()
         .oneOf([Yup.ref("password"), null], i18next.t("password_must_match", "Passwords must match"))
         .max(50, i18next.t("must_be_50_characters_or_less", "Must be 50 characters or less"))
-        .required(i18next.t("password_confirmation_required", "Password confirmation is required")),
+        .required(i18next.t("password_confirmation_required", "Password confirmation is required.")),
     }),
 
     onSubmit: (values) => {
@@ -94,7 +94,7 @@ export default function CreateAdmin(props) {
   return (
     <form className={classes.form} noValidate onSubmit={formik.handleSubmit}>
       <Typography variant="h5" gutterBottom color="primary">
-        {i18next.t("create_administrator", "Create Administrator")}
+        {i18next.t("create_administrator", "Create administrator account")}
       </Typography>
       <Grid container spacing={3}>
         <Grid item xs={12}>
diff --git a/jams-react-client/src/components/Drawer/Drawer.js b/jams-react-client/src/components/Drawer/Drawer.js
index efc972bf1fa147dba30004b73d3f5fe710d27949..32e22b9b6434dc3494687a6a12a59c08be3541c8 100644
--- a/jams-react-client/src/components/Drawer/Drawer.js
+++ b/jams-react-client/src/components/Drawer/Drawer.js
@@ -324,7 +324,7 @@ export default function TemporaryDrawer(props) {
                 inputProps={{
                   placeholder: props.placeholder,
                   inputProps: {
-                    "aria-label": i18next.t("add_a_contact", "Add a contact"),
+                    "aria-label": i18next.t("add_a_contact", "Add contact"),
                   },
                   onKeyUp: handleSearchUsers,
                 }}
diff --git a/jams-react-client/src/components/IdentityManagement/AdStorageForm.js b/jams-react-client/src/components/IdentityManagement/AdStorageForm.js
index 72eee660d0b888691c0ea558b8762720c69d19fd..877fd3cd11c46be4819b402ac3a3704d7fca34ad 100644
--- a/jams-react-client/src/components/IdentityManagement/AdStorageForm.js
+++ b/jams-react-client/src/components/IdentityManagement/AdStorageForm.js
@@ -14,7 +14,7 @@ export default function AdStorageForm(props) {
     <Grid container spacing={3}>
       <Grid item xs={12}>
         <Typography variant="subtitle1" gutterBottom color="primary">
-        {i18next.t("active_directory_server_informations", "Active directory server informations")}
+        {i18next.t("active_directory_server_informations", "Active Directory server information")}
         </Typography>
       </Grid>
       <Grid item xs={6}>
diff --git a/jams-react-client/src/components/IdentityManagement/LocalStorageForm.js b/jams-react-client/src/components/IdentityManagement/LocalStorageForm.js
index b871d379a362615f2a692c05fd039d87011a7f19..c827f3a3392a6d93234b9d3a65dd78349933bf80 100644
--- a/jams-react-client/src/components/IdentityManagement/LocalStorageForm.js
+++ b/jams-react-client/src/components/IdentityManagement/LocalStorageForm.js
@@ -26,7 +26,7 @@ export default function LocalStorageForm(props) {
                     }
                     label={i18next.t("use_public_nameserver", "Use public nameserver")}
                     />
-                    <CustomPopupState message={i18next.t("check_box_register_usernames_on_jami_public_nameserver", "Check this box if you want to register your usernames on Jami's public nameserver.")}/>
+                    <CustomPopupState message={i18next.t("check_box_register_usernames_on_jami_public_nameserver", "Check this box if you want to register your usernames on Jami's public name server.")}/>
                 </Grid>
             </Grid>
     );
diff --git a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
index 176cf5960f37806ba51f032252794156c9e55028..a43f31873d31a797a024894a1262b19e2dde7a19 100644
--- a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
+++ b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { useHistory } from "react-router-dom";
 import { makeStyles } from "@material-ui/core/styles";
 
@@ -13,20 +13,62 @@ import i18next from "i18next";
 
 import { useTranslation } from "react-i18next";
 
-const languages = [
-  {
-    value: "en",
-    label: "English",
-  },
-  {
-    value: "fr",
-    label: "Francais",
-  },
-  {
-    value: "es",
-    label: "Español",
-  },
-];
+// const languages = [
+//   {
+//     value: "sq_AL",
+//     label: "Albanian",
+//   },
+//   {
+//     value: "ar",
+//     label: "Arabic",
+//   },
+//   {
+//     value: "zh_TW",
+//     label: "Chinese (Taiwan)",
+//   },
+
+//   {
+//     value: "en",
+//     label: "English",
+//   },
+
+//   {
+//     value: "es",
+//     label: "Español",
+//   },
+//   {
+//     value: "fi",
+//     label: "Finnish",
+//   },
+//   {
+//     value: "fr",
+//     label: "Francais",
+//   },
+//   {
+//     value: "he",
+//     label: "Hebrew",
+//   },
+//   {
+//     value: "hu",
+//     label: "Hungarian",
+//   },
+//   {
+//     value: "ja",
+//     label: "Japanese",
+//   },
+//   {
+//     value: "oc",
+//     label: "Occitan",
+//   },
+//   {
+//     value: "pt_BR",
+//     label: "Portuguese",
+//   },
+//   {
+//     value: "ro_RO",
+//     label: "Romanian",
+//   },
+// ];
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -40,18 +82,22 @@ const useStyles = makeStyles((theme) => ({
 
 export default function LanguagePicker(props) {
   const history = useHistory();
-  const [language, setLanguage] = React.useState(i18next.language || window.localStorage.i18nextLng || "");
+  const [language, setLanguage] = React.useState(i18next.language || window.localStorage.i18nextLng || "en");
+  const [languages, setLanguages] = React.useState([]);
 
   const { i18n } = useTranslation();
 
-  const changeLanguage = (lng) => {
-    i18n.changeLanguage(lng);
-  };
+  useEffect(() => {
+    fetch("/available_languages.json").then(res => res.json()).then((result) => {
+      setLanguages(result.languages)
+    })
+  }, [language])
 
   const handleChange = (value) => {
     setLanguage(value);
-    changeLanguage(value);
-    history.push(props.navigationTarget);
+    i18n.changeLanguage(value).then(()=>{
+      history.push(props.navigationTarget);
+    })
   };
 
   return (
@@ -65,19 +111,19 @@ export default function LanguagePicker(props) {
             {...bindTrigger(popupState)}
           >
             {languages.map((option) => {
-              if (option.value === language) {
-                return option.label;
+              if (option.code === language) {
+                return option.name;
               }
             })}
           </Button>
           <Menu {...bindMenu(popupState)}>
             {languages.map((option) => (
               <MenuItem
-                key={option.value}
-                value={option.value}
-                onClick={() => handleChange(option.value)}
+                key={option.code}
+                value={option.code}
+                onClick={() => handleChange(option.code)}
               >
-                {option.label}
+                {option.name}
               </MenuItem>
             ))}
           </Menu>
diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.js b/jams-react-client/src/components/ServerParameters/ServerParameters.js
index 819e1cf3f1c2cc6446352be798d7396f4cf43b32..69bcee659efc94e16441aa0cccc427e15dacec31 100644
--- a/jams-react-client/src/components/ServerParameters/ServerParameters.js
+++ b/jams-react-client/src/components/ServerParameters/ServerParameters.js
@@ -188,7 +188,7 @@ export default function ServerParameters(props) {
             </Typography>
             <Typography variant="subtitle1" gutterBottom>
             {i18next.t("cors_domain_name", "CORS domain name")}
-              <CustomPopupState message={i18next.t("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.")} />
+              <CustomPopupState message={i18next.t("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.")} />
             </Typography>
             <Typography variant="body1" gutterBottom>
             {i18next.t("domain_name_of_web_client_server", "The domain name of your web client server. Requires http:// or https://")}
diff --git a/jams-react-client/src/i18n.js b/jams-react-client/src/i18n.js
index 3cf3a164b44daa597292daf37f862682c9d38f5e..f5a0df3eceb389378d5d9e502e16d3627e61c7c1 100644
--- a/jams-react-client/src/i18n.js
+++ b/jams-react-client/src/i18n.js
@@ -1,28 +1,13 @@
 import i18next from "i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
+import Backend from 'i18next-http-backend';
 import { initReactI18next } from "react-i18next";
 
-import translationEN from "./locales/en/translation.json";
-import translationFR from "./locales/fr/translation.json";
-import translationES from "./locales/es/translation.json";
-
-const resources = {
-  en: {
-    translation: translationEN,
-  },
-  fr: {
-    translation: translationFR,
-  },
-  es: {
-    translation: translationES,
-  },
-};
-
 i18next
   .use(LanguageDetector)
   .use(initReactI18next)
+  .use(Backend)
   .init({
-    resources,
     fallbackLng: "en",
     lookupCookie: "i18next",
     lookupLocalStorage: "i18nextLng",
diff --git a/jams-react-client/src/layouts/Admin.js b/jams-react-client/src/layouts/Admin.js
index dda6dfcd6782504cbba9a271ae4f266e7b305941..9d92b5a6348c6e850689b5436183cd9e28836dc4 100644
--- a/jams-react-client/src/layouts/Admin.js
+++ b/jams-react-client/src/layouts/Admin.js
@@ -227,7 +227,7 @@ export default function Admin({ ...rest }) {
           setUpdating(true);
         })
         .catch((error) => {
-          setSnackbarMessage(i18next.t("error_while_attempting_update_jams", "Error while attempting to update JAMS: ") + error);
+          setSnackbarMessage(i18next.t("error_while_attempting_update_jams", "Error occurred while attempting to update JAMS:") + error);
         });
     }
   };
diff --git a/jams-react-client/src/layouts/SignIn.js b/jams-react-client/src/layouts/SignIn.js
index cc14a3aa087217b6d84d66df466ede1d224eff9b..ecc8d71c31524364237b6493edffaec9e3950d45 100644
--- a/jams-react-client/src/layouts/SignIn.js
+++ b/jams-react-client/src/layouts/SignIn.js
@@ -100,7 +100,7 @@ export default function SignIn(props) {
       } else {
         setError(true);
         setErrorMessage(
-          i18next.t("login_failed", "Login failed check your credentials")
+          i18next.t("login_failed", "Login failed. Check your credentials.")
         );
       }
     });
diff --git a/jams-react-client/src/locales/ar/translation.json b/jams-react-client/src/locales/ar/translation.json
index 8e7572049c62fe7e0fe74263f9f843703f30c1e4..342346011380be4e55d97aece0e59a204440304a 100644
--- a/jams-react-client/src/locales/ar/translation.json
+++ b/jams-react-client/src/locales/ar/translation.json
@@ -9,7 +9,7 @@
     "settings": "إعدادات",
     "Logout": "الخروج",
     "create_user": "إنشاء مستخدم",
-    "login_failed": "فشل تسجيل الدخول تحقق من بيانات الاعتماد الخاصة بك",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/be/translation.json b/jams-react-client/src/locales/be/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/be/translation.json
+++ b/jams-react-client/src/locales/be/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/bg/translation.json b/jams-react-client/src/locales/bg/translation.json
index 33db050320b4cfd6fcb9f90af5d18999c1da1d51..1374ca0eee2921ada7a5a98a127af83ece66fe4e 100644
--- a/jams-react-client/src/locales/bg/translation.json
+++ b/jams-react-client/src/locales/bg/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/bn/translation.json b/jams-react-client/src/locales/bn/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/bn/translation.json
+++ b/jams-react-client/src/locales/bn/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ca/translation.json b/jams-react-client/src/locales/ca/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/ca/translation.json
+++ b/jams-react-client/src/locales/ca/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/cs_CZ/translation.json b/jams-react-client/src/locales/cs_CZ/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/cs_CZ/translation.json
+++ b/jams-react-client/src/locales/cs_CZ/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/da/translation.json b/jams-react-client/src/locales/da/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/da/translation.json
+++ b/jams-react-client/src/locales/da/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/de/translation.json b/jams-react-client/src/locales/de/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/de/translation.json
+++ b/jams-react-client/src/locales/de/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/el/translation.json b/jams-react-client/src/locales/el/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/el/translation.json
+++ b/jams-react-client/src/locales/el/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/en/translation.json b/jams-react-client/src/locales/en/translation.json
index d6556b12c4b7b580a413eef78467419ed1d4be71..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/en/translation.json
+++ b/jams-react-client/src/locales/en/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,19 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -225,7 +225,7 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
     "validate": "Validate",
diff --git a/jams-react-client/src/locales/eo/translation.json b/jams-react-client/src/locales/eo/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/eo/translation.json
+++ b/jams-react-client/src/locales/eo/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/es/translation.json b/jams-react-client/src/locales/es/translation.json
index bb8ff33bddbf7a908cd128c777750e6f2c071532..b9fa599bdc25b7a614336e3ed66bf928cc12d90d 100644
--- a/jams-react-client/src/locales/es/translation.json
+++ b/jams-react-client/src/locales/es/translation.json
@@ -9,7 +9,7 @@
     "settings": "Ajustes",
     "Logout": "Cerrar sesión",
     "create_user": "Crear usuario",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/et/translation.json b/jams-react-client/src/locales/et/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/et/translation.json
+++ b/jams-react-client/src/locales/et/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/fa/translation.json b/jams-react-client/src/locales/fa/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/fa/translation.json
+++ b/jams-react-client/src/locales/fa/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/fi/translation.json b/jams-react-client/src/locales/fi/translation.json
index 8af0c7ceee707fb4a2ccdc1208198fe97ac2bb29..a75cd45c3b8d5d8ab17379b41b508b7897804a8c 100644
--- a/jams-react-client/src/locales/fi/translation.json
+++ b/jams-react-client/src/locales/fi/translation.json
@@ -9,7 +9,7 @@
     "settings": "Asetukset",
     "Logout": "Kirjaudu ulos",
     "create_user": "Luo käyttäjä",
-    "login_failed": "Kirjautuminen epäonnistui tarkista kirjautumistiedot",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Kirjaudu sisään",
     "common_name_is_required": "Nimi on pakollinen.",
     "state_is_required": "Lääni on pakollinen.",
@@ -34,10 +34,10 @@
     "select_option_setting_up_certificate_authority": "Valitse vaihtoehto varmenteen myöntäjän määrittämiseksi, jota käytetään allekirjoittamaan kaikki JAMS-liittymällä luodut Jami-tilit.",
     "import_certificate_authority": "Tuo varmenne",
     "must_be_60_characters_or_less": "Enintään 60 merkkiä",
-    "username_is_required": "Käyttäjätunnus vaaditaan",
+    "username_is_required": "Username is required.",
     "must_be_50_characters_or_less": "Enintään 50 merkkiä",
     "password_must_match": "Salasanojen täytyy täsmätä",
-    "password_confirmation_required": "Salasanan vahvistus vaaditaan",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "Annetut tiedot näyttävät olevan virheellisiä, yhteys hakemistoon epäonnistui. Tarkista antamasi tiedot ja kirjautumistiedot ja yritä uudelleen.",
     "identity_management": "Identiteetin hallinta",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Palvelimen parametrit",
     "choose_a_country": "Valitse maa",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/he/translation.json b/jams-react-client/src/locales/he/translation.json
index 34e94d3c056a4385127b42e6b5668ea51fe8ab22..c3ec8df9cc3c680471e21b77b587e1921fb18c83 100644
--- a/jams-react-client/src/locales/he/translation.json
+++ b/jams-react-client/src/locales/he/translation.json
@@ -9,7 +9,7 @@
     "settings": "הגדרות",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "האם אכן ברצונך למחוק",
     "remove": "הסרה",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "הגדרות מתקדמות",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/hi_IN/translation.json b/jams-react-client/src/locales/hi_IN/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/hi_IN/translation.json
+++ b/jams-react-client/src/locales/hi_IN/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/hu/translation.json b/jams-react-client/src/locales/hu/translation.json
index 92576c61417b85c03051f3d8724cdd72aa23838e..1833ad4eb56f3dfdf934cd94dfb7846cf07ddaad 100644
--- a/jams-react-client/src/locales/hu/translation.json
+++ b/jams-react-client/src/locales/hu/translation.json
@@ -9,7 +9,7 @@
     "settings": "Beállítások",
     "Logout": "Kijelentkezés",
     "create_user": "Felhasználó létrehozása",
-    "login_failed": "A bejelentkezés sikertelen, ellenőrizze hitelesítő adatait",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Bejelentkezés",
     "common_name_is_required": "Köznapi név szükséges.",
     "state_is_required": "Állam/megye szükséges",
@@ -34,10 +34,10 @@
     "select_option_setting_up_certificate_authority": "Válasszon egy választási lehetőséget a hitelesítésszolgáltató beállításához, amelyet a JAMS-példányon létrehozott összes Jami-fiók aláírásához használnak.",
     "import_certificate_authority": "Hitelesítésszolgáltató importálása",
     "must_be_60_characters_or_less": "Legfeljebb 60 karakter lehet",
-    "username_is_required": "Felhasználónév szükséges.",
+    "username_is_required": "Username is required.",
     "must_be_50_characters_or_less": "Legfeljebb 50 karakter lehet",
     "password_must_match": "A jelszavaknak egyezniük kell",
-    "password_confirmation_required": "Jelszó megerősítése szükséges.",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "A megadott adatok helytelennek tűnnek, a könyvtárhoz való kapcsolódás nem sikerült. Kérjük, ellenőrizze a megadott adatokat és hitelesítő adatokat, majd próbálkozzon újra.",
     "identity_management": "Identitáskezelés",
     "select_type_of_user_directory": "Válassza ki a felhasználói könyvtár típusát ami lesz JAMS-be integrált",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Hitelesítésszolgáltató beállításai",
     "server_parameters": "Kiszolgáló paraméterei",
     "choose_a_country": "Ország kiválasztása",
-    "active_directory_server_informations": "Active Directory-kiszolgáló adatai",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Kikötő",
     "host": "Gazdagép",
     "admin_username": "Rendszergazdai felhasználónév",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Alap megkülönböztető név (Kérjük, használja az LDAP-mondattant)",
     "field_ldap_structure_contains_username": "Az LDAP szerkezet mezője, amely tartalmazza a felhasználónevet.",
     "use_public_nameserver": "Nyilvános névkiszolgáló használata",
-    "check_box_register_usernames_on_jami_public_nameserver": "A jelölőnégyzet bejelölésével regisztrálja a felhasználóneve a Jami nyilvános kiszolgálói névére.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Tartomány szükséges.",
     "5_minutes": "5 perc",
     "10_minutes": "10 perc",
@@ -73,7 +73,7 @@
     "please_enter_valid_cors_domain_url": "Kérjük, adjon meg egy érvényes CORS-tartomány URL-címet.",
     "global_parameters_cover_general_configuration_of_servers_engine": "A globális paraméterek lefedik a kiszolgáló motorjának általános beállításait.",
     "cors_domain_name": "CORS-tartománynév",
-    "set_domain_of_web_cleint_server_to_connect_to_hans_admin_dashboard_and_jami_accounts_also_to_set_client_crls_ocsps": "A webes ügyfél-kiszolgáló tartomány beállítása, hogy csatlakozzon a JAMS rendszergazda irányítópultjához és a Jami-fiókokhoz. Azt is meghatározzák, hogy az ügyfeleknek honnan kell letölteniük a visszavonási listákat és be kell nyújtaniuk az OCSP lekérdezéseket. Abban az esetben, ha proxy-példányt futtat (azaz JAMS-t az IIS mögött), kérjük, győződjön meg arról, hogy ezt a mezőt megfelelően állította be, különben az eszközök nem lesznek képesek visszavonási listák letöltésére vagy a tanúsítványok érvényesítésére.",
+    "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": "Tartomány neve az ügyfél-kiszolgáló alkalmazásnak. http:// vagy https:// szükséges.",
     "domain": "Tartomány",
     "certificate_revocation_list_lifetime": "Visszavonási lista élettartama",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "A fiók élettartamának hosszabbnak kell lennie, mint az eszköz élettartama.",
     "sip_configuration_template": "SIP-beállítások sablon",
     "set_server_parameters": "Kiszolgáló paraméterei beállítása",
-    "search_users_using": "Felhasználói mezők keresése (felhasználónév, név, telefon, e-mail, …)",
+    "search_users_using": "Search users using (username, first name, last name)",
     "search_users": "Felhasználók keresése",
     "servername_is_required": "Kiszolgálónév szükséges.",
     "password_is_required": "Jelszó szükséges.",
@@ -96,7 +96,7 @@
     "local_database": "Helyi adatbázis",
     "ldap_server": "LDAP-kiszolgáló",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "Nincs olyan felhasználó, amely megfelelne a keresési értéknek!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Eszköz neve",
     "status": "Állapot",
     "actions": "Műveletek",
@@ -107,35 +107,35 @@
     "update": "Frissítés",
     "are_you_sure_you_want_to_revoke_this_device": "Biztosan visszavonja ezt az eszközt?",
     "confirm_revoke": "Visszavonás megerősítése",
-    "add_a_contact": "Kapcsolat hozzáadása",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A JAMS új verziója elérhető. Kíván most frissíteni?",
     "running_community_version_jams": "Ön jelenleg a JAMS közösségi verzióját futtatja. Szeretne JAMS-előfizetést vásárolni?",
     "you_are_not_allowed_to_access_this_section": "Nincs hozzáférése ehhez a részhez. A rendszergazdai jogosultságokért forduljon a rendszergazdához.",
     "an_update_is_available_for_jams": "Frissítés érhető el a JAMS-hez.",
     "updating_jams_shutting_down_shortly": "JAMS frissítése, hamarosan leáll…",
-    "error_while_attempting_update_jams": "Hiba történt a JAMS frissítése közben:",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Engedélyek",
     "configuration": "Konfigurálás",
-    "updated_blueprint_configuration_successfully": "A tervrajz-beállítások sikeresen frissítve!",
-    "error_updating_blueprint_configuration": "Hiba történt a tervrajz-beállítások frissítése közben.",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "UPnP engedélyezése",
-    "use_jami_default_turn_configuration": "Jami alapértelmezett TURN-beállításai használata",
-    "use_a_custom_turn_configuration": "Egyéni TURN-beállításai használata",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN-kiszolgáló címe",
     "turn_server_username": "TURN-kiszolgáló felhasználónév",
     "turn_server_password": "TURN-kiszolgáló jelszó",
-    "disable_turn_configuration": "TURN-beállításai letiltása",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Jami alapértelmezett DHT-proxybeállításai használata",
     "use_a_custom_dht_proxy_configuration": "Jami egyéni DHT-proxybeállításai használata",
     "dht_proxy_server_name": "Meghatalmazott DHT-kiszolgáló neve",
     "dht_proxy_list_url": "DHT proxy lista URL-je",
     "disable_dht_proxy_configuration": "Meghatalmazott DHT-beállításai letiltása",
-    "updated_blueprint_permissions_successfully": "Tervrajz engedélyei sikeresen frissítve!",
-    "error_updating_blueprint_permissions": "Hiba történt a tervrajz engedélyei frissítése közben.",
-    "allow_video_calls": "Videohívások engedélyezése",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "allow_video_calls": "Allow video calls",
     "allow_incoming_calls_from_unknown_contacts": "Az ismeretlen kapcsolatoktól érkező bejövő hívások engedélyezése",
     "auto_answer_calss": "Önműködő hívásfogadása",
-    "allow_use_of_jami_in_local_lan": "Jami használata a helyi LAN-hálózaton engedélyezése",
+    "allow_use_of_jami_in_local_lan": "Allow Jami usage on the local LAN",
     "convert_your_account_into_a_rendezvous_point": "Találkozási pont mód engedélyezése ehhez a fiókhoz",
     "blueprint_name_already_exists": "Tervrajz neve már létezik!",
     "blueprint_name_is_empty": "Tervrajz neve üres",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Biztosan törli a(z)",
     "remove": "Eltávolítás",
     "create_blueprint": "Tervrajz létrehozása",
-    "search_blueprints_placeholder": "Tervrajz keresése…",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Tervrajz keresése",
-    "no_blueprints_found": "Nem található tervrajz.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "Nincs tervrajz neve",
     "no_description": "Nincs leírás",
     "no_users_count": "Nem található felhasználó",
-    "add_contact": "Kapcsolat hozzáadása…",
+    "add_contact": "Add contact…",
     "remove_contact": "Kapcsolat eltávolítása",
     "are_you_sure_you_want_to_remove": "Biztos, hogy eltávolítja a következőt:",
     "from": "elem a(z)",
     "contacts": "kapcsolatokból",
-    "search_contacts_using": "Kapcsolatok mezők keresése (uri, keresztnév, vezetéknév)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Keresés a kapcsolatok között",
     "has_no_contacts": " nincs kapcsolatok",
     "edit_group": "Csoport szerkesztése",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Csoport neve már létezik!",
     "group_name_is_empty": "Csoport neve üres",
     "remove_group": "Csoport eltávolítása",
-    "search_groups_placeholder": "Csoportok keresése…",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Csoportok keresése",
     "no_groups_found": "Nem található csoport.",
     "blueprint": "Tervrajz",
-    "admin_password": "Rendszergazda jelszava",
     "subscription": "Előfizetés",
     "an_error_occured_while_getting_license_information": "Hiba történt az előfizetési adatok lekérése közben!",
-    "subscription_code_is_required": "Előfizetési kód szükséges.",
-    "license_registred_successfully": "Előfizetés sikeresen regisztrálva!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "Általános hiba történt az előfizetés betöltésekor vagy az előfizetés nem található!",
     "subscription_code": "Előfizetési kód",
     "register": "Bejegyez",
     "your_license_is_already_activated": "Az előfizetésed már engedélyezve van!",
-    "admin_password_updated_successfully": "Rendszergazda jelszava sikeresen frissítve!",
+    "admin_password_updated_successfully": "Administrator password successfully updated.",
     "updating_user": "A(z) ",
     "password_failed": " felhasználói jelszó frissítése hibával meghiúsult: ",
     "enter_the_following_information_below_to_change_your_admin_password": "A rendszergazda jelszó megváltoztatásához írja be az alábbi adatokat.",
@@ -226,8 +225,10 @@
     "devices": "Eszközök",
     "no_users_found": "Nem található felhasználó.",
     "advanced_settings": "Haladó beállítások",
-    "create_administrator": "Rendszergazda létrehozása",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Illessze be a Jami áruházból kapott JAMS Enterprise előfizetési kódot.",
     "blueprint_name": "Tervrajz neve",
-    "validate": "Érvényesítés"
+    "validate": "Érvényesítés",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/id/translation.json b/jams-react-client/src/locales/id/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/id/translation.json
+++ b/jams-react-client/src/locales/id/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/it/translation.json b/jams-react-client/src/locales/it/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/it/translation.json
+++ b/jams-react-client/src/locales/it/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ja/translation.json b/jams-react-client/src/locales/ja/translation.json
index 9d648825fa0f9283d408f621fd89b4ff73d5c0e4..08d3a2996544725e7dc2ff3fba530212ef185547 100644
--- a/jams-react-client/src/locales/ja/translation.json
+++ b/jams-react-client/src/locales/ja/translation.json
@@ -9,7 +9,7 @@
     "settings": "設定",
     "Logout": "ログアウト",
     "create_user": "ユーザーを作成",
-    "login_failed": "ログインに失敗しました。認証情報が正しいかご確認ください。",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "ログイン",
     "common_name_is_required": "コモンネーム(Common name)が必要です。",
     "state_is_required": "都道府県名(State)が必要です。",
@@ -34,10 +34,10 @@
     "select_option_setting_up_certificate_authority": "この JAMS インスタンスで生成されたすべての Jami アカウントの署名に使用する認証局を設定する方法を選択してください。",
     "import_certificate_authority": "認証局をインポート",
     "must_be_60_characters_or_less": "60文字以下にする必要があります",
-    "username_is_required": "ユーザー名が必要です",
+    "username_is_required": "Username is required.",
     "must_be_50_characters_or_less": "50文字以下にする必要があります",
     "password_must_match": "パスワードは一致する必要があります",
-    "password_confirmation_required": "パスワードの確認が必要です",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "指定された情報が正しくないと思われます。指定された情報と資格情報を確認して、もう一度やり直してください。",
     "identity_management": "ID マネージャー",
     "select_type_of_user_directory": "JAMS と統合するユーザーディレクトリの種類を選択してください",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "認証局をセットアップ",
     "server_parameters": "サーバーパラメーター",
     "choose_a_country": "国を選択",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ko/translation.json b/jams-react-client/src/locales/ko/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/ko/translation.json
+++ b/jams-react-client/src/locales/ko/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/lt/translation.json b/jams-react-client/src/locales/lt/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/lt/translation.json
+++ b/jams-react-client/src/locales/lt/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/nb/translation.json b/jams-react-client/src/locales/nb/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/nb/translation.json
+++ b/jams-react-client/src/locales/nb/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/nl/translation.json b/jams-react-client/src/locales/nl/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/nl/translation.json
+++ b/jams-react-client/src/locales/nl/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/oc/translation.json b/jams-react-client/src/locales/oc/translation.json
index 411a67c86df2b79cf772578c3660e2a7d0ed74c4..515221c8380ae7b8365eadee9f8ded0a7966373a 100644
--- a/jams-react-client/src/locales/oc/translation.json
+++ b/jams-react-client/src/locales/oc/translation.json
@@ -9,7 +9,7 @@
     "settings": "Paramètres",
     "Logout": "Desconnexion",
     "create_user": "Crear utilizaire",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Connexion",
     "common_name_is_required": "Un nom comun es necessari",
     "state_is_required": "L’estat es requerit",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Paramètres servidor",
     "choose_a_country": "Causir un país",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Pòrt",
     "host": "Ã’ste",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutas",
     "10_minutes": "10 minutas",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domeni",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "search_users_using": "Search users using (username, first name, last name)",
     "search_users": "Cercar utilizaires",
     "servername_is_required": "Lo nom del servidor es requerit.",
     "password_is_required": "Lo senhal es requerit.",
@@ -96,7 +96,7 @@
     "local_database": "Basa de donadas locala",
     "ldap_server": "Servidor LDAP",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "Cap d’utilizaire pas trobat que corresponda a la recèrca !",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/pa/translation.json b/jams-react-client/src/locales/pa/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/pa/translation.json
+++ b/jams-react-client/src/locales/pa/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/pl/translation.json b/jams-react-client/src/locales/pl/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/pl/translation.json
+++ b/jams-react-client/src/locales/pl/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/pt/translation.json b/jams-react-client/src/locales/pt/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/pt/translation.json
+++ b/jams-react-client/src/locales/pt/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/pt_BR/translation.json b/jams-react-client/src/locales/pt_BR/translation.json
index 89fc7717de96c6a83f65b787c1b06d58edcd0905..a6fe0844d23119f11745e1cb27f36b05f4906042 100644
--- a/jams-react-client/src/locales/pt_BR/translation.json
+++ b/jams-react-client/src/locales/pt_BR/translation.json
@@ -9,7 +9,7 @@
     "settings": "Configurações",
     "Logout": "Sair",
     "create_user": "Criar um usuário",
-    "login_failed": "Login falhou, verifique suas credenciais",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Acessar",
     "common_name_is_required": "O nome comum é obrigatório.",
     "state_is_required": "O estado é exigido.",
@@ -34,10 +34,10 @@
     "select_option_setting_up_certificate_authority": "Selecione uma opção para configurar a autoridade certificadora que será usada para assinar todas as contas de Jami geradas nesta instância de JAMS.",
     "import_certificate_authority": "Importar a Autoridade Certificadora",
     "must_be_60_characters_or_less": "Deve ter 60 caracteres ou menos",
-    "username_is_required": "O nome de usuário é obrigatório",
+    "username_is_required": "Username is required.",
     "must_be_50_characters_or_less": "Deve ter 50 caracteres ou menos",
     "password_must_match": "As senhas devem ser iguais",
-    "password_confirmation_required": "A confirmação da senha é necessária",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "As informações fornecidas parecem estar incorretas, a conexão com o diretório falhou. Favor verificar as informações e credenciais fornecidas e tentar novamente.",
     "identity_management": "Gerenciamento de Identidade",
     "select_type_of_user_directory": "Selecione o tipo de diretório de usuário a ser integrado ao JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Configuração de Autoridade Certificadora",
     "server_parameters": "Parâmetros de Servidor",
     "choose_a_country": "Escolha um país",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ro/translation.json b/jams-react-client/src/locales/ro/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/ro/translation.json
+++ b/jams-react-client/src/locales/ro/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ro_RO/translation.json b/jams-react-client/src/locales/ro_RO/translation.json
index cfd8bd8de6f291747b85af37a16e1260c7423fae..725f3df0e7894b822bd184c197982abfa2acd051 100644
--- a/jams-react-client/src/locales/ro_RO/translation.json
+++ b/jams-react-client/src/locales/ro_RO/translation.json
@@ -9,7 +9,7 @@
     "settings": "Reglări",
     "Logout": "Deconectare",
     "create_user": "Creează un utilizator",
-    "login_failed": "Conectare nereușită, verifică datele",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Autentificare",
     "common_name_is_required": "Un Nume Comun e obligatoriu.",
     "state_is_required": "Județul e obligatorie.",
@@ -34,10 +34,10 @@
     "select_option_setting_up_certificate_authority": "Alege o opțiune pentru configurarea Autorității de Certificare care va fi utilizată pentru a semna toate conturile Jami generate pe acest JAMS.",
     "import_certificate_authority": "Importă o Autoritate de Certificare",
     "must_be_60_characters_or_less": "Trebuie să fie maxim 60 de caractere",
-    "username_is_required": "Nume de Utilizator obligatoriu",
+    "username_is_required": "Username is required.",
     "must_be_50_characters_or_less": "Trebuie să fie maxim 50 de caractere",
     "password_must_match": "Parolele trebuie să fie la fel",
-    "password_confirmation_required": "Confirmarea parolei e obligatorie",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "Informațiile furnizate par a fi incorecte, legătura la director a eșuat. Verifică informațiile și datele de autentificare furnizate și încearcă din nou.",
     "identity_management": "Administrarea Identității",
     "select_type_of_user_directory": "Alege tipul de director care să fie integrat în JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Configurarea Autorității de Certificare",
     "server_parameters": "Parametrii Serverului",
     "choose_a_country": "Alege o țară",
-    "active_directory_server_informations": "Informații despre serverul Active Directory",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Gazdă",
     "admin_username": "Utilizator administrator",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Folosește convenția LDAP)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Folosește un server public de nume",
-    "check_box_register_usernames_on_jami_public_nameserver": "Bifează acest loc dacă vrei să înscrii numele utilizatorilor pe serverul public Jami.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domeniul e obligatoriu.",
     "5_minutes": "5 minute",
     "10_minutes": "10 minute",
@@ -73,7 +73,7 @@
     "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": "Stabilește domeniul serverului client web pentru a te conecta la panoul de control administrativ JAMS și la conturile Jami. Este utilizat și pentru a defini unde ar trebui clienții să descarce CRL-uri și să trimită interogări OCSP. În cazul în care folosești o instanță proxy (adică JAMS în spatele IIS), asigură-te că definești corect acest cîmp, altfel dispozitivele nu vor putea descărca CRL-uri sau valida certificate.",
+    "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": "Domeniu",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "Durata contului trebuie să fie mai mare decît Durata aparatului.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "Server LDAP",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Numele Aparatului",
     "status": "Stare",
     "actions": "Acțiuni",
@@ -107,35 +107,35 @@
     "update": "Actualizare",
     "are_you_sure_you_want_to_revoke_this_device": "Sigur vrei să elimini acest aparat?",
     "confirm_revoke": "Confirmă Eliminarea",
-    "add_a_contact": "Adaugă un contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "E disponibilă o nouă versiune JAMS. Vrei să actualizezi acum?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "O actualizare este disponibilă pentru JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permisiuni",
     "configuration": "Configurare",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Activează UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Permite apeluri video",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "allow_video_calls": "Allow video calls",
     "allow_incoming_calls_from_unknown_contacts": "Permite apelurile primite de la contacte necunoscute",
     "auto_answer_calss": "Răspuns automat la apeluri",
-    "allow_use_of_jami_in_local_lan": "Allow use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Elimină",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Aparate",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Creează Administratorul",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ru/translation.json b/jams-react-client/src/locales/ru/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/ru/translation.json
+++ b/jams-react-client/src/locales/ru/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/sk/translation.json b/jams-react-client/src/locales/sk/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/sk/translation.json
+++ b/jams-react-client/src/locales/sk/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/sl/translation.json b/jams-react-client/src/locales/sl/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/sl/translation.json
+++ b/jams-react-client/src/locales/sl/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/sq_AL/translation.json b/jams-react-client/src/locales/sq_AL/translation.json
index 9392d65bb78662966ade7bed13fbbe0efca68138..c40baea7fc6670103ae79e6559fe8d520a063882 100644
--- a/jams-react-client/src/locales/sq_AL/translation.json
+++ b/jams-react-client/src/locales/sq_AL/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/sr/translation.json b/jams-react-client/src/locales/sr/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/sr/translation.json
+++ b/jams-react-client/src/locales/sr/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/sv/translation.json b/jams-react-client/src/locales/sv/translation.json
index 0c209367421945d2ca6914c20273f27c3ad38ab7..8f2eaf8eaa2f0663c0c1ecce236dd2d3f02b7ac9 100644
--- a/jams-react-client/src/locales/sv/translation.json
+++ b/jams-react-client/src/locales/sv/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/sw/translation.json b/jams-react-client/src/locales/sw/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/sw/translation.json
+++ b/jams-react-client/src/locales/sw/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/ta/translation.json b/jams-react-client/src/locales/ta/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/ta/translation.json
+++ b/jams-react-client/src/locales/ta/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/te/translation.json b/jams-react-client/src/locales/te/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/te/translation.json
+++ b/jams-react-client/src/locales/te/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/tr/translation.json b/jams-react-client/src/locales/tr/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/tr/translation.json
+++ b/jams-react-client/src/locales/tr/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/tr_TR/translation.json b/jams-react-client/src/locales/tr_TR/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/tr_TR/translation.json
+++ b/jams-react-client/src/locales/tr_TR/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/tt/translation.json b/jams-react-client/src/locales/tt/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/tt/translation.json
+++ b/jams-react-client/src/locales/tt/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/uk/translation.json b/jams-react-client/src/locales/uk/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/uk/translation.json
+++ b/jams-react-client/src/locales/uk/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/vi/translation.json b/jams-react-client/src/locales/vi/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/vi/translation.json
+++ b/jams-react-client/src/locales/vi/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/zh/translation.json b/jams-react-client/src/locales/zh/translation.json
index 749fa35473d3d4723eeacdad9653a90438d14e0e..59da98556d944c1244513b0c19463daf1a1b4338 100644
--- a/jams-react-client/src/locales/zh/translation.json
+++ b/jams-react-client/src/locales/zh/translation.json
@@ -9,7 +9,7 @@
     "settings": "Settings",
     "Logout": "Logout",
     "create_user": "Create user",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/locales/zh_TW/translation.json b/jams-react-client/src/locales/zh_TW/translation.json
index 28ef638348b43f5214017ffe61192542e92e8b12..a20e16cb05c6202b95804947b8a6a80c96a42d99 100644
--- a/jams-react-client/src/locales/zh_TW/translation.json
+++ b/jams-react-client/src/locales/zh_TW/translation.json
@@ -9,7 +9,7 @@
     "settings": "設定",
     "Logout": "登出",
     "create_user": "建立使用者",
-    "login_failed": "Login failed check your credentials",
+    "login_failed": "Login failed. Check your credentials.",
     "sign_in": "Sign In",
     "common_name_is_required": "Common name is required.",
     "state_is_required": "State is required.",
@@ -34,10 +34,10 @@
     "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",
+    "password_confirmation_required": "Password confirmation is required.",
     "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
     "identity_management": "Identity Management",
     "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
@@ -46,7 +46,7 @@
     "certificate_authority_setup": "Certificate Authority Setup",
     "server_parameters": "Server Parameters",
     "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active directory server informations",
+    "active_directory_server_informations": "Active Directory server information",
     "port": "Port",
     "host": "Host",
     "admin_username": "Admin username",
@@ -59,7 +59,7 @@
     "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
     "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
     "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public nameserver.",
+    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
     "domain_is_required": "Domain is required.",
     "5_minutes": "5 minutes",
     "10_minutes": "10 minutes",
@@ -73,7 +73,7 @@
     "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.",
+    "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": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
@@ -83,7 +83,7 @@
     "account_lifetime_should_be_bigger_to_device_lifetime": "The account lifetime should be longer than the Device lifetime.",
     "sip_configuration_template": "SIP Configuration Template",
     "set_server_parameters": "Set Server Parameters",
-    "search_users_using": "Search users using (username, name, phone, email, ...)",
+    "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.",
@@ -96,7 +96,7 @@
     "local_database": "Local Database",
     "ldap_server": "LDAP Server",
     "active_directory": "Active Directory",
-    "no_users_found_matching": "No users found mathcing search value!",
+    "no_users_found_matching": "No users found matching search value!",
     "device_name": "Device Name",
     "status": "Status",
     "actions": "Actions",
@@ -107,35 +107,35 @@
     "update": "Update",
     "are_you_sure_you_want_to_revoke_this_device": "Are you sure you want to revoke this device?",
     "confirm_revoke": "Confirm Revoke",
-    "add_a_contact": "Add a contact",
+    "add_a_contact": "Add contact",
     "new_version_jams_available": "A new version of JAMS is available. Would you like to update now?",
     "running_community_version_jams": "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?",
     "you_are_not_allowed_to_access_this_section": "You are not allowed to access this section. Please contact your administrator to get administrator privileges.",
     "an_update_is_available_for_jams": "An update is available for JAMS.",
     "updating_jams_shutting_down_shortly": "Updating JAMS, shutting down shortly...",
-    "error_while_attempting_update_jams": "Error while attempting to update JAMS: ",
+    "error_while_attempting_update_jams": "Error occurred while attempting to update JAMS:",
     "permissions": "Permissions",
     "configuration": "Configuration",
-    "updated_blueprint_configuration_successfully": "Updated blueprint configuration successfully !",
-    "error_updating_blueprint_configuration": "Error updating blueprint configuration ",
+    "updated_blueprint_configuration_successfully": "Blueprint configuration successfully updated.",
+    "error_updating_blueprint_configuration": "Error occurred while updating blueprint configuration.",
     "enable_upnp": "Enable UPnP",
-    "use_jami_default_turn_configuration": "Use Jami default Turn configuration",
-    "use_a_custom_turn_configuration": "Use a custom Turn configuration",
+    "use_jami_default_turn_configuration": "Use Jami default TURN configuration",
+    "use_a_custom_turn_configuration": "Use a custom TURN configuration",
     "turn_server_address": "TURN Server address",
     "turn_server_username": "TURN server username",
     "turn_server_password": "TURN server password",
-    "disable_turn_configuration": "Disable Turn configuration",
+    "disable_turn_configuration": "Disable TURN configuration",
     "use_jami_default_dht_proxy_configuration": "Use Jami default DHT Proxy configuration",
     "use_a_custom_dht_proxy_configuration": "Use a custom DHT Proxy configuration",
     "dht_proxy_server_name": "DHT proxy server name",
     "dht_proxy_list_url": "DHT proxy List URL",
     "disable_dht_proxy_configuration": "Disable DHT Proxy configuration",
-    "updated_blueprint_permissions_successfully": "Updated blueprint permissions successfully !",
-    "error_updating_blueprint_permissions": "Error updating blueprint permissions ",
-    "allow_video_calls": "Allow videos calls",
+    "updated_blueprint_permissions_successfully": "Blueprint permissions successfully updated.",
+    "error_updating_blueprint_permissions": "Error occurred while updating blueprint permissions.",
+    "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 use of Jami in a local lan",
+    "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",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
@@ -143,18 +143,18 @@
     "are_you_sure_you_want_to_delete": "Are you sure you want to delete",
     "remove": "Remove",
     "create_blueprint": "Create blueprint",
-    "search_blueprints_placeholder": "Search blueprints ...",
+    "search_blueprints_placeholder": "Search blueprints…",
     "search_blueprints": "Search blueprints",
-    "no_blueprints_found": "No blueprints found.",
+    "no_blueprints_found": "No blueprints found",
     "no_blueprint_name": "No blueprint name",
     "no_description": "No description",
     "no_users_count": "No users count",
-    "add_contact": "Add contact ...",
+    "add_contact": "Add contact…",
     "remove_contact": "Remove contact",
     "are_you_sure_you_want_to_remove": "Are you sure you want to remove",
     "from": "from",
     "contacts": "contacts",
-    "search_contacts_using": "Search contacts using (uri, firstname, lastname)",
+    "search_contacts_using": "Search contact fields (URI, firstname, lastname)",
     "search_contacts": "Search contacts",
     "has_no_contacts": " has no contacts",
     "edit_group": "Edit group",
@@ -166,20 +166,19 @@
     "group_name_already_exists": "Group name already exists!",
     "group_name_is_empty": "Group name is empty",
     "remove_group": "Remove group",
-    "search_groups_placeholder": "Search groups ...",
+    "search_groups_placeholder": "Search groups…",
     "search_groups": "Search groups",
     "no_groups_found": "No groups Found",
     "blueprint": "Blueprint",
-    "admin_password": "Admin Password",
     "subscription": "Subscription",
     "an_error_occured_while_getting_license_information": "An error occurred while getting subscription information!",
-    "subscription_code_is_required": "Subscription code is required",
-    "license_registred_successfully": "Subscription registered successfully!",
+    "subscription_code_is_required": "Subscription code is required.",
+    "license_registred_successfully": "Subscription successfully registered.",
     "a_generic_occured_while_trying_to_load_license_or_license_could_not_be_found": "A generic occurred while trying to load your subscription or your subscription could not be found!",
     "subscription_code": "Subscription Code",
     "register": "Register",
     "your_license_is_already_activated": "Your subscription is already activated!",
-    "admin_password_updated_successfully": "Admin password updated successfully!",
+    "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.",
@@ -226,8 +225,10 @@
     "devices": "Devices",
     "no_users_found": "No users found",
     "advanced_settings": "Advanced settings",
-    "create_administrator": "Create Administrator",
+    "create_administrator": "Create administrator account",
     "paste_your_jams_enterprise_subscription_code_received_from_jami": "Paste your JAMS Enterprise subscription code received from the Jami store.",
     "blueprint_name": "Blueprint name",
-    "validate": "Validate"
+    "validate": "Validate",
+    "change_language": "Change language",
+    "general": "General"
 }
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js b/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js
index c45c4fea14c7ce5523913bd594cfa6119f96f6e7..a64d2ac69aef97cd086c735329be2751ad09d707 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js
@@ -314,13 +314,13 @@ export default function EditBlueprintConfiguration(props) {
         setOpen(false);
         setSeverity("success");
         setOpen(true);
-        setMessage(i18next.t("updated_blueprint_configuration_successfully", "Updated blueprint configuration successfully !"));
+        setMessage(i18next.t("updated_blueprint_configuration_successfully", "Blueprint configuration successfully updated."));
       })
       .catch((error) => {
         setOpen(false);
         setSeverity("error");
         setOpen(true);
-        setMessage(i18next.t("error_updating_blueprint_configuration", "Error updating blueprint configuration ") + error + "!");
+        setMessage(i18next.t("error_updating_blueprint_configuration", "Error occurred while updating blueprint configuration.") + error + "!");
       });
   };
 
@@ -430,12 +430,12 @@ export default function EditBlueprintConfiguration(props) {
                         <FormControlLabel
                           value="defaultTurn"
                           control={<StyledRadio />}
-                          label={i18next.t("use_jami_default_turn_configuration", "Use Jami default Turn configuration")}
+                          label={i18next.t("use_jami_default_turn_configuration", "Use Jami default TURN configuration")}
                         />
                         <FormControlLabel
                           value="customTurn"
                           control={<StyledRadio />}
-                          label={i18next.t("use_a_custom_turn_configuration", "Use a custom Turn configuration")}
+                          label={i18next.t("use_a_custom_turn_configuration", "Use a custom TURN configuration")}
                         />
                         <FormGroup
                           row
@@ -551,7 +551,7 @@ export default function EditBlueprintConfiguration(props) {
                         <FormControlLabel
                           value="disabledTurn"
                           control={<StyledRadio />}
-                          label={i18next.t("disable_turn_configuration", "Disable Turn configuration")}
+                          label={i18next.t("disable_turn_configuration", "Disable TURN configuration")}
                         />
                       </RadioGroup>
                     </FormControl>
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
index bc11fc45a776b1a02c86460216fcb8101c39e72c..cb08a58b21f789ae92144e351d88731cda2e12d6 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
@@ -202,13 +202,13 @@ export default function EditBlueprintPermissions(props) {
         setOpen(false);
         setSeverity("success");
         setOpen(true);
-        setMessage(i18next.t("updated_blueprint_permissions_successfully", "Updated blueprint permissions successfully !"));
+        setMessage(i18next.t("updated_blueprint_permissions_successfully", "Blueprint permissions successfully updated."));
       })
       .catch((error) => {
         setOpen(false);
         setSeverity("error");
         setOpen(true);
-        setMessage(i18next.t("error_updating_blueprint_permissions", "Error updating blueprint permissions ") + error + "!");
+        setMessage(i18next.t("error_updating_blueprint_permissions", "Error occurred while updating blueprint permissions.") + error + "!");
       });
   };
 
@@ -259,7 +259,7 @@ export default function EditBlueprintPermissions(props) {
                             name="videoEnabled"
                           />
                         }
-                        label={i18next.t("allow_video_calls", "Allow videos calls")}
+                        label={i18next.t("allow_video_calls", "Allow video calls")}
                       />
                     </FormGroup>
                     <FormGroup row>
@@ -316,7 +316,7 @@ export default function EditBlueprintPermissions(props) {
                             name="peerDiscovery"
                           />
                         }
-                        label={i18next.t("allow_use_of_jami_in_local_lan", "Allow use of Jami in a local lan")}
+                        label={i18next.t("allow_use_of_jami_in_local_lan", "Allow Jami usage on the local LAN")}
                       />
                     </FormGroup>
                     <FormGroup row>
diff --git a/jams-react-client/src/views/Blueprints/Blueprints.js b/jams-react-client/src/views/Blueprints/Blueprints.js
index e55eabd3dba3125b0ce61adfe417cb5f5f3f62ad..9cb58bcc681b7aaea952ac89946976dc508d5d37 100644
--- a/jams-react-client/src/views/Blueprints/Blueprints.js
+++ b/jams-react-client/src/views/Blueprints/Blueprints.js
@@ -353,7 +353,7 @@ export default function Blueprints() {
                       className: classes.margin + " " + classes.search,
                     }}
                     inputProps={{
-                      placeholder: i18next.t("search_blueprints_placeholder", "Search blueprints ..."),
+                      placeholder: i18next.t("search_blueprints_placeholder", "Search blueprints…"),
                       inputProps: {
                         "aria-label": i18next.t("search_blueprints", "Search blueprints"),
                       },
@@ -372,7 +372,7 @@ export default function Blueprints() {
             {zeroBlueprint ? (
               <div className={classes.blueprintsNotFound}>
                 <InfoIcon />
-                  <p style={{ marginLeft: "10px" }}>{i18next.t("no_blueprints_found", "No blueprints found.")}</p>
+                  <p style={{ marginLeft: "10px" }}>{i18next.t("no_blueprints_found", "No blueprints found")}</p>
               </div>
             ) : (
               blueprints.map((blueprint) => (
diff --git a/jams-react-client/src/views/Contacts/Contacts.js b/jams-react-client/src/views/Contacts/Contacts.js
index 491a98f70b34375bf4a3111a3d20b8d7193ec8af..eacd028309230dda0f2de8ea7bf75cc63af7151a 100644
--- a/jams-react-client/src/views/Contacts/Contacts.js
+++ b/jams-react-client/src/views/Contacts/Contacts.js
@@ -258,7 +258,7 @@ export default function Users(props) {
         setOpenDrawer={setOpenDrawer}
         direction="right"
         addingToGroup={false}
-        placeholder={i18next.t("add_contact", "Add contact ...")}
+        placeholder={i18next.t("add_contact", "Add contact…")}
       />
       <Dialog
         open={open}
@@ -293,7 +293,7 @@ export default function Users(props) {
               setOpenDrawer(true);
             }}
           >
-            <AddCircleOutlineIcon /> {i18next.t("add_a_contact", "Add a contact")}
+            <AddCircleOutlineIcon /> {i18next.t("add_a_contact", "Add contact")}
           </Button>
           <div className={classes.searchWrapper}>
             <CustomInput
@@ -301,7 +301,7 @@ export default function Users(props) {
                 className: classes.margin + " " + classes.search,
               }}
               inputProps={{
-                placeholder: i18next.t("search_contacts_using", "Search contacts using (uri, firstname, lastname)"),
+                placeholder: i18next.t("search_contacts_using", "Search contact fields (URI, firstname, lastname)"),
                 inputProps: {
                   "aria-label": i18next.t("search_contacts", "Search contacts"),
                 },
diff --git a/jams-react-client/src/views/Groups/Groups.js b/jams-react-client/src/views/Groups/Groups.js
index b3149c25eebe0687870f53b3649db83ba0828fb6..9679db81caf464cb2c67337ab789b7e0e8e3d3eb 100644
--- a/jams-react-client/src/views/Groups/Groups.js
+++ b/jams-react-client/src/views/Groups/Groups.js
@@ -421,7 +421,7 @@ export default function Groups() {
                     className: classes.margin + " " + classes.search,
                   }}
                   inputProps={{
-                    placeholder: i18next.t("search_groups_placeholder", "Search groups ..."),
+                    placeholder: i18next.t("search_groups_placeholder", "Search groups…"),
                     inputProps: {
                       "aria-label": i18next.t("search_groups", "Search groups"),
                     },
diff --git a/jams-react-client/src/views/Settings/General.js b/jams-react-client/src/views/Settings/General.js
index 7e37b2a4870249f9a58de83ad7c139f949026d24..43ae316653742e77afa6c68c3e92a3fb2a8b09f5 100644
--- a/jams-react-client/src/views/Settings/General.js
+++ b/jams-react-client/src/views/Settings/General.js
@@ -73,7 +73,7 @@ export default function General(props) {
     axios(configApiCall(api_path_put_update_user, "PUT", data, null))
       .then(() => {
         props.setSeverity("success");
-        props.setErrorMessage(i18next.t("admin_password_updated_successfully", "Admin password updated successfully!"));
+        props.setErrorMessage(i18next.t("admin_password_updated_successfully", "Administrator password successfully updated."));
         props.setError(true);
       })
       .catch((error) => {
diff --git a/jams-react-client/src/views/Settings/Subscription.js b/jams-react-client/src/views/Settings/Subscription.js
index 5a039fa03307a60295b72aac46894cfdc08108f0..6509844e3dea935a0477decd38c715b340a865c8 100644
--- a/jams-react-client/src/views/Settings/Subscription.js
+++ b/jams-react-client/src/views/Settings/Subscription.js
@@ -67,7 +67,7 @@ export default function Subscription(props) {
             subscriptionCode: '',
         },
         validationSchema: Yup.object({
-            subscriptionCode: Yup.string().required(i18next.t("subscription_code_is_required", "Subscription code is required")),
+            subscriptionCode: Yup.string().required(i18next.t("subscription_code_is_required", "Subscription code is required.")),
         }),
 
         onSubmit: values => {
@@ -82,7 +82,7 @@ export default function Subscription(props) {
         }
 
         axios(configApiCall(api_path_post_configuration_register_license, "POST", jsonData, null)).then(()=>{
-            props.setErrorMessage(i18next.t("license_registred_successfully", "Subscription registered successfully!"));
+            props.setErrorMessage(i18next.t("license_registred_successfully", "Subscription successfully registered."));
             props.setSeverity("success");
             props.setError(true);
         }).catch((error)=>{
diff --git a/jams-react-client/src/views/Users/Users.js b/jams-react-client/src/views/Users/Users.js
index b0c0011318c1b0bdd4567a4ae043545a1405f944..d6a08b07868691715a38ce0a1030bbd5f8ff20b5 100644
--- a/jams-react-client/src/views/Users/Users.js
+++ b/jams-react-client/src/views/Users/Users.js
@@ -358,7 +358,7 @@ export default function Users(props) {
               <InfoIcon />
 
               <p style={{ marginLeft: "10px" }}>
-                  {i18next.t("no_users_found_matching", "No users found mathcing search value!")}
+                  {i18next.t("no_users_found_matching", "No users found matching search value!")}
               </p>
             </div>
           )}
diff --git a/jams-server/doc/api_data.js b/jams-server/doc/api_data.js
index 698df5fc0d8ecbdee5db612d55b38b5e9cc051b9..51eb9b8e95f28913a7d609d10ce8569d349bfcdd 100644
--- a/jams-server/doc/api_data.js
+++ b/jams-server/doc/api_data.js
@@ -82,7 +82,7 @@ define({ "api": [
     "version": "1.0.0",
     "type": "put",
     "url": "/api/auth/contacts",
-    "title": "Add a contact",
+    "title": "Add contact",
     "name": "putContact",
     "group": "Contacts",
     "parameter": {
diff --git a/jams-server/doc/api_data.json b/jams-server/doc/api_data.json
index 2ca3f2c6b31b0078ef91347d2ce171b710fb946f..a204ed67c50f50f54898042a975d15db54157049 100644
--- a/jams-server/doc/api_data.json
+++ b/jams-server/doc/api_data.json
@@ -82,7 +82,7 @@
     "version": "1.0.0",
     "type": "put",
     "url": "/api/auth/contacts",
-    "title": "Add a contact",
+    "title": "Add contact",
     "name": "putContact",
     "group": "Contacts",
     "parameter": {
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/contacts/ContactServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/contacts/ContactServlet.java
index 7f1bbc8bcd76a73c0488f3ab0ea33ff72b7fce18..9d729168328f172e485512219dd2a1dcbcaeb8db 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/contacts/ContactServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/contacts/ContactServlet.java
@@ -50,72 +50,62 @@ import static net.jami.jams.server.Server.dataStore;
 @WebServlet("/api/admin/contacts")
 public class ContactServlet extends HttpServlet {
 
-
     /**
      * @apiVersion 1.0.0
      * @api {get} /api/auth/contacts View contacts
      * @apiName getContact
      * @apiGroup Contacts
      *
-     * @apiSuccess (200) {body} Contact[]  List of contacts for the user
-     * @apiSuccessExample {json} Success-Response:
-     *     [{
-     *       "uri": "jami://7e3ab29383",
-     *       "added": 18272662662
-     *     },
-     *     {
-     *        "uri": "jami://7e3ab29383",
-     *        "removed": 12387873
-     *      },
-     *     ]
+     * @apiSuccess (200) {body} Contact[] List of contacts for the user
+     * @apiSuccessExample {json} Success-Response: [{ "uri": "jami://7e3ab29383",
+     *                    "added": 18272662662 }, { "uri": "jami://7e3ab29383",
+     *                    "removed": 12387873 }, ]
      */
     @Override
-    @ScopedServletMethod(securityGroups = {AccessLevel.ADMIN})
+    @ScopedServletMethod(securityGroups = { AccessLevel.ADMIN })
     @JsonContent
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getParameter("username").toString(),""));
+        statementList.addStatement(new StatementElement("owner", "=", req.getParameter("username").toString(), ""));
         List<Contact> contactList = dataStore.getContactDao().getObjects(statementList);
         resp.getOutputStream().write(JsonStream.serialize(contactList).getBytes());
     }
 
-
     /**
      * @apiVersion 1.0.0
-     * @api {put} /api/auth/contacts Add a contact
+     * @api {put} /api/auth/contacts Add contact
      * @apiName putContact
      * @apiGroup Contacts
      *
      * @apiParam {body} Contact JSON representation of the contact object
-     * @apiParamExample {json} Request-Example:
-     *      {
-     *        "uri": "jami://7e3ab29383"
-     *      }
+     * @apiParamExample {json} Request-Example: { "uri": "jami://7e3ab29383" }
      *
      * @apiSuccess (200) {null} null successfully added contact
      * @apiError (500) {null} null contact could not be successfully added
      */
     @Override
-    @ScopedServletMethod(securityGroups = {AccessLevel.ADMIN})
+    @ScopedServletMethod(securityGroups = { AccessLevel.ADMIN })
     protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         Scanner s = new Scanner(req.getInputStream()).useDelimiter("\\A");
         String res = s.hasNext() ? s.next() : "";
         final JSONObject obj = new JSONObject(res);
         Contact contact = new Contact();
-        //TODO: Replace with mergetool.
+        // TODO: Replace with mergetool.
         contact.setDisplayName(obj.get("displayName").toString());
-        contact.setTimestamp(System.currentTimeMillis()/1000);
+        contact.setTimestamp(System.currentTimeMillis() / 1000);
         contact.setStatus('A');
         contact.setOwner(req.getParameter("username"));
         contact.setUri(obj.get("uri").toString());
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getParameter("username").toString(),""));
+        statementList.addStatement(new StatementElement("owner", "=", req.getParameter("username").toString(), ""));
         List<Contact> localList = dataStore.getContactDao().getObjects(statementList);
         List<Contact> remoteList = new ArrayList<>();
         remoteList.add(contact);
-        List<Contact> result = ContactMerger.mergeContacts(localList,remoteList);
-        if(dataStore.getContactDao().storeContactList(result)) resp.setStatus(200);
-        else TomcatCustomErrorHandler.sendCustomError(resp,500,"could not store a contact due to server-side error");
+        List<Contact> result = ContactMerger.mergeContacts(localList, remoteList);
+        if (dataStore.getContactDao().storeContactList(result))
+            resp.setStatus(200);
+        else
+            TomcatCustomErrorHandler.sendCustomError(resp, 500, "could not store a contact due to server-side error");
     }
 
     /**
@@ -130,49 +120,55 @@ public class ContactServlet extends HttpServlet {
      * @apiError (500) {null} null contact could not be successfully deleted
      */
     @Override
-    @ScopedServletMethod(securityGroups = {AccessLevel.ADMIN})
+    @ScopedServletMethod(securityGroups = { AccessLevel.ADMIN })
     protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getParameter("username").toString(),"AND"));
-        statementList.addStatement(new StatementElement("uri","=",req.getParameter("uri"),""));
-        /*List<Contact> remoteList = dataStore.getContactDao().getObjects(statementList);
-        remoteList.get(0).setStatus('D');
-        remoteList.get(0).setTimestamp(System.currentTimeMillis());
-        statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getParameter("username").toString(),""));
-        List<Contact> localList = dataStore.getContactDao().getObjects(statementList);
-        List<Contact> result = ContactMerger.mergeContacts(localList,remoteList);*/
-        if(dataStore.getContactDao().deleteObject(statementList)) resp.setStatus(200);
-        else TomcatCustomErrorHandler.sendCustomError(resp,500,"could not delete a contact due to server-side error");
+        statementList.addStatement(new StatementElement("owner", "=", req.getParameter("username").toString(), "AND"));
+        statementList.addStatement(new StatementElement("uri", "=", req.getParameter("uri"), ""));
+        /*
+         * List<Contact> remoteList =
+         * dataStore.getContactDao().getObjects(statementList);
+         * remoteList.get(0).setStatus('D');
+         * remoteList.get(0).setTimestamp(System.currentTimeMillis()); statementList =
+         * new StatementList(); statementList.addStatement(new
+         * StatementElement("owner","=",req.getParameter("username").toString(),""));
+         * List<Contact> localList =
+         * dataStore.getContactDao().getObjects(statementList); List<Contact> result =
+         * ContactMerger.mergeContacts(localList,remoteList);
+         */
+        if (dataStore.getContactDao().deleteObject(statementList))
+            resp.setStatus(200);
+        else
+            TomcatCustomErrorHandler.sendCustomError(resp, 500, "could not delete a contact due to server-side error");
     }
 
-
     /**
      * @apiVersion 1.0.0
-     * @api {post} /api/auth/contacts Add a contact
+     * @api {post} /api/auth/contacts Add contact
      * @apiName putContact
      * @apiGroup Contacts
      *
      * @apiParam {body} Contact JSON representation of the contact object
-     * @apiParamExample {json} Request-Example:
-     *[
-     * {"uri":"tcp://def@local","added":1594742298377},
-     * {"uri":"tcp://abc@19293.com","removed":1594742298377}
-     * ]
+     * @apiParamExample {json} Request-Example: [
+     *                  {"uri":"tcp://def@local","added":1594742298377},
+     *                  {"uri":"tcp://abc@19293.com","removed":1594742298377} ]
      *
      * @apiSuccess (200) {json} Contact[] successfully added contact
      * @apiError (500) {null} null contact could not be successfully added
      */
     @Override
-    @ScopedServletMethod(securityGroups = {AccessLevel.ADMIN})
+    @ScopedServletMethod(securityGroups = { AccessLevel.ADMIN })
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getParameter("username").toString(),""));
+        statementList.addStatement(new StatementElement("owner", "=", req.getParameter("username").toString(), ""));
         List<Contact> localList = dataStore.getContactDao().getObjects(statementList);
-        List<Contact> remoteList = Arrays.asList(JsonIterator.deserialize(req.getInputStream().readAllBytes(),Contact[].class));
+        List<Contact> remoteList = Arrays
+                .asList(JsonIterator.deserialize(req.getInputStream().readAllBytes(), Contact[].class));
         remoteList.forEach(contact -> contact.setOwner(req.getParameter("username").toString()));
-        List<Contact> result = ContactMerger.mergeContacts(localList,remoteList);
-        if(!dataStore.getContactDao().storeContactList(result)) TomcatCustomErrorHandler.sendCustomError(resp,500,"Could not store contacts!");
-        else resp.getOutputStream().write(JsonStream.serialize(result).getBytes());
+        List<Contact> result = ContactMerger.mergeContacts(localList, remoteList);
+        if (!dataStore.getContactDao().storeContactList(result))
+            TomcatCustomErrorHandler.sendCustomError(resp, 500, "Could not store contacts!");
+        else
+            resp.getOutputStream().write(JsonStream.serialize(result).getBytes());
     }
 }
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/contacts/ContactServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/contacts/ContactServlet.java
index 5d0d7ddfc273749f4e92f9efcd0c2b8018d3c32a..a1a3a947c4432083052f027dad4181f248a6c28c 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/contacts/ContactServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/contacts/ContactServlet.java
@@ -47,45 +47,33 @@ import static net.jami.jams.server.Server.dataStore;
 @WebServlet("/api/auth/contacts")
 public class ContactServlet extends HttpServlet {
 
-
     /**
      * @apiVersion 1.0.0
      * @api {get} /api/auth/contacts View contacts
      * @apiName getContact
      * @apiGroup Contacts
      *
-     * @apiSuccess (200) {body} Contact[]  List of contacts for the user
-     * @apiSuccessExample {json} Success-Response:
-     *     [{
-     *       "uri": "jami://7e3ab29383",
-     *       "added": 18272662662
-     *     },
-     *     {
-     *        "uri": "jami://7e3ab29383",
-     *        "removed": 12387873
-     *      },
-     *     ]
+     * @apiSuccess (200) {body} Contact[] List of contacts for the user
+     * @apiSuccessExample {json} Success-Response: [{ "uri": "jami://7e3ab29383",
+     *                    "added": 18272662662 }, { "uri": "jami://7e3ab29383",
+     *                    "removed": 12387873 }, ]
      */
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getAttribute("username").toString(),""));
+        statementList.addStatement(new StatementElement("owner", "=", req.getAttribute("username").toString(), ""));
         List<Contact> contactList = dataStore.getContactDao().getObjects(statementList);
         resp.getOutputStream().write(JsonStream.serialize(contactList).getBytes());
     }
 
-
     /**
      * @apiVersion 1.0.0
-     * @api {put} /api/auth/contacts Add a contact
+     * @api {put} /api/auth/contacts Add contact
      * @apiName putContact
      * @apiGroup Contacts
      *
      * @apiParam {body} Contact JSON representation of the contact object
-     * @apiParamExample {json} Request-Example:
-     *      {
-     *        "uri": "jami://7e3ab29383"
-     *      }
+     * @apiParamExample {json} Request-Example: { "uri": "jami://7e3ab29383" }
      *
      * @apiSuccess (200) {null} null successfully added contact
      * @apiError (500) {null} null contact could not be successfully added
@@ -96,20 +84,22 @@ public class ContactServlet extends HttpServlet {
         String res = s.hasNext() ? s.next() : "";
         final JSONObject obj = new JSONObject(res);
         Contact contact = new Contact();
-        //TODO: Replace with mergetool.
+        // TODO: Replace with mergetool.
         contact.setDisplayName(obj.get("displayName").toString());
-        contact.setTimestamp(System.currentTimeMillis()/1000);
+        contact.setTimestamp(System.currentTimeMillis() / 1000);
         contact.setStatus('A');
         contact.setOwner(req.getAttribute("username").toString());
         contact.setUri(obj.get("uri").toString());
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getAttribute("username").toString(),""));
+        statementList.addStatement(new StatementElement("owner", "=", req.getAttribute("username").toString(), ""));
         List<Contact> localList = dataStore.getContactDao().getObjects(statementList);
         List<Contact> remoteList = new ArrayList<>();
         remoteList.add(contact);
-        List<Contact> result = ContactMerger.mergeContacts(localList,remoteList);
-        if(dataStore.getContactDao().storeContactList(result)) resp.setStatus(200);
-        else TomcatCustomErrorHandler.sendCustomError(resp,500,"could not store a contact due to server-side error");
+        List<Contact> result = ContactMerger.mergeContacts(localList, remoteList);
+        if (dataStore.getContactDao().storeContactList(result))
+            resp.setStatus(200);
+        else
+            TomcatCustomErrorHandler.sendCustomError(resp, 500, "could not store a contact due to server-side error");
     }
 
     /**
@@ -126,32 +116,35 @@ public class ContactServlet extends HttpServlet {
     @Override
     protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getAttribute("username").toString(),"AND"));
-        statementList.addStatement(new StatementElement("uri","=",req.getParameter("uri"),""));
-        /*List<Contact> remoteList = dataStore.getContactDao().getObjects(statementList);
-        remoteList.get(0).setStatus('D');
-        remoteList.get(0).setTimestamp(System.currentTimeMillis());
-        statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getAttribute("username").toString(),""));
-        List<Contact> localList = dataStore.getContactDao().getObjects(statementList);
-        List<Contact> result = ContactMerger.mergeContacts(localList,remoteList);*/
-        if(dataStore.getContactDao().deleteObject(statementList)) resp.setStatus(200);
-        else TomcatCustomErrorHandler.sendCustomError(resp,500,"could not delete a contact due to server-side error");
+        statementList.addStatement(new StatementElement("owner", "=", req.getAttribute("username").toString(), "AND"));
+        statementList.addStatement(new StatementElement("uri", "=", req.getParameter("uri"), ""));
+        /*
+         * List<Contact> remoteList =
+         * dataStore.getContactDao().getObjects(statementList);
+         * remoteList.get(0).setStatus('D');
+         * remoteList.get(0).setTimestamp(System.currentTimeMillis()); statementList =
+         * new StatementList(); statementList.addStatement(new
+         * StatementElement("owner","=",req.getAttribute("username").toString(),""));
+         * List<Contact> localList =
+         * dataStore.getContactDao().getObjects(statementList); List<Contact> result =
+         * ContactMerger.mergeContacts(localList,remoteList);
+         */
+        if (dataStore.getContactDao().deleteObject(statementList))
+            resp.setStatus(200);
+        else
+            TomcatCustomErrorHandler.sendCustomError(resp, 500, "could not delete a contact due to server-side error");
     }
 
-
     /**
      * @apiVersion 1.0.0
-     * @api {post} /api/auth/contacts Add a contact
+     * @api {post} /api/auth/contacts Add contact
      * @apiName putContact
      * @apiGroup Contacts
      *
      * @apiParam {body} Contact JSON representation of the contact object
-     * @apiParamExample {json} Request-Example:
-     *[
-     * {"uri":"tcp://def@local","added":1594742298377},
-     * {"uri":"tcp://abc@19293.com","removed":1594742298377}
-     * ]
+     * @apiParamExample {json} Request-Example: [
+     *                  {"uri":"tcp://def@local","added":1594742298377},
+     *                  {"uri":"tcp://abc@19293.com","removed":1594742298377} ]
      *
      * @apiSuccess (200) {json} Contact[] successfully added contact
      * @apiError (500) {null} null contact could not be successfully added
@@ -159,12 +152,15 @@ public class ContactServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         StatementList statementList = new StatementList();
-        statementList.addStatement(new StatementElement("owner","=",req.getAttribute("username").toString(),""));
+        statementList.addStatement(new StatementElement("owner", "=", req.getAttribute("username").toString(), ""));
         List<Contact> localList = dataStore.getContactDao().getObjects(statementList);
-        List<Contact> remoteList = Arrays.asList(JsonIterator.deserialize(req.getInputStream().readAllBytes(),Contact[].class));
+        List<Contact> remoteList = Arrays
+                .asList(JsonIterator.deserialize(req.getInputStream().readAllBytes(), Contact[].class));
         remoteList.forEach(contact -> contact.setOwner(req.getAttribute("username").toString()));
-        List<Contact> result = ContactMerger.mergeContacts(localList,remoteList);
-        if(!dataStore.getContactDao().storeContactList(result)) TomcatCustomErrorHandler.sendCustomError(resp,500,"Could not store contacts!");
-        else resp.getOutputStream().write(JsonStream.serialize(result).getBytes());
+        List<Contact> result = ContactMerger.mergeContacts(localList, remoteList);
+        if (!dataStore.getContactDao().storeContactList(result))
+            TomcatCustomErrorHandler.sendCustomError(resp, 500, "Could not store contacts!");
+        else
+            resp.getOutputStream().write(JsonStream.serialize(result).getBytes());
     }
 }