From 1bc85b3f0af34ccebda5cd75ba21b175d53ff8fc Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Wed, 23 Sep 2026 19:29:52 -0300
Subject: [PATCH 1/5] chore: Fix localization issues and add missing strings

---
 .../UniversalSearchController.ts              |  3 +-
 .../UniversalSearch/UniversalSearchShell.tsx  | 66 ++++++++++++-------
 ...registerUniversalSearchKeyboardHandlers.ts |  9 +--
 .../NotesOptions/PlainNoteOptions.tsx         |  3 +-
 .../Subscription/SubscriptionStatusText.tsx   | 53 ++++-----------
 .../Panes/Backups/Files/BackupsDropZone.tsx   | 20 ++++--
 .../Panes/Listed/ListedSunsettingBanner.tsx   | 21 +++---
 .../Components/SearchBar/SearchBar.tsx        |  2 +-
 .../EnhancedSearchOptionsContent.tsx          | 15 +++--
 .../SearchOptions/SearchBubbles.tsx           | 15 ++++-
 .../SearchOptions/SearchFilterSheet.tsx       |  9 ++-
 .../SearchOptions/SearchTagFilters.tsx        |  3 +-
 12 files changed, 126 insertions(+), 93 deletions(-)

diff --git a/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchController.ts b/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchController.ts
index bdd69f04b87..a840ec8adfb 100644
--- a/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchController.ts
+++ b/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchController.ts
@@ -1,4 +1,5 @@
 import { action, computed, makeObservable, observable, runInAction } from 'mobx'
