diff --git a/jams-react-client/public/locales/de/translation.json b/jams-react-client/public/locales/de/translation.json
index cdafe74c6ec746854ffdd7b306683f2c0c877774..105ad973c9510bac53640590674c441eccde20e1 100644
--- a/jams-react-client/public/locales/de/translation.json
+++ b/jams-react-client/public/locales/de/translation.json
@@ -3,7 +3,7 @@
     "password": "Passwort",
     "confirm_password": "Passwort bestätigen",
     "continue": "Weiter",
-    "users": "users",
+    "users": "Benutzer",
     "groups": "Gruppen",
     "blueprints": "Vorlagen",
     "settings": "Einstellungen",
@@ -34,7 +34,7 @@
     "select_option_setting_up_certificate_authority": "Wähle eine Option zum Einrichten der Certificate-Authority, die zum Signieren aller auf dieser JAMS-Instanz generierten Jami-Konten verwendet wird.",
     "import_certificate_authority": "Certificate-Authority importieren",
     "must_be_60_characters_or_less": "Muss 60 Zeichen oder weniger sein",
-    "username_is_required": "Username is required!",
+    "username_is_required": "Benutzername ist erforderlich!",
     "must_be_50_characters_or_less": "Muss 50 Zeichen oder weniger sein",
     "password_must_match": "Passwörter müssen übereinstimmen",
     "password_confirmation_required": "Passwort muss bestätigt werden.",
@@ -66,15 +66,15 @@
     "15_minutes": "15 Minuten",
     "30_minutes": "30 Minuten",
     "60_minutes": "60 Minuten",
-    "1_month": "1 month",
-    "3_months": "3 months",
-    "6_months": "6 months",
-    "1_year": "1 year",
+    "1_month": "1 Monat",
+    "3_months": "3 Monate",
+    "6_months": "6 Monate",
+    "1_year": "1 Jahr",
     "please_enter_valid_cors_domain_url": "Geben Sie ein gültige CORS-Domain-URL an.",
     "global_parameters_cover_general_configuration_of_servers_engine": "Die globalen Parameter bestimmen die allgemeine Konfiguration des Servers.",
     "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": "Tragen Sie die Domain des Web-Client-Servers ein, um sich mit der JAMS-Admin-Konsole und den Jami-Konten zu verbinden. Dies wird auch  verwendet wenn die Clients CRLs und OCSP-Anfagen herunterladen sollen (z. B. wenn JAMS hinter einem IIS läuft). Bitte setzen Sie dieses Feld korrekt, sonst werden die Geräte nicht in der Lage sein CRLs zu laden oder Zertifikate zu validieren.",
-    "domain_name_of_web_client_server": "The domain name of your web client server.",
+    "domain_name_of_web_client_server": "Der Domänenname Ihres Web-Client-Servers.",
     "domain": "Domain",
     "certificate_revocation_list_lifetime": "Lebensdauer der Zertifikats-Revozierungs-Liste (CRL)",
     "set_liftetime_crl_list_certificates_revoked": "Bestimmen Sie die Lebensdauer der CRL, welche die Zertifikate auflistet, die vor ihrem Ablauf zurückgezogen wurden.",
@@ -86,7 +86,7 @@
     "search_users_using": "Benutzer suchen (mittels Benutzername, Vorname oder Nachname)",
     "search_users": "Benutzer suchen",
     "servername_is_required": "Servername ist erforderlich.",
-    "password_is_required": "Password is required!",
+    "password_is_required": "Passwort ist erforderlich!",
     "domain_name_is_required": "Domainname ist erforderlich.",
     "port_must_be_a_number": "Port muss eine Zahl sein.",
     "port_must_be_positive": "Port muss positiv sein.",
@@ -135,8 +135,8 @@
     "allow_video_calls": "Video-Anrufe erlauben",
     "allow_incoming_calls_from_unknown_contacts": "Anrufe von Unbekannten erlauben",
     "auto_answer_calss": "Automatisch Anrufe beantworten",
