diff --git a/web/public/locales/en/components/dialog.json b/web/public/locales/en/components/dialog.json
index 5d185d289..a18d20baf 100644
--- a/web/public/locales/en/components/dialog.json
+++ b/web/public/locales/en/components/dialog.json
@@ -15,15 +15,11 @@
         "desc": "Objects in locations you want to avoid are not false positives. Submitting them as false positives will confuse the model."
       },
       "review": {
-        "true": {
+        "question": {
           "label": "Confirm this label for Frigate Plus",
-          "true_one": "This is a {{label}}",
-          "true_other": "This is an {{label}}"
-        },
-        "false": {
-          "label": "Do not confirm this label for Frigate Plus",
-          "false_one": "This is not a {{label}}",
-          "false_other": "This is not an {{label}}"
+          "ask_a": "Is this object a <code>{{label}}</code>?",
+          "ask_an": "Is this object an <code>{{label}}</code>?",
+          "ask_full": "Is this object a <code>{{untranslatedLabel}}</code> ({{translatedLabel}})?"
         },
         "state": {
           "submitted": "Submitted"
diff --git a/web/public/locales/en/views/search.json b/web/public/locales/en/views/search.json
index 8d8e878a8..a085a2a14 100644
--- a/web/public/locales/en/views/search.json
+++ b/web/public/locales/en/views/search.json
@@ -46,8 +46,13 @@
       "title": "How to use text filters",
       "desc": {
         "text": "Filters help you narrow down your search results. Here's how to use them in the input field:",
-        "step": "<ul className=\"list-disc pl-5 text-sm text-primary-variant\"><li>Type a filter name followed by a colon (e.g., \"cameras:\").</li><li>Select a value from the suggestions or type your own.</li><li>Use multiple filters by adding them one after another with a space in between.</li><li>Date filters (before: and after:) use <em>{{DateFormat}}</em> format.</li><li>Time range filter uses <em>{{exampleTime}}</em> format.</li><li>Remove filters by clicking the 'x' next to them.</li></ul>",
-        "example": "Example: <code className=\"text-primary\">cameras:front_door label:person before:01012024 time_range:3:00PM-4:00PM </code>"
+        "step1": "Type a filter key name followed by a colon (e.g., \"cameras:\").",
+        "step2": "Select a value from the suggestions or type your own.",
+        "step3": "Use multiple filters by adding them one after another with a space in between.",
+        "step4": "Date filters (before: and after:) use {{DateFormat}} format.",
+        "step5": "Time range filter uses {{exampleTime}} format.",
+        "step6": "Remove filters by clicking the 'x' next to them.",
+        "exampleLabel": "Example:"
       }
     },
     "header": {
diff --git a/web/public/locales/en/views/settings.json b/web/public/locales/en/views/settings.json
index 9f9ced4d8..a76c09254 100644
--- a/web/public/locales/en/views/settings.json
+++ b/web/public/locales/en/views/settings.json
@@ -385,12 +385,12 @@
     "motion": {
       "title": "Motion boxes",
       "desc": "Show boxes around areas where motion is detected",
-      "tips": "<p className=\"mb-2\"><strong>Motion Boxes</strong></p><br><p>Red boxes will be overlaid on areas of the frame where motion is currently being detected</p>"
+      "tips": "<p><strong>Motion Boxes</strong></p><br><p>Red boxes will be overlaid on areas of the frame where motion is currently being detected</p>"
     },
     "regions": {
       "title": "Regions",
       "desc": "Show a box of the region of interest sent to the object detector",
-      "tips": "<p className=\"mb-2\"><strong>Region Boxes</strong></p><br><p>Bright green boxes will be overlaid on areas of interest in the frame that are being sent to the object detector.</p>"
+      "tips": "<p><strong>Region Boxes</strong></p><br><p>Bright green boxes will be overlaid on areas of interest in the frame that are being sent to the object detector.</p>"
     },
     "objectShapeFilterDrawing": {
       "title": "Object Shape Filter Drawing",
@@ -474,7 +474,7 @@
       "deleteUser": {
         "title": "Delete User",
         "desc": "This action cannot be undone. This will permanently delete the user account and remove all associated data.",
-        "warn": "Are you sure you want to delete <span className=\"font-bold\">{{username}}</span>?"
+        "warn": "Are you sure you want to delete"
       },
       "passwordSetting": {
         "updatePassword": "Update Password for {{username}}",
@@ -483,8 +483,14 @@
       },
       "changeRole": {
         "title": "Change User Role",
-        "desc": "Update permissions for <span className=\"font-medium\">{{username}}</span>",
-        "roleInfo": "<p>Select the appropriate role for this user:</p><ul className=\"mt-2 space-y-1 pl-5\"><li> • <span className=\"font-medium\">Admin:</span> Full access to all features. </li><li> • <span className=\"font-medium\">Viewer:</span> Limited to Live dashboards, Review, Explore, and Exports only.</li></ul>"
+        "desc": "Update permissions for",
+        "roleInfo": {
+          "intro": "Select the appropriate role for this user:",
+          "admin": "Admin",
+          "adminDesc": "Full access to all features.",
+          "viewer": "Viewer",
+          "viewerDesc": "Limited to Live dashboards, Review, Explore, and Exports only."
+        }
       }
     }
   },
diff --git a/web/public/locales/nb_NO/audio.json b/web/public/locales/nb-NO/audio.json
similarity index 100%
rename from web/public/locales/nb_NO/audio.json
rename to web/public/locales/nb-NO/audio.json
diff --git a/web/public/locales/nb_NO/components/auth.json b/web/public/locales/nb-NO/components/auth.json
similarity index 100%
rename from web/public/locales/nb_NO/components/auth.json
rename to web/public/locales/nb-NO/components/auth.json
diff --git a/web/public/locales/nb_NO/components/icons.json b/web/public/locales/nb-NO/components/icons.json
similarity index 100%
rename from web/public/locales/nb_NO/components/icons.json
rename to web/public/locales/nb-NO/components/icons.json
diff --git a/web/public/locales/nb_NO/components/input.json b/web/public/locales/nb-NO/components/input.json
similarity index 100%
rename from web/public/locales/nb_NO/components/input.json
rename to web/public/locales/nb-NO/components/input.json
diff --git a/web/public/locales/nb_NO/objects.json b/web/public/locales/nb-NO/objects.json
similarity index 100%
rename from web/public/locales/nb_NO/objects.json
rename to web/public/locales/nb-NO/objects.json
diff --git a/web/public/locales/nb_NO/views/configEditor.json b/web/public/locales/nb-NO/views/configEditor.json
similarity index 100%
rename from web/public/locales/nb_NO/views/configEditor.json
rename to web/public/locales/nb-NO/views/configEditor.json
diff --git a/web/public/locales/nb_NO/views/events.json b/web/public/locales/nb-NO/views/events.json
similarity index 100%
rename from web/public/locales/nb_NO/views/events.json
rename to web/public/locales/nb-NO/views/events.json
diff --git a/web/public/locales/nb_NO/views/recording.json b/web/public/locales/nb-NO/views/recording.json
similarity index 100%
rename from web/public/locales/nb_NO/views/recording.json
rename to web/public/locales/nb-NO/views/recording.json
diff --git a/web/src/components/input/InputWithTags.tsx b/web/src/components/input/InputWithTags.tsx
index 13977b8a7..4c5e9ab8b 100644
--- a/web/src/components/input/InputWithTags.tsx
+++ b/web/src/components/input/InputWithTags.tsx
@@ -51,7 +51,7 @@ import { toast } from "sonner";
 import useSWR from "swr";
 import { FrigateConfig } from "@/types/frigateConfig";
 import { MdImageSearch } from "react-icons/md";
-import { Trans, useTranslation } from "react-i18next";
+import { useTranslation } from "react-i18next";
 
 type InputWithTagsProps = {
   inputFocused: boolean;
@@ -729,20 +729,31 @@ export default function InputWithTags({
                   <p className="text-sm text-muted-foreground">
                     {t("filter.tips.desc.text")}
                   </p>
-                  <Trans
-                    ns="views/search"
-                    values={{
-                      DateFormat: getIntlDateFormat(),
-                      exampleTime:
-                        config?.ui.time_format == "24hour"
-                          ? "15:00-16:00"
-                          : "3:00PM-4:00PM",
-                    }}
-                  >
-                    filter.tips.desc.step
-                  </Trans>
+                  <ul className="list-disc pl-5 text-sm text-primary-variant">
+                    <li>{t("filter.tips.desc.step1")}</li>
+                    <li>{t("filter.tips.desc.step2")}</li>
+                    <li>{t("filter.tips.desc.step3")}</li>
+                    <li>
+                      {t("filter.tips.desc.step4", {
+                        DateFormat: getIntlDateFormat(),
+                      })}
+                    </li>
+                    <li>
+                      {t("filter.tips.desc.step5", {
+                        exampleTime:
+                          config?.ui.time_format == "24hour"
+                            ? "15:00-16:00"
+                            : "3:00PM-4:00PM",
+                      })}
+                    </li>
+                    <li>{t("filter.tips.desc.step6")}</li>
+                  </ul>
                   <p className="text-sm text-muted-foreground">
-                    <Trans ns="views/search">filter.tips.desc.example</Trans>
+                    {t("filter.tips.desc.exampleLabel")}{" "}
+                    <code className="text-primary">
+                      cameras:front_door label:person before:01012024
+                      time_range:3:00PM-4:00PM
+                    </code>
                   </p>
                 </div>
               </PopoverContent>
diff --git a/web/src/components/menu/GeneralSettings.tsx b/web/src/components/menu/GeneralSettings.tsx
index c148127e3..11a3f2ed4 100644
--- a/web/src/components/menu/GeneralSettings.tsx
+++ b/web/src/components/menu/GeneralSettings.tsx
@@ -78,6 +78,7 @@ export default function GeneralSettings({ className }: GeneralSettingsProps) {
   const languages = [
     { code: "en", label: t("menu.language.en") },
     { code: "es", label: t("menu.language.es") },
+    { code: "fr", label: t("menu.language.fr") },
     { code: "zh-CN", label: t("menu.language.zhCN") },
     { code: "tr", label: t("menu.language.tr") },
     { code: "nl", label: t("menu.language.nl") },
diff --git a/web/src/components/overlay/DeleteUserDialog.tsx b/web/src/components/overlay/DeleteUserDialog.tsx
index 1e91196b4..c29f85163 100644
--- a/web/src/components/overlay/DeleteUserDialog.tsx
+++ b/web/src/components/overlay/DeleteUserDialog.tsx
@@ -35,7 +35,8 @@ export default function DeleteUserDialog({
 
         <div className="my-4 rounded-md border border-destructive/20 bg-destructive/5 p-4 text-center text-sm">
           <p className="font-medium text-destructive">
-            {t("users.dialog.deleteUser.warn", { username })}
+            {t("users.dialog.deleteUser.warn")}
+            <span className="font-medium"> {username}</span>?
           </p>
         </div>
 
diff --git a/web/src/components/overlay/RoleChangeDialog.tsx b/web/src/components/overlay/RoleChangeDialog.tsx
index a242ffba3..f17930bea 100644
--- a/web/src/components/overlay/RoleChangeDialog.tsx
+++ b/web/src/components/overlay/RoleChangeDialog.tsx
@@ -1,4 +1,4 @@
-import { Trans, useTranslation } from "react-i18next";
+import { useTranslation } from "react-i18next";
 import { Button } from "../ui/button";
 import {
   Dialog,
@@ -46,13 +46,28 @@ export default function RoleChangeDialog({
             {t("users.dialog.changeRole.title")}
           </DialogTitle>
           <DialogDescription>
-            {t("users.dialog.changeRole.desc", { username })}
+            {t("users.dialog.changeRole.desc")}
+            <span className="font-medium"> {username}</span>
           </DialogDescription>
         </DialogHeader>
 
-        <div className="py-6">
+        <div className="py-3">
           <div className="mb-4 text-sm text-muted-foreground">
-            <Trans ns="views/settings">users.dialog.changeRole.roleInfo</Trans>
+            <p>{t("users.dialog.changeRole.roleInfo.intro")}</p>
+            <ul className="mt-2 list-disc space-y-1 pl-5">
+              <li>
+                <span className="font-medium">
+                  {t("users.dialog.changeRole.roleInfo.admin")}
+                </span>
+                : {t("users.dialog.changeRole.roleInfo.adminDesc")}
+              </li>
+              <li>
+                <span className="font-medium">
+                  {t("users.dialog.changeRole.roleInfo.viewer")}
+                </span>
+                : {t("users.dialog.changeRole.roleInfo.viewerDesc")}
+              </li>
+            </ul>
           </div>
 
           <Select
diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index e0f9e0577..7c59f01cb 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -73,7 +73,7 @@ import { LuInfo, LuSearch } from "react-icons/lu";
 import { TooltipPortal } from "@radix-ui/react-tooltip";
 import { FaPencilAlt } from "react-icons/fa";
 import TextEntryDialog from "@/components/overlay/dialog/TextEntryDialog";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { TbFaceId } from "react-icons/tb";
 import { useIsAdmin } from "@/hooks/use-is-admin";
 import FaceSelectionDialog from "../FaceSelectionDialog";
@@ -366,7 +366,7 @@ function ObjectDetailsTab({
 
   const snapScore = useMemo(() => {
     if (!search?.has_snapshot) {
-      return 0;
+      return undefined;
     }
 
     const value = search.data.score ?? search.score ?? 0;
@@ -1017,7 +1017,7 @@ export function ObjectSnapshotTab({
   search,
   onEventUploaded,
 }: ObjectSnapshotTabProps) {
-  const { t } = useTranslation(["components/dialog"]);
+  const { t, i18n } = useTranslation(["components/dialog"]);
   type SubmissionState = "reviewing" | "uploading" | "submitted";
 
   const [imgRef, imgLoaded, onImgLoad] = useImageLoaded();
@@ -1128,42 +1128,67 @@ export function ObjectSnapshotTab({
                       </div>
                     </div>
 
-                    <div className="flex flex-row justify-center gap-2 md:justify-end">
+                    <div className="flex w-full flex-1 flex-col justify-center gap-2 md:ml-8 md:w-auto md:justify-end">
                       {state == "reviewing" && (
                         <>
-                          <Button
-                            className="bg-success"
-                            aria-label={t("explore.plus.review.true.label")}
-                            onClick={() => {
-                              setState("uploading");
-                              onSubmitToPlus(false);
-                            }}
-                          >
-                            {/^[aeiou]/i.test(search?.label || "")
-                              ? t("explore.plus.review.true.true_other", {
-                                  label: search?.label,
-                                })
-                              : t("explore.plus.review.true.true_one", {
-                                  label: search?.label,
-                                })}
-                          </Button>
-                          <Button
-                            className="text-white"
-                            aria-label={t("explore.plus.review.false.label")}
-                            variant="destructive"
-                            onClick={() => {
-                              setState("uploading");
-                              onSubmitToPlus(true);
-                            }}
-                          >
-                            {/^[aeiou]/i.test(search?.label || "")
-                              ? t("explore.plus.review.false.false_other", {
-                                  label: search?.label,
-                                })
-                              : t("explore.plus.review.false.false_one", {
-                                  label: search?.label,
-                                })}
-                          </Button>
+                          <div>
+                            {i18n.language === "en" ? (
+                              // English with a/an logic plus label
+                              <>
+                                {/^[aeiou]/i.test(search?.label || "") ? (
+                                  <Trans
+                                    ns="components/dialog"
+                                    values={{ label: search?.label }}
+                                  >
+                                    explore.plus.review.question.ask_an
+                                  </Trans>
+                                ) : (
+                                  <Trans
+                                    ns="components/dialog"
+                                    values={{ label: search?.label }}
+                                  >
+                                    explore.plus.review.question.ask_a
+                                  </Trans>
+                                )}
+                              </>
+                            ) : (
+                              // For other languages
+                              <Trans
+                                ns="components/dialog"
+                                values={{
+                                  untranslatedLabel: search?.label,
+                                  translatedLabel: t(
+                                    "filter.label." + search?.label,
+                                  ),
+                                }}
+                              >
+                                explore.plus.review.question.ask_full
+                              </Trans>
+                            )}
+                          </div>
+                          <div className="flex w-full flex-row gap-2">
+                            <Button
+                              className="flex-1 bg-success"
+                              aria-label={t("button.yes", { ns: "common" })}
+                              onClick={() => {
+                                setState("uploading");
+                                onSubmitToPlus(false);
+                              }}
+                            >
+                              {t("button.yes", { ns: "common" })}
+                            </Button>
+                            <Button
+                              className="flex-1 text-white"
+                              aria-label={t("button.no", { ns: "common" })}
+                              variant="destructive"
+                              onClick={() => {
+                                setState("uploading");
+                                onSubmitToPlus(true);
+                              }}
+                            >
+                              {t("button.no", { ns: "common" })}
+                            </Button>
+                          </div>
                         </>
                       )}
                       {state == "uploading" && <ActivityIndicator />}
diff --git a/web/src/components/settings/MotionMaskEditPane.tsx b/web/src/components/settings/MotionMaskEditPane.tsx
index ef80fde26..7aaeed70c 100644
--- a/web/src/components/settings/MotionMaskEditPane.tsx
+++ b/web/src/components/settings/MotionMaskEditPane.tsx
@@ -242,7 +242,9 @@ export default function MotionMaskEditPane({
       </Heading>
       <div className="my-3 space-y-3 text-sm text-muted-foreground">
         <p>
-          <Trans ns="views/settings">masksAndZones.motionMasks.context</Trans>
+          <Trans ns="views/settings">
+            masksAndZones.motionMasks.context.title
+          </Trans>
         </p>
 
         <div className="flex items-center text-primary">