+import { c } from 'ttag'
 import {
   UniversalSearchProvider,
   UniversalSearchResult,
@@ -32,7 +33,7 @@ function errorMessage(error: unknown): string {
     return error.message
   }
 
-  return 'Search failed'
+  return c('B3.Notes.EditorToolbar.Error').t`Search failed`
 }
 
 type SetSearchResultsOptions = {
diff --git a/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchShell.tsx b/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchShell.tsx
index 33540773b46..f9870f07572 100644
--- a/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchShell.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/UniversalSearch/UniversalSearchShell.tsx
@@ -2,6 +2,7 @@ import { ArrowDownIcon, ArrowRightIcon, ArrowUpIcon, CloseIcon } from '@standard
 import { classNames } from '@standardnotes/utils'
 import { observer } from 'mobx-react-lite'
 import { KeyboardEvent, useEffect, useRef } from 'react'
+import { c } from 'ttag'
 import Button from '../../Button/Button'
 import Icon from '../../Icon/Icon'
 import DecoratedInput from '../../Input/DecoratedInput'
@@ -22,11 +23,11 @@ interface UniversalSearchShellProps<TPayload = UniversalSearchResultPayload> {
 
 function statusLabel<TPayload = UniversalSearchResultPayload>(controller: UniversalSearchController<TPayload>): string {
   if (controller.status === 'loading') {
-    return 'Loading'
+    return c('B2.NavSharedUI.Info').t`Loading`
   }
 
   if (controller.status === 'error') {
-    return controller.error || 'Error'
+    return controller.error || c('B2.NavSharedUI.Label').t`Error`
   }
 
   if (!controller.query) {
@@ -129,8 +130,12 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
         <button
           className="focus:ring-none border-r border-border px-1 hover:bg-contrast focus:shadow-inner focus:shadow-info"
           onClick={controller.toggleReplaceMode}
-          title={replaceShortcut ? `Toggle Replace Mode (${replaceShortcut})` : 'Toggle Replace Mode'}
-          aria-label="Toggle replace mode"
+          title={
+            replaceShortcut
+              ? (c('B3.Notes.EditorToolbar.Label').jt`Toggle Replace Mode (${replaceShortcut})` as unknown as string)
+              : c('B3.Notes.EditorToolbar.Label').t`Toggle Replace Mode`
+          }
+          aria-label={c('B3.Notes.EditorToolbar.Label').t`Toggle Replace Mode`}
         >
           {controller.isReplaceMode ? (
             <ArrowDownIcon className="h-4 w-4 fill-text" />
@@ -149,7 +154,7 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
       >
         <div className="flex items-center gap-2">
           <DecoratedInput
-            placeholder="Search"
+            placeholder={c('B3.Notes.EditorToolbar.Label').t`Search`}
             className={{
               container: classNames('flex-grow !text-[length:inherit]', !controller.query.length && '!py-1'),
               right: '!py-1',
@@ -162,7 +167,7 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
               <div
                 className="min-w-[7ch] max-w-[7ch] flex-shrink-0 whitespace-nowrap text-right"
                 aria-live="polite"
-                aria-label="Search status"
+                aria-label={c('B3.Notes.EditorToolbar.Label').t`Search status`}
               >
                 {statusLabel(controller)}
               </div>,
@@ -173,23 +178,29 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
               'relative flex items-center rounded border px-1.5 py-1 focus-within:ring-2 focus-within:ring-info focus-within:ring-offset-2 focus-within:ring-offset-default',
               controller.isCaseSensitive ? 'border-info bg-info text-info-contrast' : 'border-border hover:bg-contrast',
             )}
-            title={caseSensitivityShortcut ? `Case sensitive (${caseSensitivityShortcut})` : 'Case sensitive'}
+            title={
+              caseSensitivityShortcut
+                ? (c('B3.Notes.EditorToolbar.Label')
+                    .jt`Case sensitive (${caseSensitivityShortcut})` as unknown as string)
+                : c('B3.Notes.EditorToolbar.Label').t`Case sensitive`
+            }
           >
             <input
               type="checkbox"
               className="absolute left-0 top-0 z-[1] m-0 h-full w-full cursor-pointer border border-transparent p-0 opacity-0 shadow-none outline-none"
               checked={controller.isCaseSensitive}
               onChange={controller.toggleCaseSensitivity}
-              aria-label="Case sensitive"
+              aria-label={c('B3.Notes.EditorToolbar.Label').t`Case sensitive`}
             />
             <span aria-hidden>Aa</span>
+            <span className="sr-only">{c('B3.Notes.EditorToolbar.Label').t`Case sensitive`}</span>
           </label>
           <button
             className="flex items-center rounded border border-border p-1.5 hover:bg-contrast disabled:cursor-not-allowed"
             onClick={controller.goToPreviousResult}
             disabled={!hasResults}
-            title="Previous result (Shift + Enter)"
-            aria-label="Previous result"
+            title={c('B3.Notes.EditorToolbar.Label').t`Previous result (Shift + Enter)`}
+            aria-label={c('B3.Notes.EditorToolbar.Label').t`Previous result`}
           >
             <ArrowUpIcon className="h-4 w-4 fill-current text-text" />
           </button>
@@ -197,16 +208,20 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
             className="flex items-center rounded border border-border p-1.5 hover:bg-contrast disabled:cursor-not-allowed"
             onClick={controller.goToNextResult}
             disabled={!hasResults}
-            title="Next result (Enter)"
-            aria-label="Next result"
+            title={c('B3.Notes.EditorToolbar.Label').t`Next result (Enter)`}
+            aria-label={c('B3.Notes.EditorToolbar.Label').t`Next result`}
           >
             <ArrowDownIcon className="h-4 w-4 fill-current text-text" />
           </button>
           <button
             className="flex items-center rounded border border-border p-1.5 hover:bg-contrast"
             onClick={controller.close}
-            title={closeShortcut ? `Close (${closeShortcut})` : 'Close'}
-            aria-label="Close search"
+            title={
+              closeShortcut
+                ? (c('B3.Notes.EditorToolbar.Label').jt`Close (${closeShortcut})` as unknown as string)
+                : c('B2.NavSharedUI.Action').t`Close`
+            }
+            aria-label={c('B3.Notes.EditorToolbar.Label').t`Close search`}
           >
             <CloseIcon className="h-4 w-4 fill-current text-text" />
           </button>
@@ -215,7 +230,7 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
           <div className="flex flex-wrap items-center gap-2 md:flex-nowrap">
             <input
               type="text"
-              placeholder="Replace"
+              placeholder={c('B3.Notes.EditorToolbar.Label').t`Replace`}
               value={controller.replaceQuery}
               onChange={(event) => {
                 controller.setReplaceQuery(event.target.value)
@@ -224,23 +239,23 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
               className="rounded border border-border bg-default p-1 px-2"
               ref={replaceInputRef}
               disabled={!canReplace}
-              aria-label="Replace"
+              aria-label={c('B3.Notes.EditorToolbar.Label').t`Replace`}
             />
             <Button
               small
               onClick={() => void controller.replaceCurrentResult()}
               disabled={!canReplace || !hasResults || !hasReplaceQuery}
-              title="Replace (Enter)"
+              title={c('B3.Notes.EditorToolbar.Label').t`Replace (Enter)`}
             >
-              Replace
+              {c('B3.Notes.EditorToolbar.Action').t`Replace`}
             </Button>
             <Button
               small
               onClick={() => void controller.replaceAllResults()}
               disabled={!canReplace || !hasResults || !hasReplaceQuery}
-              title="Replace all (Ctrl + Alt + Enter)"
+              title={c('B3.Notes.EditorToolbar.Label').t`Replace all (Ctrl + Alt + Enter)`}
             >
-              Replace all
+              {c('B3.Notes.EditorToolbar.Action').t`Replace all`}
             </Button>
           </div>
         )}
@@ -252,17 +267,20 @@ export const UniversalSearchShell = observer(function UniversalSearchShell<TPayl
               checked={controller.shouldHighlightAll}
               onChange={(event) => controller.setShouldHighlightAll(event.target.checked)}
               disabled={!canHighlightAll}
-              aria-label="Highlight all results"
+              aria-label={c('B3.Notes.EditorToolbar.Label').t`Highlight all results`}
             />
-            <div>Highlight all results</div>
+            <div>{c('B3.Notes.EditorToolbar.Label').t`Highlight all results`}</div>
           </label>
           {!canHighlightAll && (
             <StyledTooltip
-              label="This editor does not support search result highlighting yet."
+              label={c('B3.Notes.EditorToolbar.Info').t`This editor does not support search result highlighting yet.`}
               className="!z-modal"
               showOnMobile
             >
-              <button className="cursor-default" aria-label="Highlight all unavailable">
+              <button
+                className="cursor-default"
+                aria-label={c('B3.Notes.EditorToolbar.Label').t`Highlight all unavailable`}
+              >
                 <Icon type="info" size="medium" />
               </button>
             </StyledTooltip>
diff --git a/packages/web/src/javascripts/Components/NoteView/UniversalSearch/registerUniversalSearchKeyboardHandlers.ts b/packages/web/src/javascripts/Components/NoteView/UniversalSearch/registerUniversalSearchKeyboardHandlers.ts
index c3131ef2ced..5565b46dbf1 100644
--- a/packages/web/src/javascripts/Components/NoteView/UniversalSearch/registerUniversalSearchKeyboardHandlers.ts
+++ b/packages/web/src/javascripts/Components/NoteView/UniversalSearch/registerUniversalSearchKeyboardHandlers.ts
@@ -7,6 +7,7 @@ import {
   UNIVERSAL_TOGGLE_SEARCH,
 } from '@standardnotes/ui-services'
 import { Disposer } from '@/Types/Disposer'
+import { c } from 'ttag'
 import { UniversalSearchController } from './UniversalSearchController'
 
 export function registerUniversalSearchKeyboardHandlers<TPayload>(
@@ -17,7 +18,7 @@ export function registerUniversalSearchKeyboardHandlers<TPayload>(
     {
       command: UNIVERSAL_TOGGLE_SEARCH,
       category: 'Search',
-      description: 'Search in current note',
+      description: c('B3.Notes.EditorToolbar.Action').t`Search in current note`,
       onKeyDown: (event) => {
         event.preventDefault()
         event.stopPropagation()
@@ -32,7 +33,7 @@ export function registerUniversalSearchKeyboardHandlers<TPayload>(
     {
       command: UNIVERSAL_SEARCH_TOGGLE_REPLACE_MODE,
       category: 'Search',
-      description: 'Search and replace in current note',
+      description: c('B3.Notes.EditorToolbar.Action').t`Search and replace in current note`,
       onKeyDown: (event) => {
         if (!controller.canReplace) {
           return
@@ -65,7 +66,7 @@ export function registerUniversalSearchKeyboardHandlers<TPayload>(
     {
       command: UNIVERSAL_SEARCH_NEXT_RESULT,
       category: 'Search',
-      description: 'Go to next search result',
+      description: c('B3.Notes.EditorToolbar.Action').t`Go to next search result`,
       onKeyDown(event) {
         if (!controller.isOpen) {
           return
@@ -79,7 +80,7 @@ export function registerUniversalSearchKeyboardHandlers<TPayload>(
     {
       command: UNIVERSAL_SEARCH_PREVIOUS_RESULT,
       category: 'Search',
-      description: 'Go to previous search result',
+      description: c('B3.Notes.EditorToolbar.Action').t`Go to previous search result`,
       onKeyDown(event) {
         if (!controller.isOpen) {
           return
diff --git a/packages/web/src/javascripts/Components/NotesOptions/PlainNoteOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/PlainNoteOptions.tsx
index 5c52d614c55..3b2ed94d362 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/PlainNoteOptions.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/PlainNoteOptions.tsx
@@ -5,6 +5,7 @@ import { iconClass } from './ClassNames'
 import MenuSection from '../Menu/MenuSection'
 import { UNIVERSAL_TOGGLE_SEARCH } from '@standardnotes/ui-services'
 import { useMemo, useCallback } from 'react'
+import { c } from 'ttag'
 import { useKeyboardService } from '../KeyboardServiceProvider'
 
 type Props = {
@@ -28,7 +29,7 @@ const PlainNoteOptions = ({ closeMenu }: Props) => {
     <MenuSection>
       <MenuItem onClick={findInNote}>
         <Icon type="search" className={iconClass} />
-        Find in note
+        {c('B4.Notes.EditorOptions.Action').t`Find in note`}
         {findShortcut && <KeyboardShortcutIndicator className="ml-auto" shortcut={findShortcut} />}
       </MenuItem>
     </MenuSection>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
index 7560107e6d1..5a8081e0596 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
@@ -16,6 +16,10 @@ const SubscriptionStatusText = () => {
   const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   const expirationDateString = userSubscriptionExpirationDate?.toLocaleString()
+  const appNameBold = <span className="font-bold">{AppName}</span>
+  const subscriptionTierBold = userSubscriptionName ? <span className="font-bold"> {userSubscriptionName}</span> : null
+  const expirationDateBold = <span className="font-bold">{expirationDateString}</span>
+
   const sharedMessage = isSharedSubscription ? (
     <>
       <br />
@@ -28,23 +32,11 @@ const SubscriptionStatusText = () => {
   if (isUserSubscriptionCanceled) {
     return (
       <Text className="mt-1">
-        {c('B6.Preferences.Subscription.Info').t`Your`}{' '}
-        <span className="font-bold">
-          {AppName}
-          {userSubscriptionName ? ' ' : ''}
-          {userSubscriptionName}
-        </span>{' '}
-        {c('B6.Preferences.Subscription.Info').t`subscription has been canceled`}{' '}
-        {isUserSubscriptionExpired ? (
-          <span className="font-bold">
-            {c('B6.Preferences.Subscription.Info').t`and expired on`} {expirationDateString}
-          </span>
-        ) : (
-          <span className="font-bold">
-            {c('B6.Preferences.Subscription.Info').t`but will remain valid until`} {expirationDateString}
-          </span>
-        )}
-        {c('B6.Preferences.Subscription.Info').t`. You may resubscribe below if you wish.`}
+        {isUserSubscriptionExpired
+          ? c('B6.Preferences.Subscription.Info')
+              .jt`Your ${appNameBold}${subscriptionTierBold} subscription has been canceled and expired on ${expirationDateBold}. You may resubscribe below if you wish.`
+          : c('B6.Preferences.Subscription.Info')
+              .jt`Your ${appNameBold}${subscriptionTierBold} subscription has been canceled but will remain valid until ${expirationDateBold}. You may resubscribe below if you wish.`}
         {sharedMessage}
       </Text>
     )
@@ -53,17 +45,8 @@ const SubscriptionStatusText = () => {
   if (isUserSubscriptionExpired) {
     return (
       <Text className="mt-1">
-        {c('B6.Preferences.Subscription.Info').t`Your`}{' '}
-        <span className="font-bold">
-          {AppName}
-          {userSubscriptionName ? ' ' : ''}
-          {userSubscriptionName}
-        </span>{' '}
-        {c('B6.Preferences.Subscription.Info').t`subscription`}{' '}
-        <span className="font-bold">
-          {c('B6.Preferences.Subscription.Info').t`expired on`} {expirationDateString}
-        </span>
-        {c('B6.Preferences.Subscription.Info').t`. You may resubscribe below if you wish.`}
+        {c('B6.Preferences.Subscription.Info')
+          .jt`Your ${appNameBold}${subscriptionTierBold} subscription expired on ${expirationDateBold}. You may resubscribe below if you wish.`}
         {sharedMessage}
       </Text>
     )
@@ -71,17 +54,9 @@ const SubscriptionStatusText = () => {
 
   return (
     <Text className="mt-1">
-      {c('B6.Preferences.Subscription.Info').t`Your`}{' '}
-      <span className="font-bold">
-        {AppName}
-        {userSubscriptionName ? ' ' : ''}
-        {userSubscriptionName}
-      </span>{' '}
-      {c('B6.Preferences.Subscription.Info').t`subscription will be`}{' '}
-      <span className="font-bold">
-        {c('B6.Preferences.Subscription.Info').t`renewed on`} {expirationDateString}
-      </span>
-      .{sharedMessage}
+      {c('B6.Preferences.Subscription.Info')
+        .jt`Your ${appNameBold}${subscriptionTierBold} subscription will be renewed on ${expirationDateBold}.`}
+      {sharedMessage}
     </Text>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx
index 050c4fda274..1040bd871aa 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx
@@ -1,7 +1,14 @@
 import { Title, Text, Subtitle } from '@/Components/Preferences/PreferencesComponents/Content'
 import { useCallback, useEffect, useMemo, useState, FunctionComponent } from 'react'
 import Button from '@/Components/Button/Button'
-import { FileBackupMetadataFile, FileBackupsConstantsV1, FileItem, FileHandleRead } from '@standardnotes/snjs'
+import { jtString } from '@standardnotes/features'
+import {
+  escapeHtmlString,
+  FileBackupMetadataFile,
+  FileBackupsConstantsV1,
+  FileItem,
+  FileHandleRead,
+} from '@standardnotes/snjs'
 import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
 import Icon from '@/Components/Icon/Icon'
 import { ClassicFileReader, StreamingFileApi } from '@standardnotes/filepicker'
@@ -52,9 +59,12 @@ const BackupsDropZone: FunctionComponent<Props> = ({ application }) => {
 
     if (result === 'success') {
       const decryptedFileName = decryptedFileItem.name
+      const decryptedFileNameBold = `<strong>${escapeHtmlString(decryptedFileName)}</strong>`
       void application.alerts.alert(
-        c('B6.Preferences.Backups.Info')
-          .t`<strong>${decryptedFileName}</strong> has been successfully decrypted and saved to your chosen directory.`,
+        jtString(
+          c('B6.Preferences.Backups.Info')
+            .jt`${decryptedFileNameBold} has been successfully decrypted and saved to your chosen directory.`,
+        ),
       )
       setBinaryFile(undefined)
       setDecryptedFileItem(undefined)
@@ -143,12 +153,14 @@ const BackupsDropZone: FunctionComponent<Props> = ({ application }) => {
     }
   }, [handleDragIn, handleDrop, handleDragOver, handleDragOut])
 
+  const metadataFileName = <i>{FileBackupsConstantsV1.MetadataFileName}</i>
+
   if (!droppedFile) {
     return (
       <>
         <Text className="mb-2">
           {c('B6.Preferences.Backups.Info')
-            .t`To decrypt a backup file, drag and drop the file's respective <i>metadata.sn.json</i> file here or select it below.`}
+            .jt`To decrypt a backup file, drag and drop the file's respective ${metadataFileName} file here or select it below.`}
         </Text>
         <Button
           onClick={() => {
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx
index 78c051f4456..e8bf75739f7 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx
@@ -1,7 +1,9 @@
-export const LISTED_SUNSETTING_PREFERENCES_NOTE =
-  'Note: The Listed platform will permanently shut down December 31, 2026. Your data published on Listed will still be available in your personal Standard Notes account.'
+import { AppName, ListedName } from '@standardnotes/features'
+import { c } from 'ttag'
 
-export const LISTED_SUNSETTING_ACTIONS_NOTE = 'Listed will permanently shut down on December 31, 2026.'
+type Props = {
+  variant?: 'pane' | 'menu'
+}
 
 const LearnMoreLink = () => {
   return (
@@ -10,17 +12,18 @@ const LearnMoreLink = () => {
       className="underline hover:no-underline"
       href="https://listed.to/@Listed/76799/an-update-about-listed"
     >
-      Learn more
+      {c('B6.Preferences.Listed.Action').t`Learn more`}
     </a>
   )
 }
 
-type Props = {
-  variant?: 'pane' | 'menu'
-}
-
 const ListedSunsettingBanner = ({ variant = 'pane' }: Props) => {
-  const message = variant === 'menu' ? LISTED_SUNSETTING_ACTIONS_NOTE : LISTED_SUNSETTING_PREFERENCES_NOTE
+  const message =
+    variant === 'menu'
+      ? c('B6.Preferences.Listed.Info')
+          .jt`${ListedName} will permanently shut down on December 31, 2026.`
+      : c('B6.Preferences.Listed.Info')
+          .jt`Note: The ${ListedName} platform will permanently shut down December 31, 2026. Your data published on ${ListedName} will still be available in your personal ${AppName} account.`
 
   if (variant === 'menu') {
     return (
diff --git a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
index fb553ce8867..83192e89d8f 100644
--- a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
+++ b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
@@ -35,7 +35,7 @@ const SearchFilterButton = ({ activeFilterCount, isOpen, onClick }: SearchFilter
     )}
     onMouseDown={(event) => event.preventDefault()}
     onClick={onClick}
-    aria-label="Search filters"
+    aria-label={c('B3.Notes.NoteList.AriaLabel').t`Search filters`}
     aria-expanded={isOpen}
   >
     <Icon type="tune" className="h-4.5 w-4.5" />
diff --git a/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
index 4c695618abd..a6afd651bec 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
@@ -2,6 +2,7 @@ import Checkbox from '@/Components/Checkbox/Checkbox'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 import { classNames } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
+import { c } from 'ttag'
 import SearchBubbles from './SearchBubbles'
 import SearchOptionsSection, { ClearFilterButton } from './SearchOptionsSection'
 import SearchTagFilters from './SearchTagFilters'
@@ -20,16 +21,18 @@ const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
         <div className="flex items-start justify-between gap-2">
           <Checkbox
             name="search-note-title-only"
-            label="Search titles only"
+            label={c('B3.Notes.NoteList.Label').t`Search titles only`}
             checked={noteTitleOnly}
             onChange={(event) => searchOptions.setNoteTitleOnly(event.target.checked)}
           />
           {activeSearchFilterCount > 0 && (
-            <ClearFilterButton onClick={searchOptions.clearAllFilters}>Clear all filters</ClearFilterButton>
+            <ClearFilterButton onClick={searchOptions.clearAllFilters}>
+              {c('B3.Notes.NoteList.Action').t`Clear all filters`}
+            </ClearFilterButton>
           )}
         </div>
 
-        <SearchOptionsSection label="Include">
+        <SearchOptionsSection label={c('B3.Notes.NoteList.Label').t`Include`}>
           <div className="flex flex-wrap gap-2">
             <SearchBubbles searchOptions={searchOptions} />
           </div>
@@ -37,10 +40,12 @@ const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
       </div>
 
       <SearchOptionsSection
-        label="Filter by tag"
+        label={c('B3.Notes.NoteList.Label').t`Filter by tag`}
         action={
           tagFilterList.length > 0 ? (
-            <ClearFilterButton onClick={searchOptions.clearTagFilters}>Clear tag filters</ClearFilterButton>
+            <ClearFilterButton onClick={searchOptions.clearTagFilters}>
+              {c('B3.Notes.NoteList.Action').t`Clear tag filters`}
+            </ClearFilterButton>
           ) : undefined
         }
       >
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
index c5ba1cfc581..8160f7a1235 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
@@ -2,6 +2,7 @@ import Bubble from '@/Components/Bubble/Bubble'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 import { observer } from 'mobx-react-lite'
 import { useCallback } from 'react'
+import { c } from 'ttag'
 
 type Props = {
   searchOptions: SearchOptionsController
@@ -17,12 +18,20 @@ const SearchBubbles = ({ searchOptions }: Props) => {
   return (
     <>
       <Bubble
-        label="Protected Contents"
+        label={c('B3.Notes.NoteList.Label').t`Protected Contents`}
         selected={includeProtectedContents}
         onSelect={toggleIncludeProtectedContents}
       />
-      <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
-      <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
+      <Bubble
+        label={c('B3.Notes.NoteList.Action').t`Archived`}
+        selected={includeArchived}
+        onSelect={searchOptions.toggleIncludeArchived}
+      />
+      <Bubble
+        label={c('B3.Notes.NoteList.Action').t`Trashed`}
+        selected={includeTrashed}
+        onSelect={searchOptions.toggleIncludeTrashed}
+      />
     </>
   )
 }
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
index 8d047491664..c181106f521 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
@@ -3,6 +3,7 @@ import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 import { useAndroidBackHandler } from '@/NativeMobileWeb/useAndroidBackHandler'
 import { observer } from 'mobx-react-lite'
 import { useEffect } from 'react'
+import { c } from 'ttag'
 import EnhancedSearchOptionsContent from './EnhancedSearchOptionsContent'
 
 type Props = {
@@ -26,7 +27,13 @@ const SearchFilterSheet = ({ open, onClose, searchOptions }: Props) => {
   }, [addAndroidBackHandler, onClose, open])
 
   return (
-    <MobilePopoverContent open={open} requestClose={onClose} title="Search filters" id="search-filters" className="p-4">
+    <MobilePopoverContent
+      open={open}
+      requestClose={onClose}
+      title={c('B3.Notes.NoteList.Title').t`Search filters`}
+      id="search-filters"
+      className="p-4"
+    >
       <EnhancedSearchOptionsContent searchOptions={searchOptions} />
     </MobilePopoverContent>
   )
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
index e7d5712bad0..b8b30e910de 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
@@ -6,6 +6,7 @@ import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 import { createLinkFromItem } from '@/Utils/Items/Search/createLinkFromItem'
 import { ContentType, SNTag } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
+import { c } from 'ttag'
 
 type Props = {
   searchOptions: SearchOptionsController
@@ -38,7 +39,7 @@ const SearchTagFilters = ({ searchOptions }: Props) => {
       ))}
       <ItemSelectionDropdown
         onSelection={(item) => searchOptions.addTagFilter(item as SNTag)}
-        placeholder="Add tag..."
+        placeholder={c('B4.Notes.TagsLinkedItems.Placeholder').t`Add tag...`}
         contentTypes={[ContentType.TYPES.Tag]}
         excludeUuids={excludeUuids}
       />

From 55a40a6d093da775e4f498585f124d4478f27091 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 25 Sep 2026 00:59:24 -0300
Subject: [PATCH 2/5] chore: Adds missing desktop strings

---
 .../app/javascripts/Main/Menus/Menus.ts       | 129 +++++-------------
 .../app/javascripts/Main/Strings/strings.ts   |  29 ++++
 .../app/javascripts/Main/Strings/types.ts     |  23 ++++
 3 files changed, 89 insertions(+), 92 deletions(-)

diff --git a/packages/desktop/app/javascripts/Main/Menus/Menus.ts b/packages/desktop/app/javascripts/Main/Menus/Menus.ts
index af9e2257a51..5e01fa50eab 100644
--- a/packages/desktop/app/javascripts/Main/Menus/Menus.ts
+++ b/packages/desktop/app/javascripts/Main/Menus/Menus.ts
@@ -30,40 +30,26 @@ const Separator: MenuItemConstructorOptions = {
   type: 'separator',
 }
 
+function menuRole(label: string, role: string): MenuItemConstructorOptions {
+  return { label, role: role as MenuItemConstructorOptions['role'] }
+}
+
 export function buildContextMenu(webContents: WebContents, params: ContextMenuParams): Menu {
   if (!params.isEditable) {
-    return Menu.buildFromTemplate([
-      {
-        role: 'copy',
-      },
-    ])
+    return Menu.buildFromTemplate([menuRole(str().copy, Roles.Copy)])
   }
 
   return Menu.buildFromTemplate([
     ...suggestionsMenu(params.selectionText, params.misspelledWord, params.dictionarySuggestions, webContents),
     Separator,
-    {
-      role: 'undo',
-    },
-    {
-      role: 'redo',
-    },
+    menuRole(str().undo, Roles.Undo),
+    menuRole(str().redo, Roles.Redo),
     Separator,
-    {
-      role: 'cut',
-    },
-    {
-      role: 'copy',
-    },
-    {
-      role: 'paste',
-    },
-    {
-      role: 'pasteAndMatchStyle',
-    },
-    {
-      role: 'selectAll',
-    },
+    menuRole(str().cut, Roles.Cut),
+    menuRole(str().copy, Roles.Copy),
+    menuRole(str().paste, Roles.Paste),
+    menuRole(str().pasteAndMatchStyle, Roles.PasteAndMatchStyle),
+    menuRole(str().selectAll, Roles.SelectAll),
   ])
 }
 
@@ -208,28 +194,19 @@ function macAppMenu(appName: string): MenuItemConstructorOptions {
     role: 'appMenu',
     label: appName,
     submenu: [
-      {
-        role: Roles.About,
-      },
+      menuRole(str().about(appName), Roles.About),
       Separator,
       {
+        label: str().services,
         role: Roles.Services,
         submenu: [],
       },
       Separator,
-      {
-        role: Roles.Hide,
-      },
-      {
-        role: Roles.HideOthers,
-      },
-      {
-        role: Roles.UnHide,
-      },
+      menuRole(str().hide(appName), Roles.Hide),
+      menuRole(str().hideOthers, Roles.HideOthers),
+      menuRole(str().showAll, Roles.UnHide),
       Separator,
-      {
-        role: Roles.Quit,
-      },
+      menuRole(str().quit(appName), Roles.Quit),
     ],
   }
 }
@@ -249,28 +226,14 @@ function editMenu(
     role: 'editMenu',
     label: str().edit,
     submenu: [
-      {
-        role: Roles.Undo,
-      },
-      {
-        role: Roles.Redo,
-      },
+      menuRole(str().undo, Roles.Undo),
+      menuRole(str().redo, Roles.Redo),
       Separator,
-      {
-        role: Roles.Cut,
-      },
-      {
-        role: Roles.Copy,
-      },
-      {
-        role: Roles.Paste,
-      },
-      {
-        role: Roles.PasteAndMatchStyle,
-      },
-      {
-        role: Roles.SelectAll,
-      },
+      menuRole(str().cut, Roles.Cut),
+      menuRole(str().copy, Roles.Copy),
+      menuRole(str().paste, Roles.Paste),
+      menuRole(str().pasteAndMatchStyle, Roles.PasteAndMatchStyle),
+      menuRole(str().selectAll, Roles.SelectAll),
       ...(isMac() ? [Separator, macSpeechMenu()] : [spellcheckerMenu(spellcheckerManager!, reload)]),
     ],
   }
@@ -280,12 +243,8 @@ function macSpeechMenu(): MenuItemConstructorOptions {
   return {
     label: str().speech,
     submenu: [
-      {
-        role: Roles.StopSeeking,
-      },
-      {
-        role: Roles.StopSeeking,
-      },
+      menuRole(str().startSpeaking, Roles.StartSeeking),
+      menuRole(str().stopSpeaking, Roles.StopSeeking),
     ],
   }
 }
@@ -317,26 +276,14 @@ function viewMenu(window: Electron.BrowserWindow, store: Store, reload: () => vo
   return {
     label: str().view,
     submenu: [
-      {
-        role: Roles.Reload,
-      },
-      {
-        role: Roles.ToggleDevTools,
-      },
+      menuRole(str().reload, Roles.Reload),
+      menuRole(str().toggleDeveloperTools, Roles.ToggleDevTools),
       Separator,
-      {
-        role: Roles.ResetZoom,
-      },
-      {
-        role: Roles.ZoomIn,
-      },
-      {
-        role: Roles.ZoomOut,
-      },
+      menuRole(str().actualSize, Roles.ResetZoom),
+      menuRole(str().zoomIn, Roles.ZoomIn),
+      menuRole(str().zoomOut, Roles.ZoomOut),
       Separator,
-      {
-        role: Roles.ToggleFullScreen,
-      },
+      menuRole(str().toggleFullScreen, Roles.ToggleFullScreen),
       ...(isMac() ? [] : [Separator, ...menuBarOptions(window, store, reload)]),
     ],
   }
@@ -375,14 +322,11 @@ function menuBarOptions(window: Electron.BrowserWindow, store: Store, reload: ()
 
 function windowMenu(store: Store, trayManager: TrayManager, reload: () => void): MenuItemConstructorOptions {
   return {
+    label: str().window,
     role: Roles.Window,
     submenu: [
-      {
-        role: Roles.Minimize,
-      },
-      {
-        role: Roles.Close,
-      },
+      menuRole(str().minimize, Roles.Minimize),
+      menuRole(str().close, Roles.Close),
       Separator,
       ...(isMac() ? macWindowItems() : [minimizeToTrayItem(store, trayManager, reload)]),
     ],
@@ -512,6 +456,7 @@ function updateMenu(window: BrowserWindow, appState: AppState) {
 
 function helpMenu(window: Electron.BrowserWindow, shell: Electron.Shell) {
   return {
+    label: str().help,
     role: Roles.Help,
     submenu: [
       {
diff --git a/packages/desktop/app/javascripts/Main/Strings/strings.ts b/packages/desktop/app/javascripts/Main/Strings/strings.ts
index 625214293ad..d14af39879f 100644
--- a/packages/desktop/app/javascripts/Main/Strings/strings.ts
+++ b/packages/desktop/app/javascripts/Main/Strings/strings.ts
@@ -5,8 +5,37 @@ import { Strings } from './types'
 export function createStrings(): Strings {
   return {
     appMenu: {
+      window: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Window`,
+      help: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Help`,
       edit: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Edit`,
       view: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`View`,
+      about(appName: string) {
+        return jtString(c('B8.MobileDesktopShared.Desktop.Menu.Label').jt`About ${appName}`)
+      },
+      services: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Services`,
+      hide(appName: string) {
+        return jtString(c('B8.MobileDesktopShared.Desktop.Menu.Label').jt`Hide ${appName}`)
+      },
+      hideOthers: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Hide Others`,
+      showAll: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Show All`,
+      quit(appName: string) {
+        return jtString(c('B8.MobileDesktopShared.Desktop.Menu.Label').jt`Quit ${appName}`)
+      },
+      startSpeaking: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Start Speaking`,
+      stopSpeaking: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Stop Speaking`,
+      undo: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Undo`,
+      redo: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Redo`,
+      cut: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Cut`,
+      copy: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Copy`,
+      paste: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Paste`,
+      pasteAndMatchStyle: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Paste and Match Style`,
+      selectAll: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Select All`,
+      reload: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Reload`,
+      toggleDeveloperTools: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Toggle Developer Tools`,
+      actualSize: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Actual Size`,
+      zoomIn: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Zoom In`,
+      zoomOut: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Zoom Out`,
+      toggleFullScreen: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Toggle Full Screen`,
       hideMenuBar: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Hide Menu Bar`,
       useThemedMenuBar: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Use Themed Menu Bar`,
       minimizeToTrayOnClose: c('B8.MobileDesktopShared.Desktop.Menu.Label').t`Minimize To Tray On Close`,
diff --git a/packages/desktop/app/javascripts/Main/Strings/types.ts b/packages/desktop/app/javascripts/Main/Strings/types.ts
index 2c5649468e8..bd14e176412 100644
--- a/packages/desktop/app/javascripts/Main/Strings/types.ts
+++ b/packages/desktop/app/javascripts/Main/Strings/types.ts
@@ -7,8 +7,31 @@ export interface Strings {
 }
 
 interface AppMenuStrings {
+  window: string
+  help: string
   edit: string
   view: string
+  about(appName: string): string
+  services: string
+  hide(appName: string): string
+  hideOthers: string
+  showAll: string
+  quit(appName: string): string
+  startSpeaking: string
+  stopSpeaking: string
+  undo: string
+  redo: string
+  cut: string
+  copy: string
+  paste: string
+  pasteAndMatchStyle: string
+  selectAll: string
+  reload: string
+  toggleDeveloperTools: string
+  actualSize: string
+  zoomIn: string
+  zoomOut: string
+  toggleFullScreen: string
   hideMenuBar: string
   useThemedMenuBar: string
   minimizeToTrayOnClose: string

From 277f322bb1d0ce927168b09b8bdc6ed382b50e82 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 25 Sep 2026 16:47:42 -0300
Subject: [PATCH 3/5] chore: Fixes issues with ttag wrapping for several
 strings

---
 .../CommandPalette/CommandPalette.tsx         |  2 +-
 .../Header/NewNotePreferences.tsx             | 54 ++++++++++---------
 .../Header/NoteTitleFormatOptions.tsx         |  2 +
 .../Preferences/Panes/Account/Email/Email.tsx |  4 +-
 .../Panes/General/NewNoteDefaults.tsx         | 10 +++-
 .../General/Offline/OfflineSubscription.tsx   |  5 +-
 .../Preferences/Panes/HelpFeedback.tsx        | 26 +++++----
 .../Panes/HomeServer/HomeServer.tsx           | 14 ++---
 .../Plugins/BrowsePlugins/BrowsePlugins.tsx   |  4 +-
 .../Security/TwoFactorAuth/SaveSecretKey.tsx  | 20 ++++---
 .../Security/TwoFactorAuth/Verification.tsx   | 13 +++--
 .../Panes/Security/U2F/U2FAddDeviceView.tsx   | 11 ++--
 .../ProtectedItemOverlay.tsx                  | 17 ++++--
 .../RevisionContentLocked.tsx                 |  2 +-
 .../Nodes/FileComponent.tsx                   |  7 +--
 15 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/packages/web/src/javascripts/Components/CommandPalette/CommandPalette.tsx b/packages/web/src/javascripts/Components/CommandPalette/CommandPalette.tsx
index a11550434e7..ec061733403 100644
--- a/packages/web/src/javascripts/Components/CommandPalette/CommandPalette.tsx
+++ b/packages/web/src/javascripts/Components/CommandPalette/CommandPalette.tsx
@@ -229,7 +229,7 @@ function CommandPalette() {
         section,
         id: UuidGenerator.GenerateUuid(),
         itemUuid: item.uuid,
-        description: item.title || c('B2.NavSharedUI.Placeholder').t`<no title>`,
+        description: item.title || c('B2.NavSharedUI.Placeholder').t`Untitled`,
         icon: <Icon type={icon[0]} className={item instanceof SNNote ? icon[1] : ''} />,
       }
     },
diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx
index b327b942db8..fb9baab4f02 100644
--- a/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx
@@ -19,10 +19,11 @@ import { AnyTag } from '@/Controllers/Navigation/AnyTagType'
 import { PreferenceMode } from './PreferenceMode'
 import { EditorOption, getDropdownItemsForAllEditors } from '@/Utils/DropdownItemsForEditors'
 import { classNames } from '@standardnotes/utils'
-import { NoteTitleFormatOptions } from './NoteTitleFormatOptions'
+import { NOTE_TITLE_FORMAT_PATTERN_EXAMPLE, NoteTitleFormatOptions } from './NoteTitleFormatOptions'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
 import { getDayjsFormattedString } from '@/Utils/GetDayjsFormattedString'
 import { ErrorBoundary } from '@/Utils/ErrorBoundary'
+import { jtString } from '@standardnotes/features'
 import { c } from 'ttag'
 
 const PrefChangeDebounceTimeInMs = 25
@@ -173,6 +174,31 @@ const NewNotePreferences: FunctionComponent<Props> = ({
     }, PrefChangeDebounceTimeInMs)
   }
 
+  const titleFormatOptionsLink = (
+    <a
+      className="underline"
+      href={HelpPageUrl}
+      rel="noreferrer"
+      target="_blank"
+      onClick={(event) => {
+        if (application.isNativeMobileWeb()) {
+          event.preventDefault()
+          application.mobileDevice.openUrl(HelpPageUrl)
+        }
+      }}
+    >
+      {c('B3.Notes.NoteList.Action').t`Options`}
+    </a>
+  )
+
+  const bracketsLiteral = <code>[]</code>
+
+  const titleFormatPreview = (
+    <ErrorBoundary>
+      <CustomNoteTitleFormatPreview format={customNoteTitleFormat} />
+    </ErrorBoundary>
+  )
+
   return (
     <div className="px-3 py-3">
       <div>
@@ -211,35 +237,15 @@ const NewNotePreferences: FunctionComponent<Props> = ({
                 'w-full min-w-55 rounded border border-solid border-passive-3 bg-default px-2 py-1.5 text-sm md:translucent-ui:bg-transparent',
                 'focus-within:ring-2 focus-within:ring-info',
               )}
-              placeholder={c('B3.Notes.NoteList.Label').t`e.g. YYYY-MM-DD`}
+              placeholder={jtString(c('B3.Notes.NoteList.Label').jt`e.g. ${NOTE_TITLE_FORMAT_PATTERN_EXAMPLE}`)}
               value={customNoteTitleFormat}
               onChange={handleCustomFormatInputChange}
               spellCheck={false}
             />
           </div>
-          <div className="mt-3 text-neutral">
-            <span className="font-bold">{c('B3.Notes.NoteList.Label').t`Preview:`} </span>
-            <ErrorBoundary>
-              <CustomNoteTitleFormatPreview format={customNoteTitleFormat} />
-            </ErrorBoundary>
-          </div>
+          <div className="mt-3 text-neutral">{c('B3.Notes.NoteList.Info').jt`Preview: ${titleFormatPreview}`}</div>
           <div className="mt-2 text-neutral">
-            <a
-              className="underline"
-              href={HelpPageUrl}
-              rel="noreferrer"
-              target="_blank"
-              onClick={(event) => {
-                if (application.isNativeMobileWeb()) {
-                  event.preventDefault()
-                  application.mobileDevice.openUrl(HelpPageUrl)
-                }
-              }}
-            >
-              {c('B3.Notes.NoteList.Action').t`Options`}
-            </a>
-            . {c('B3.Notes.NoteList.Info').t`Use`} <code>[]</code>{' '}
-            {c('B3.Notes.NoteList.Info').t`to escape formatting.`}
+            {c('B3.Notes.NoteList.Info').jt`${titleFormatOptionsLink}. Use ${bracketsLiteral} to escape formatting.`}
           </div>
         </div>
       )}
diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/NoteTitleFormatOptions.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/NoteTitleFormatOptions.tsx
index dbd57bf83a5..824d46cf3a5 100644
--- a/packages/web/src/javascripts/Components/ContentListView/Header/NoteTitleFormatOptions.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/Header/NoteTitleFormatOptions.tsx
@@ -1,6 +1,8 @@
 import { NewNoteTitleFormat } from '@standardnotes/snjs'
 import { c } from 'ttag'
 
+export const NOTE_TITLE_FORMAT_PATTERN_EXAMPLE = 'YYYY-MM-DD'
+
 export const NoteTitleFormatOptions = [
   {
     label: c('B3.Notes.NoteList.Label').t`Current date and time`,
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx
index d46380630ff..ef7ebc0c0e5 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx
@@ -118,8 +118,6 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
     }
   }
 
-  const subscriptionBold = <span className="font-bold">{c('B6.Preferences.Account.Label').t`subscription`}</span>
-
   return (
     <PreferencesGroup>
       <PreferencesSegment>
@@ -139,7 +137,7 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
                   text={
                     <span>
                       {c('B6.Preferences.Account.Info')
-                        .jt`Sign-in notification emails are available only on a ${subscriptionBold} plan. Please upgrade in order to enable sign-in notifications.`}
+                        .t`Sign-in notification emails are available only on a subscription plan. Please upgrade in order to enable sign-in notifications.`}
                     </span>
                   }
                 />
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/NewNoteDefaults.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/NewNoteDefaults.tsx
index 5a065fbb1fc..b755d058a8f 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/General/NewNoteDefaults.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/NewNoteDefaults.tsx
@@ -16,10 +16,14 @@ import {
   classNames,
 } from '@standardnotes/snjs'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
-import { NoteTitleFormatOptions } from '@/Components/ContentListView/Header/NoteTitleFormatOptions'
+import {
+  NOTE_TITLE_FORMAT_PATTERN_EXAMPLE,
+  NoteTitleFormatOptions,
+} from '@/Components/ContentListView/Header/NoteTitleFormatOptions'
 import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
 import { ErrorBoundary } from '@/Utils/ErrorBoundary'
 import { getDayjsFormattedString } from '@/Utils/GetDayjsFormattedString'
+import { jtString } from '@standardnotes/features'
 import { c } from 'ttag'
 
 const PrefChangeDebounceTimeInMs = 25
@@ -154,7 +158,9 @@ const NewNoteDefaults = () => {
                       'w-full min-w-55 rounded border border-solid border-passive-3 bg-default px-2 py-1.5 text-base md:w-auto md:translucent-ui:bg-transparent lg:text-sm',
                       'focus-within:ring-2 focus-within:ring-info',
                     )}
-                    placeholder={c('B6.Preferences.General.Placeholder').t`e.g. YYYY-MM-DD`}
+                    placeholder={jtString(
+                      c('B6.Preferences.General.Placeholder').jt`e.g. ${NOTE_TITLE_FORMAT_PATTERN_EXAMPLE}`,
+                    )}
                     value={customNoteTitleFormat}
                     onChange={handleCustomFormatInputChange}
                     spellCheck={false}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Offline/OfflineSubscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Offline/OfflineSubscription.tsx
index c074372ac49..023cb9c3050 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Offline/OfflineSubscription.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Offline/OfflineSubscription.tsx
@@ -151,8 +151,9 @@ const OfflineSubscription: FunctionComponent<Props> = ({ application, onSuccess
             </div>
             {(isSuccessfullyActivated || isSuccessfullyRemoved) && (
               <div className={'info mb-3 mt-3'}>
-                {c('B6.Preferences.General.Info').t`Your offline subscription code has been successfully`}{' '}
-                {isSuccessfullyActivated ? 'activated' : 'removed'}.
+                {isSuccessfullyActivated
+                  ? c('B6.Preferences.General.Info').t`Your offline subscription code has been successfully activated.`
+                  : c('B6.Preferences.General.Info').t`Your offline subscription code has been successfully removed.`}
               </div>
             )}
             {hasUserPreviouslyStoredCode && (
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx
index 3200aa22a19..13e12c59d4a 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx
@@ -32,6 +32,18 @@ const HelpAndFeedback = ({ application }: { application: WebApplication }) => {
     }
   }
 
+  const privacyPolicyLink = (
+    <a target="_blank" className="underline hover:no-underline" href={PrivacyPolicyUrl} onClick={handleClick}>
+      {c('B7.FilesSubscriptionHelp.Help.Info').t`Privacy Manifesto.`}
+    </a>
+  )
+
+  const offlineHelpLink = (
+    <a target="_blank" className="underline hover:no-underline" href={HelpOfflineUrl} onClick={handleClick}>
+      {c('B7.FilesSubscriptionHelp.Help.Info').t`more details here.`}
+    </a>
+  )
+
   return (
     <PreferencesPane>
       <PreferencesGroup>
@@ -41,10 +53,7 @@ const HelpAndFeedback = ({ application }: { application: WebApplication }) => {
           <Subtitle>{c('B7.FilesSubscriptionHelp.Help.Confirmation').t`Who can read my private notes?`}</Subtitle>
           <Text>
             {c('B7.FilesSubscriptionHelp.Help.Info')
-              .t`Quite simply: no one but you. Not us, not your ISP, not a hacker, and not a government agency. As long as you keep your password safe, and your password is reasonably strong, then you are the only person in the world with the ability to decrypt your notes. For more on how we handle your privacy and security, check out our easy to read`}{' '}
-            <a target="_blank" className="underline hover:no-underline" href={PrivacyPolicyUrl} onClick={handleClick}>
-              {c('B7.FilesSubscriptionHelp.Help.Info').t`Privacy Manifesto.`}
-            </a>
+              .jt`Quite simply: no one but you. Not us, not your ISP, not a hacker, and not a government agency. As long as you keep your password safe, and your password is reasonably strong, then you are the only person in the world with the ability to decrypt your notes. For more on how we handle your privacy and security, check out our easy to read ${privacyPolicyLink}`}
           </Text>
           {application.isNativeIOS() && (
             <>
@@ -80,13 +89,8 @@ const HelpAndFeedback = ({ application }: { application: WebApplication }) => {
             {jtString(c('B7.FilesSubscriptionHelp.Help.Confirmation').jt`Can I use ${AppName} totally offline?`)}
           </Subtitle>
           <Text>
-            {jtString(
-              c('B7.FilesSubscriptionHelp.Help.Info')
-                .jt`${AppName} can be used totally offline without an account, and without an internet connection. You can find`,
-            )}{' '}
-            <a target="_blank" className="underline hover:no-underline" href={HelpOfflineUrl} onClick={handleClick}>
-              {c('B7.FilesSubscriptionHelp.Help.Info').t`more details here.`}
-            </a>
+            {c('B7.FilesSubscriptionHelp.Help.Info')
+              .jt`${AppName} can be used totally offline without an account, and without an internet connection. You can find ${offlineHelpLink}`}
           </Text>
         </PreferencesSegment>
         <HorizontalSeparator classes="my-4" />
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/HomeServer/HomeServer.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/HomeServer/HomeServer.tsx
index 197d7fff2e7..1403a466523 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/HomeServer/HomeServer.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/HomeServer/HomeServer.tsx
@@ -8,6 +8,12 @@ import { AppName, jtString } from '@standardnotes/features'
 import { c } from 'ttag'
 
 const HomeServer = () => {
+  const tailscaleLink = (
+    <a className="text-info" href="https://tailscale.com/">
+      Tailscale.com
+    </a>
+  )
+
   return (
     <PreferencesPane>
       <PreferencesGroup>
@@ -21,13 +27,7 @@ const HomeServer = () => {
         <Subtitle>{c('B6.Preferences.HomeServer.Subtitle')
           .t`Accessing your home server while on the go is easy and secure with Tailscale.`}</Subtitle>
         <ol className="ml-3 mt-3 list-outside list-decimal">
-          <li>
-            {c('B6.Preferences.HomeServer.Label').t`Register on`}{' '}
-            <a className="text-info" href="https://tailscale.com/">
-              Tailscale.com
-            </a>{' '}
-            {c('B6.Preferences.HomeServer.Label').t`for free.`}
-          </li>
+          <li>{c('B6.Preferences.HomeServer.Label').jt`Register on ${tailscaleLink} for free.`}</li>
           <li className="mt-2">
             {c('B6.Preferences.HomeServer.Status')
               .t`Download Tailscale on this computer and complete the Tailscale setup wizard until you are presented with the IP address of your computer. It should start with something like 100.xxx...`}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Plugins/BrowsePlugins/BrowsePlugins.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Plugins/BrowsePlugins/BrowsePlugins.tsx
index e50ac667511..886bc5c0dd2 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Plugins/BrowsePlugins/BrowsePlugins.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Plugins/BrowsePlugins/BrowsePlugins.tsx
@@ -36,9 +36,7 @@ const BrowsePlugins: FunctionComponent = () => {
         <Title>{c('B6.Preferences.Other.Title').t`Browse Plugins`}</Title>
         <Text className="text-neutral">
           {c('B6.Preferences.Plugins.Info')
-            .t`Plugins run in a secure sandbox and can only access data you allow it. Note types allow specialized editing experiences, but in most cases, the`}{' '}
-          <strong>{jtString(c('B6.Preferences.Other.Label').jt`built-in ${SuperName} note type`)}</strong>{' '}
-          {c('B6.Preferences.Plugins.Info').t`can encapsulate any functionality found in plugins.`}
+            .jt`Plugins run in a secure sandbox and can only access data you allow it. Note types allow specialized editing experiences, but in most cases, the built-in ${SuperName} note type can encapsulate any functionality found in plugins.`}
         </Text>
 
         {!plugins && (
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/SaveSecretKey.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/SaveSecretKey.tsx
index e798a4b6012..e8e64769b02 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/SaveSecretKey.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/SaveSecretKey.tsx
@@ -14,20 +14,24 @@ type Props = {
 }
 
 const SaveSecretKey: FunctionComponent<Props> = ({ activation: act }) => {
+  const safeStorageLink = (
+    <a
+      target="_blank"
+      rel="noreferrer noopener"
+      className="underline hover:no-underline"
+      href="https://standardnotes.com/help/21/where-should-i-store-my-two-factor-authentication-secret-key"
+    >
+      {c('B6.Preferences.Security.Info').t`somewhere safe`}
+    </a>
+  )
+
   return (
     <div className="h-33 flex flex-row items-center px-4 py-4">
       <div className="flex flex-grow flex-col">
         <div className="flex flex-row flex-wrap items-center gap-1">
           <Bullet />
           <div className="text-sm">
-            <b>{c('B6.Preferences.Security.Action').t`Save your secret key`}</b>{' '}
-            <a
-              target="_blank"
-              href="https://standardnotes.com/help/21/where-should-i-store-my-two-factor-authentication-secret-key"
-            >
-              {c('B6.Preferences.Security.Label').t`somewhere safe`}
-            </a>
-            :
+            {c('B6.Preferences.Security.Info').jt`Save your secret key ${safeStorageLink}:`}
           </div>
           <DecoratedInput
             disabled={true}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/Verification.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/Verification.tsx
index 74359f15439..991daec2a7e 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/Verification.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/Verification.tsx
@@ -12,16 +12,16 @@ type Props = {
 const Verification: FunctionComponent<Props> = ({ activation: act }) => {
   const secretKeyClass = act.verificationStatus === 'invalid-secret' ? 'border-danger' : ''
   const authTokenClass = act.verificationStatus === 'invalid-auth-code' ? 'border-danger' : ''
+  const secretKeyBold = <b>{c('B6.Preferences.Security.Label').t`secret key`}</b>
+  const authenticationCodeBold = <b>{c('B6.Preferences.Security.Label').t`authentication code`}</b>
+
   return (
     <div className="h-33 flex flex-row items-center px-4 py-4">
       <div className="flex flex-grow flex-col gap-4">
         <div className="flex flex-row flex-wrap items-center gap-1">
           <div className="text-sm">
             <Bullet className="align-middle" />
-            <span className="align-middle">
-              {c('B6.Preferences.Security.Label').t`Enter your`}{' '}
-              <b>{c('B6.Preferences.Security.Label').t`secret key`}</b>:
-            </span>
+            <span className="align-middle">{c('B6.Preferences.Security.Label').jt`Enter your ${secretKeyBold}:`}</span>
           </div>
           <DecoratedInput
             className={{ container: `ml-2 w-full md:w-96 ${secretKeyClass}` }}
@@ -32,9 +32,8 @@ const Verification: FunctionComponent<Props> = ({ activation: act }) => {
           <div className="text-sm">
             <Bullet className="align-middle" />
             <span className="align-middle">
-              {c('B6.Preferences.Security.Label').t`Verify the`}{' '}
-              <b>{c('B6.Preferences.Security.Label').t`authentication code`}</b>{' '}
-              {c('B6.Preferences.Security.Label').t`generated by your authenticator app:`}
+              {c('B6.Preferences.Security.Label')
+                .jt`Verify the ${authenticationCodeBold} generated by your authenticator app:`}
             </span>
           </div>
           <DecoratedInput
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx
index 4ea5ea722fb..a194db2d1c1 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx
@@ -90,6 +90,10 @@ const U2FAddDeviceView: FunctionComponent<Props> = ({ addAuthenticator, onDevice
 
   const isMobileScreen = useMediaQuery(MutuallyExclusiveMediaQueryBreakpoints.sm)
 
+  const addDeviceActionLabel = isMobileScreen
+    ? c('B6.Preferences.Security.Action').t`Add`
+    : c('B6.Preferences.Security.Action').t`Add Device`
+
   return (
     <Modal
       title={c('B6.Preferences.Security.Title').t`Add Security Key`}
@@ -103,12 +107,7 @@ const U2FAddDeviceView: FunctionComponent<Props> = ({ addAuthenticator, onDevice
           hidden: !isMobileScreen,
         },
         {
-          label: (
-            <>
-              {c('B6.Preferences.Security.Action').t`Add`}{' '}
-              <span className="hidden md:inline">{c('B6.Preferences.Security.Label').t`Device`}</span>
-            </>
-          ),
+          label: addDeviceActionLabel,
           type: 'primary',
           onClick: handleAddDeviceClick,
           mobileSlot: 'right',
diff --git a/packages/web/src/javascripts/Components/ProtectedItemOverlay/ProtectedItemOverlay.tsx b/packages/web/src/javascripts/Components/ProtectedItemOverlay/ProtectedItemOverlay.tsx
index c6ad4f577bf..3b0948b5ef0 100644
--- a/packages/web/src/javascripts/Components/ProtectedItemOverlay/ProtectedItemOverlay.tsx
+++ b/packages/web/src/javascripts/Components/ProtectedItemOverlay/ProtectedItemOverlay.tsx
@@ -1,8 +1,13 @@
+import { jtString } from '@standardnotes/features'
 import { c } from 'ttag'
 import Button from '@/Components/Button/Button'
 import MobileItemsListButton from '../NoteGroupView/MobileItemsListButton'
 
-const jtString = (value: unknown): string => (Array.isArray(value) ? value.join('') : String(value))
+function translatedProtectedItemType(itemType: 'note' | 'file'): string {
+  return itemType === 'note'
+    ? c('B3.Notes.NoteActions.Label').t`note`
+    : c('B7.FilesSubscriptionHelp.Files.Label').t`file`
+}
 
 type Props = {
   showAccountMenu: () => void
@@ -12,11 +17,13 @@ type Props = {
 }
 
 const ProtectedItemOverlay = ({ showAccountMenu, onViewItem, hasProtectionSources, itemType }: Props) => {
+  const itemTypeLabel = translatedProtectedItemType(itemType)
+
   const instructionText = hasProtectionSources
-    ? jtString(c('B2.NavSharedUI.Info').jt`Authenticate to view this ${itemType}.`)
+    ? jtString(c('B2.NavSharedUI.Info').jt`Authenticate to view this ${itemTypeLabel}.`)
     : jtString(
         c('B2.NavSharedUI.Info')
-          .jt`Add a passcode or create an account to require authentication to view this ${itemType}.`,
+          .jt`Add a passcode or create an account to require authentication to view this ${itemTypeLabel}.`,
       )
 
   return (
@@ -27,7 +34,7 @@ const ProtectedItemOverlay = ({ showAccountMenu, onViewItem, hasProtectionSource
         </div>
         <div className="mb-auto flex max-w-md flex-col items-center justify-center text-center md:mb-0">
           <h1 className="m-0 w-full text-2xl font-bold">
-            {jtString(c('B2.NavSharedUI.Title').jt`This ${itemType} is protected`)}
+            {jtString(c('B2.NavSharedUI.Title').jt`This ${itemTypeLabel} is protected`)}
           </h1>
           <p className="mt-2 w-full text-lg">{instructionText}</p>
           <div className="mt-4 flex gap-3">
@@ -45,7 +52,7 @@ const ProtectedItemOverlay = ({ showAccountMenu, onViewItem, hasProtectionSource
             <Button small onClick={onViewItem}>
               {hasProtectionSources
                 ? c('B2.NavSharedUI.Action').t`Authenticate`
-                : jtString(c('B2.NavSharedUI.Action').jt`View ${itemType}`)}
+                : jtString(c('B2.NavSharedUI.Action').jt`View ${itemTypeLabel}`)}
             </Button>
           </div>
         </div>
diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx
index daab924e91b..5f2c56d7d83 100644
--- a/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx
+++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx
@@ -26,7 +26,7 @@ const getPremiumContentCopy = (planName: string | undefined) => {
 const RevisionContentLocked: FunctionComponent = () => {
   const application = useApplication()
 
-  let planName = 'free'
+  let planName: string | undefined
   if (application.subscriptions.hasOnlineSubscription()) {
     if (!application.subscriptions.isUserSubscriptionCanceled && !application.subscriptions.isUserSubscriptionExpired) {
       planName = application.subscriptions.userSubscriptionName
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx
index 247110048f7..a10b4a1d5aa 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx
@@ -142,8 +142,7 @@ function FileComponent({
         <div className="flex flex-col items-center justify-center gap-2 p-4 text-center" ref={blockWrapperRef}>
           <div className="flex items-center gap-2">
             <Spinner className="h-4 w-4" />
-            {c('B4.Notes.EditingUI.Status').t`Uploading file "`}
-            {uploadProgress.file.name}"... ({progress}%)
+            {c('B4.Notes.EditingUI.Status').jt`Uploading file "${uploadProgress.file.name}" (${progress}%)`}
           </div>
           <div className="w-full max-w-[50%] overflow-hidden rounded bg-contrast">
             <div
@@ -163,9 +162,7 @@ function FileComponent({
   if (!file) {
     return (
       <BlockWithAlignableContents className={className} format={format} nodeKey={nodeKey}>
-        <div>
-          {c('B4.Notes.EditingUI.Label').t`Unable to find file`} {fileUuid}
-        </div>
+        <div>{c('B4.Notes.EditingUI.Label').jt`Unable to find file ${fileUuid}`}</div>
       </BlockWithAlignableContents>
     )
   }

From 34b42d55a2083e37031cfab62397e93b73fb1a5f Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Tue, 29 Sep 2026 11:35:54 -0300
Subject: [PATCH 4/5] chore: fix eslint error

---
 .../Preferences/Panes/Listed/ListedSunsettingBanner.tsx        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx
index e8bf75739f7..ef18dce302b 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedSunsettingBanner.tsx
@@ -20,8 +20,7 @@ const LearnMoreLink = () => {
 const ListedSunsettingBanner = ({ variant = 'pane' }: Props) => {
   const message =
     variant === 'menu'
-      ? c('B6.Preferences.Listed.Info')
-          .jt`${ListedName} will permanently shut down on December 31, 2026.`
+      ? c('B6.Preferences.Listed.Info').jt`${ListedName} will permanently shut down on December 31, 2026.`
       : c('B6.Preferences.Listed.Info')
           .jt`Note: The ${ListedName} platform will permanently shut down December 31, 2026. Your data published on ${ListedName} will still be available in your personal ${AppName} account.`
 

From 54b4440977d410470edd6189f34407faa89e5e98 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Tue, 29 Sep 2026 11:52:40 -0300
Subject: [PATCH 5/5] chore: fix eslint error

---
 packages/desktop/app/javascripts/Main/Menus/Menus.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/desktop/app/javascripts/Main/Menus/Menus.ts b/packages/desktop/app/javascripts/Main/Menus/Menus.ts
index 5e01fa50eab..51a5c54147e 100644
--- a/packages/desktop/app/javascripts/Main/Menus/Menus.ts
+++ b/packages/desktop/app/javascripts/Main/Menus/Menus.ts
@@ -242,10 +242,7 @@ function editMenu(
 function macSpeechMenu(): MenuItemConstructorOptions {
   return {
     label: str().speech,
-    submenu: [
-      menuRole(str().startSpeaking, Roles.StartSeeking),
-      menuRole(str().stopSpeaking, Roles.StopSeeking),
-    ],
+    submenu: [menuRole(str().startSpeaking, Roles.StartSeeking), menuRole(str().stopSpeaking, Roles.StopSeeking)],
   }
 }