-    "allow_use_of_jami_in_local_lan": "Allow discovery of other peers on a local network",
-    "convert_your_account_into_a_rendezvous_point": "Set the account as a Rendezvous point",
+    "allow_use_of_jami_in_local_lan": "Erkennung anderer Peers in einem lokalen Netzwerk zulassen",
+    "convert_your_account_into_a_rendezvous_point": "Das Konto als Rendezvous-Punkt festlegen",
     "blueprint_name_already_exists": "Vorlagenname existiert bereits!",
     "blueprint_name_is_empty": "Vorlagenname ist leer",
     "remove_blueprint": "Vorlage entfernen",
@@ -179,7 +179,7 @@
     "admin_password_updated_successfully": "Administrator-Passwort erfolgreich erneuert.",
     "updating_user": "Benutzer wird aktualisiert",
     "password_failed": "Passwort-Fehler:",
-    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information to change your admin password.",
+    "enter_the_following_information_below_to_change_your_admin_password": "Geben Sie die folgenden Informationen ein, um Ihr Administratorkennwort zu ändern.",
     "Confirm password": "Passwort bestätigen",
     "generate": "Erzeugen",
     "copy_to_clipboard": "In Zwischenablage kopieren",
@@ -192,7 +192,7 @@
     "are_you_sure_want_revoke": "Sind Sie sicher, dass Sie dies widerrufen wollen:",
     "revoke": "Widerrufen",
     "revoke_user": "Benutzer widerrufen",
-    "edit_profile": "Edit profile",
+    "edit_profile": "Profil bearbeiten",
     "change_password": "Passwort ändern",
     "minimum_3_characters": "Minimum ist 3 Zeichen!",
     "maximum_32_characters": "Maximum ist 32 Zeichen!",
@@ -201,9 +201,9 @@
     "last_name_is_too_short": "Der Nachname ist zu kurz!",
     "invalid_email": "Ungültige E-Mail-Adresse!",
     "organization_name_too_short": "Der Organisationsname ist zu kurz!",
-    "fax_not_valid": "Fax number not valid!",
-    "phone_not_valid": "Phone number not valid!",
-    "mobile_not_valid": "Mobile number not valid!",
+    "fax_not_valid": "Faxnummer ungültig!",
+    "phone_not_valid": "Telefonnummer ungültig!",
+    "mobile_not_valid": "Handynummer ungültig!",
     "crop_image": "Bild zuschneiden",
     "zoom": "Zoom",
     "rotation": "Drehen",
@@ -240,17 +240,17 @@
     "remove_moderator": "Moderator entfernen",
     "rendezvous": "Rendezvous",
     "standalone": "Standalone",
