diff --git a/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx b/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx
index f3f1502eef962db7edea36483d4ca54da8576652..92faac375f035d9314eaacc1d67a9caafe21fa53 100644
--- a/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx
+++ b/jams-react-client/src/components/Devices/RevokeDeviceDialog.tsx
@@ -50,8 +50,8 @@ const RevokeDeviceDialog: FC<RevokeDeviceDialogProps> = ({
         <DialogContentText>
           {
             i18next.t(
-              "are_you_sure_you_want_to_revoke_this_device",
-              "Are you sure you want to revoke this device?"
+              "do_you_want_to_revoke_the_device",
+              "Do you want to revoke the device?"
             ) as string
           }
         </DialogContentText>
diff --git a/jams-react-client/src/layouts/BaseLayout.tsx b/jams-react-client/src/layouts/BaseLayout.tsx
index 5f12945e62cb8265107df740a12876f6051dd204..b25594c07139b27bd23d6333dd31978cb15b6965 100644
--- a/jams-react-client/src/layouts/BaseLayout.tsx
+++ b/jams-react-client/src/layouts/BaseLayout.tsx
@@ -152,7 +152,7 @@ export default function Admin(props: AdminProps) {
         setDialogMessage(
           i18next.t(
             "new_version_jams_available",
-            "A new version of JAMS is available. Would you like to update now?"
+            "A new version of JAMS is available. Do you want to update now?"
           )
         );
         setMessageYes("Update Now");
@@ -160,8 +160,8 @@ export default function Admin(props: AdminProps) {
       } else {
         setDialogMessage(
           i18next.t(
-            "running_community_version_jams",
-            "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?"
+            "running_community_edition_jams",
+            "JAMS Community Edition is running. Do you want to buy a JAMS subscription?"
           )
         );
         setMessageYes("Yes, go to Jami Store");
@@ -221,8 +221,8 @@ export default function Admin(props: AdminProps) {
     if (auth.isActivated()) {
       setSnackbarMessage(
         i18next.t(
-          "updating_jams_shutting_down_shortly",
-          "Updating JAMS, shutting down shortly..."
+          "shutting_down_after_jams_update_is_finished",
+          "Shutting down after JAMS update is finished…"
         )
       );
       axios(configApiCall(api_path_get_start_update, "POST", null, null))
@@ -234,7 +234,7 @@ export default function Admin(props: AdminProps) {
           setSnackbarMessage(
             i18next.t(
               "error_while_attempting_update_jams",
-              "Error occurred while attempting to update JAMS:"
+              "An error occurred while attempting to update JAMS:"
             ) + error
           );
         });
diff --git a/jams-react-client/src/layouts/ListLayout.tsx b/jams-react-client/src/layouts/ListLayout.tsx
index 1ffc6b9ac5005917c40e2f33de27b255ed17d45e..cebb1ae5b9c1bd5d3453a7189f6fe9d9ba4a0d3d 100644
--- a/jams-react-client/src/layouts/ListLayout.tsx
+++ b/jams-react-client/src/layouts/ListLayout.tsx
@@ -145,7 +145,7 @@ export default function Admin(props: AdminProps) {
         setDialogMessage(
           i18next.t(
             "new_version_jams_available",
-            "A new version of JAMS is available. Would you like to update now?"
+            "A new version of JAMS is available. Do you want to update now?"
           )
         );
         setMessageYes("Update Now");
@@ -153,8 +153,8 @@ export default function Admin(props: AdminProps) {
       } else {
         setDialogMessage(
           i18next.t(
-            "running_community_version_jams",
-            "You are currently running the community version of JAMS. Would you like to purchase a JAMS subscription?"
+            "running_community_edition_jams",
+            "JAMS Community Edition is running. Do you want to buy a JAMS subscription?"
           )
         );
         setMessageYes("Yes, go to Jami Store");
@@ -214,8 +214,8 @@ export default function Admin(props: AdminProps) {
     if (auth.isActivated()) {
       setSnackbarMessage(
         i18next.t(
-          "updating_jams_shutting_down_shortly",
-          "Updating JAMS, shutting down shortly..."
+          "shutting_down_after_jams_update_is_finished",
+          "Shutting down after JAMS update is finished…"
         )
       );
       axios(configApiCall(api_path_get_start_update, "POST", null, null))
@@ -227,7 +227,7 @@ export default function Admin(props: AdminProps) {
           setSnackbarMessage(
             i18next.t(
               "error_while_attempting_update_jams",
-              "Error occurred while attempting to update JAMS:"
+              "An error occurred while attempting to update JAMS:"
             ) + error
           );
         });
diff --git a/jams-react-client/src/views/Blueprints/Blueprints.tsx b/jams-react-client/src/views/Blueprints/Blueprints.tsx
index 71478379f6dd58979d8041e63946aa51194945a7..a3edc687521ab35ce8f78adff481d297f6b18e0e 100644
--- a/jams-react-client/src/views/Blueprints/Blueprints.tsx
+++ b/jams-react-client/src/views/Blueprints/Blueprints.tsx
@@ -175,14 +175,14 @@ export default function Blueprints() {
         aria-describedby="alert-dialog-description"
       >
         <DialogTitle id="alert-dialog-title">
-          {i18next.t("remove_blueprint", "Remove blueprint") as string}
+          {i18next.t("delete_blueprint", "Delete blueprint") as string}
         </DialogTitle>
         <DialogContent>
           <DialogContentText id="alert-dialog-description">
             {
               i18next.t(
-                "are_you_sure_you_want_to_delete",
-                "Are you sure you want to delete"
+                "do_you_want_to_delete_the_blueprint",
+                "Do you want to delete the blueprint?"
               ) as string
             }
             <strong>&nbsp;{removedBlueprint}</strong> ?
diff --git a/jams-react-client/src/views/Contacts/Contacts.tsx b/jams-react-client/src/views/Contacts/Contacts.tsx
index 965cd5a48be793ba9b0fc4d8427cb2f4462b9b76..36bc4ec358df0f17aec70d2d3d956c4f5e7d190e 100644
--- a/jams-react-client/src/views/Contacts/Contacts.tsx
+++ b/jams-react-client/src/views/Contacts/Contacts.tsx
@@ -382,8 +382,8 @@ export default function Users(props: UsersProps) {
           <DialogContentText id="alert-dialog-description">
             {
               i18next.t(
-                "are_you_sure_you_want_to_remove",
-                "Are you sure you want to remove"
+                "do_you_want_to_remove_the_contact",
+                "Do you want to remove the contact?"
               ) as string
             }
             <strong>{" " + removedContactName + " "}</strong>
diff --git a/jams-react-client/src/views/Groups/Groups.tsx b/jams-react-client/src/views/Groups/Groups.tsx
index 7d34187ca63ebd87b8954d60bc1db75647b68f99..d34d42112644d299e7da3eac60a8142e4954a2ec 100644
--- a/jams-react-client/src/views/Groups/Groups.tsx
+++ b/jams-react-client/src/views/Groups/Groups.tsx
@@ -231,8 +231,8 @@ export default function Groups() {
             <DialogContentText id="alert-dialog-description">
               {
                 i18next.t(
-                  "are_you_sure_you_want_to_delete",
-                  "Are you sure you want to delete"
+                  "do_you_want_to_delete_the_group",
+                  "Do you want to delete the group?"
                 ) as string
               }{" "}
               <strong>&nbsp;{removedGroup.name}</strong> ?
diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx b/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx
index b15ffee3f2f91defd77c641fa4c9e08ecc538deb..f5ca608038ae697a2253ea4abcb17858803dab91 100644
--- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx
+++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx
@@ -410,8 +410,8 @@ const DisplayUserProfile: FC<DisplayUserProfileProps> = ({
           <DialogContentText id="alert-dialog-description">
             {
               i18next.t(
-                "are_you_sure_want_revoke",
-                "Are you sure you want to revoke"
+                "do_you_want_to_revoke_the_user_account",
+                "Do you want to revoke the user account?"
               ) as string
             }{" "}
             <strong>{revokedUser}</strong> ?