-    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls are allowed.",
-    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list can contact you.",
-    "auto_answer_calls_info": "If this option is enabled, incoming calls are automatically answered. This option can be useful to monitor your house or a particular room when you are away from home for example.",
-    "local_lan_info": "If this option is enabled, you can communicate with connected contacts on you local lan, even if your lan is disconnected from the Internet.",
-    "rendezvous_info": "If this option is enabled, incoming calls are automatically added to a conference room.",
-    "rendezvous_moderators_info": "Moderators can manage the Rendezvous point.",
-    "allow_jami_user_to_search_for_other_contacts": "Allow user to add new contacts",
-    "upnp_custom_popup": "UPnP allows Jami to automatically open network ports to establish peer-to-peer communications.",
-    "turn_server_configuration_popup": "Configure a TURN server to establish a connection when peer-to-peer communication is not possible",
-    "dht_configuration_popup": "Configure the DHT proxy server used by this account",
-    "contact_management": "Contact management",
-    "lookup_info": "If this option is disabled, user can not search and add new contacts",
-    "local_lan": "Local LAN"
+    "allow_incoming_calls_from_unknown_allow_video_calls_info": "Wenn diese Option deaktiviert ist, sind nur Audioanrufe erlaubt.",
+    "allow_incoming_calls_from_unknown_contacts_info": "Wenn diese Option deaktiviert ist, können Sie nur von Kontakten aus Ihrer Liste kontaktiert werden.",
+    "auto_answer_calls_info": "Wenn diese Option aktiviert ist, werden eingehende Anrufe automatisch beantwortet. Diese Option kann nützlich sein, um beispielsweise Ihr Haus oder einen bestimmten Raum zu überwachen, wenn Sie nicht zu Hause sind.",
+    "local_lan_info": "Wenn diese Option aktiviert ist, können Sie mit verbundenen Kontakten auf Ihrem lokalen LAN kommunizieren, auch wenn Ihr LAN nicht mit dem Internet verbunden ist.",
+    "rendezvous_info": "Wenn diese Option aktiviert ist, werden eingehende Anrufe automatisch einem Konferenzraum hinzugefügt.",
+    "rendezvous_moderators_info": "Moderatoren können den Rendezvous-Punkt verwalten.",
+    "allow_jami_user_to_search_for_other_contacts": "Dem Benutzer erlauben, neue Kontakte hinzuzufügen",
+    "upnp_custom_popup": "UPnP ermöglicht Jami automatisch Netzwerkports zu öffnen, um eine Peer-to-Peer-Kommunikation aufzubauen.",
+    "turn_server_configuration_popup": "Konfigurieren Sie einen TURN-Server, um eine Verbindung herzustellen, wenn eine Peer-to-Peer-Kommunikation nicht möglich ist",
+    "dht_configuration_popup": "Konfigurieren Sie den von diesem Konto verwendeten DHT-Proxy-Server",
+    "contact_management": "Kontaktverwaltung",
+    "lookup_info": "Wenn diese Option deaktiviert ist, kann der Benutzer keine neuen Kontakte suchen und hinzufügen",
+    "local_lan": "Lokales LAN"
 }
diff --git a/jams-react-client/public/locales/pa/translation.json b/jams-react-client/public/locales/pa/translation.json
index b76faa8610872a8a3b419a0c55000f6a93708441..1f121804b3b797c6ed93ad0bac0647206995f7ac 100644
--- a/jams-react-client/public/locales/pa/translation.json
+++ b/jams-react-client/public/locales/pa/translation.json
@@ -1,28 +1,28 @@
 {
-    "username": "Username",
-    "password": "Password",
-    "confirm_password": "Confirm password",
-    "continue": "Continue",
-    "users": "Users",
-    "groups": "Groups",
-    "blueprints": "Blueprints",
-    "settings": "Settings",
-    "Logout": "Logout",
-    "create_user": "Create user",
-    "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.",
-    "city_is_required": "City is required.",
-    "organization_is_required": "Organization is required.",
-    "organization_unit_is_required": "Organization unit is required.",
-    "country_is_required": "Country is required.",
-    "certificate_file_is_required": "Certificate file is required.",
-    "private_key_file_is_required": "Private key file is required.",
+    "username": "ਵਰਤੋਂਕਾਰ ਨਾਂ",
+    "password": "ਪਾਸਵਰਡ",
+    "confirm_password": "ਪਾਸਵਰਡ ਦੀ ਤਸਦੀਕ ਕਰੋ",
+    "continue": "ਜਾਰੀ ਰੱਖੋ",
+    "users": "ਵਰਤੋਂਕਾਰ",
+    "groups": "ਢਾਣੀਆਂ",
+    "blueprints": "ਵਿਉਂਤਬੰਦੀਆਂ",
+    "settings": "ਸੈਟਿੰਗਾਂ",
+    "Logout": "ਖਾਤੇ ਵਿੱਚੋਂ ਨਿਕਲੋ",
+    "create_user": "ਵਰਤੋਂਕਾਰ ਬਣਾਓ",
+    "login_failed": "ਖਾਤੇ 'ਚ ਨਹੀਂ ਵੜ ਸਕੇ। ਆਪਣਾ ਵਰਤੋਂਕਾਰ ਨਾਂ/ਪਾਸਵਰਡ ਜਾਂਚੋ।",
+    "sign_in": "ਸਾਈਨ ਇਨ ਕਰੋ",
+    "common_name_is_required": "ਆਮ ਨਾਂ ਦੱਸੋ।",
+    "state_is_required": "ਰਾਜ ਦੱਸੋ।",
+    "city_is_required": "ਸ਼ਹਿਰ ਦੱਸੋ।",
+    "organization_is_required": "ਸੰਸਥਾ ਦੱਸੋ।",
+    "organization_unit_is_required": "ਸੰਸਥਾ ਦੀ ਇਕਾਈ ਦੱਸੋ।",
+    "country_is_required": "ਦੇਸ਼ ਦੱਸੋ।",
+    "certificate_file_is_required": "ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਫ਼ਾਈਲ ਦਿਓ।",
+    "private_key_file_is_required": "ਨਿੱਜੀ ਕੁੰਜੀ ਦੀ ਫ਼ਾਈਲ ਦਿਓ।",
     "create_self_signed_certificate_authority": "Create a self-signed Certificate Authority",
     "import_existing_certificate_authority": "Import existing Certificate Authority",
-    "5_years": "5 years",
-    "10_years": "10 years",
+    "5_years": "5 ਸਾਲ",
+    "10_years": "10 ਸਾਲ",
     "unknown_error_occured_while_installing_the_ca": "An unknown error occurred while installing the CA. Please try again.",
     "ca_setup_header": "Select an option for setting-up the certificate authority that will be used to sign all Jami accounts generated on this JAMS instance.",
     "common_name": "Common Name",
@@ -34,7 +34,7 @@
     "select_option_setting_up_certificate_authority": "Select an option for setting-up the certificate authority that will be used to sign all Jami accounts generated on this JAMS instance.",
     "import_certificate_authority": "Import Certificate Authority",
     "must_be_60_characters_or_less": "Must be 60 characters or less",
-    "username_is_required": "Username is required.",
+    "username_is_required": "Username is required!",
     "must_be_50_characters_or_less": "Must be 50 characters or less",
     "password_must_match": "Passwords must match",
     "password_confirmation_required": "Password confirmation is required.",
@@ -66,15 +66,15 @@
     "15_minutes": "15 minutes",
     "30_minutes": "30 minutes",
     "60_minutes": "60 minutes",
-    "1_month": "1 Month",
-    "3_months": "3 Months",
-    "6_months": "6 Months",
-    "1_year": "1 Year",
+    "1_month": "1 month",
+    "3_months": "3 months",
+    "6_months": "6 months",
+    "1_year": "1 year",
     "please_enter_valid_cors_domain_url": "Please enter a valid CORS domain URL.",
     "global_parameters_cover_general_configuration_of_servers_engine": "The global parameters cover the general configuration of the server's engine.",
     "cors_domain_name": "CORS domain name",
     "set_domain_of_web_cleint_server_to_connect_to_hans_admin_dashboard_and_jami_accounts_also_to_set_client_crls_ocsps": "Set the domain of the web client-server to connect to the JAMS admin dashboard and Jami accounts. It is also used to define where the clients should download CRLs and submit OCSP queries. In case you are running a proxied instance (i.e. JAMS behind IIS), please make sure to set this field correctly, otherwise devices will not be able to download CRLs or validate certificates.",
-    "domain_name_of_web_client_server": "The domain name of your web client server. Requires http:// or https://",
+    "domain_name_of_web_client_server": "The domain name of your web client server.",
     "domain": "Domain",
     "certificate_revocation_list_lifetime": "Certificate Revocation List Lifetime",
     "set_liftetime_crl_list_certificates_revoked": "Set the lifetime of the CRL which contains the list of the certificates that have been revoked before their scheduled expiration date.",
@@ -86,7 +86,7 @@
     "search_users_using": "Search users using (username, first name, last name)",
     "search_users": "Search users",
     "servername_is_required": "Server name is required.",
-    "password_is_required": "Password is required.",
+    "password_is_required": "Password is required!",
     "domain_name_is_required": "Domain name is required.",
     "port_must_be_a_number": "Port must be a number.",
     "port_must_be_positive": "Port must be positive.",
@@ -135,8 +135,8 @@
     "allow_video_calls": "Allow video calls",
     "allow_incoming_calls_from_unknown_contacts": "Allow incoming calls from unknown contacts",
     "auto_answer_calss": "Auto answer calls",
-    "allow_use_of_jami_in_local_lan": "Allow Jami usage on the local LAN",
-    "convert_your_account_into_a_rendezvous_point": "Activate this account into rendezvous mode",
+    "allow_use_of_jami_in_local_lan": "Allow discovery of other peers on a local network",
+    "convert_your_account_into_a_rendezvous_point": "Set the account as a Rendezvous point",
     "blueprint_name_already_exists": "Blueprint name already exists!",
     "blueprint_name_is_empty": "Blueprint name is empty",
     "remove_blueprint": "Remove blueprint",
@@ -179,7 +179,7 @@
     "admin_password_updated_successfully": "Administrator password successfully updated.",
     "updating_user": "Updating user ",
     "password_failed": " password failed with error: ",
-    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information below to change your admin password.",
+    "enter_the_following_information_below_to_change_your_admin_password": "Enter the following information to change your admin password.",
     "Confirm password": "Confirm password",
     "generate": "Generate",
     "copy_to_clipboard": "Copy to clipboard",
@@ -192,7 +192,7 @@
     "are_you_sure_want_revoke": "Are you sure you want to revoke",
     "revoke": "Revoke",
     "revoke_user": "Revoke user",
-    "edit_profile": "Edit Profile",
+    "edit_profile": "Edit profile",
     "change_password": "Change password",
     "minimum_3_characters": "Minimum 3 characters!",
     "maximum_32_characters": "Maximum 32 characters!",
@@ -201,9 +201,9 @@
     "last_name_is_too_short": "Last Name is too short!",
     "invalid_email": "Invalid email!",
     "organization_name_too_short": "Organization name is too short!",
-    "fax_not_valid": "Fax not valid!",
-    "phone_not_valid": "Phone not valid!",
-    "mobile_not_valid": "Mobile not valid!",
+    "fax_not_valid": "Fax number not valid!",
+    "phone_not_valid": "Phone number not valid!",
+    "mobile_not_valid": "Mobile number not valid!",
     "crop_image": "Crop image",
     "zoom": "Zoom",
     "rotation": "Rotation",
@@ -240,10 +240,17 @@
     "remove_moderator": "Remove moderator",
     "rendezvous": "Rendezvous",
     "standalone": "Standalone",
-    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls will be allowed.",
-    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list will be allowed to contact you.",
-    "auto_answer_calls_info": "If this option is enabled, incomming calls will be automaticly answered. This option can be usefull if you want for example to monitor your house or a particular room when you are away from home.",
-    "local_lan_info": "If this option is enabled, you will be able to communicate with connected contacts on you local lan, even if your lan is disconnected from internet.",
-    "rendezvous_info": "If this option is enabled, incomming calls will automaticly be added to a conference room.",
-    "rendezvous_moderators_info": "Moderators are people allowed to manage rendezvous points and conferences even if they are not hosted on their devices."
+    "allow_incoming_calls_from_unknown_allow_video_calls_info": "If this option is disabled, only audio calls are allowed.",
+    "allow_incoming_calls_from_unknown_contacts_info": "If this option is disabled, only contacts from your list can contact you.",
+    "auto_answer_calls_info": "If this option is enabled, incoming calls are automatically answered. This option can be useful to monitor your house or a particular room when you are away from home for example.",
+    "local_lan_info": "If this option is enabled, you can communicate with connected contacts on you local lan, even if your lan is disconnected from the Internet.",
+    "rendezvous_info": "If this option is enabled, incoming calls are automatically added to a conference room.",
+    "rendezvous_moderators_info": "Moderators can manage the Rendezvous point.",
+    "allow_jami_user_to_search_for_other_contacts": "Allow user to add new contacts",
+    "upnp_custom_popup": "UPnP allows Jami to automatically open network ports to establish peer-to-peer communications.",
+    "turn_server_configuration_popup": "Configure a TURN server to establish a connection when peer-to-peer communication is not possible",
+    "dht_configuration_popup": "Configure the DHT proxy server used by this account",
+    "contact_management": "Contact management",
+    "lookup_info": "If this option is disabled, user can not search and add new contacts",
+    "local_lan": "Local LAN"
 }