From b911de0cc3f67719f9825e84b55c5bf5d97c1d23 Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Thu, 16 Jun 2022 05:17:44 -0600
Subject: [PATCH] CP - Update en.json: Bug fix and consistency (#3231)

* Update en.json: Bug fix and consistency (#3151)

* Update en.json

Updated copy and fixed https://github.com/mattermost/focalboard/issues/3131

* update cypress tests

* update default messages, en.json is created from default messages when running i18n-extract

* update tests for string changes

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
(cherry picked from commit 020d83fa446929ddd7738cb7a94d6854c5cdd343)

* clean up cherry-pick

* more cleanup

* fix bad merge

* fix cypress tests

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>
---
 webapp/cypress/integration/cardBadges.ts      |  4 +-
 webapp/cypress/integration/createBoard.ts     |  2 +-
 webapp/cypress/support/api_commands.ts        |  4 +-
 webapp/i18n/en.json                           | 56 ++++++++++---------
 .../__snapshots__/centerPanel.test.tsx.snap   | 30 +++++-----
 .../__snapshots__/topBar.test.tsx.snap        |  4 +-
 .../__snapshots__/workspace.test.tsx.snap     | 10 ++--
 .../boardTemplateSelector.test.tsx.snap       |  6 +-
 .../boardTemplateSelectorItem.test.tsx.snap   |  2 +-
 .../boardTemplateSelector.tsx                 |  4 +-
 .../boardSwitcherDialog.tsx                   |  2 +-
 .../src/components/calculations/options.tsx   | 12 ++--
 .../cardDetailProperties.test.tsx.snap        |  4 +-
 .../cardDetail/cardDetailContents.tsx         |  2 +-
 .../cardDetail/cardDetailProperties.test.tsx  |  4 +-
 .../cardDetail/cardDetailProperties.tsx       |  8 +--
 .../__snapshots__/copyLink.test.tsx.snap      |  2 +-
 .../onboardingTour/copyLink/copy_link.tsx     |  2 +-
 .../__snapshots__/shareBoard.test.tsx.snap    | 26 ++++-----
 .../src/components/shareBoard/shareBoard.tsx  |  4 +-
 .../components/sidebar/deleteBoardDialog.tsx  |  6 +-
 .../components/sidebar/sidebarBoardItem.tsx   |  2 +-
 webapp/src/components/topBar.tsx              |  4 +-
 .../viewHeaderPropertiesMenu.test.tsx.snap    |  8 +--
 .../viewHeaderPropertiesMenu.test.tsx         |  2 +-
 .../viewHeader/viewHeaderPropertiesMenu.tsx   |  2 +-
 .../__snapshots__/welcomePage.test.tsx.snap   |  4 +-
 webapp/src/pages/welcome/welcomePage.tsx      |  2 +-
 .../__snapshots__/propertyMenu.test.tsx.snap  |  4 +-
 webapp/src/widgets/propertyMenu.tsx           |  4 +-
 30 files changed, 115 insertions(+), 111 deletions(-)

diff --git a/webapp/cypress/integration/cardBadges.ts b/webapp/cypress/integration/cardBadges.ts
index 892b0d69c..8874e6135 100644
--- a/webapp/cypress/integration/cardBadges.ts
+++ b/webapp/cypress/integration/cardBadges.ts
@@ -47,7 +47,7 @@ describe('Card badges', () => {
         // Show card badges
         cy.log('**Show card badges**')
         cy.findByRole('button', {name: 'Properties menu'}).click()
-        cy.findByRole('button', {name: 'Comments and Description'}).click()
+        cy.findByRole('button', {name: 'Comments and description'}).click()
         cy.findByTitle('This card has a description').should('exist')
         cy.findByTitle('Comments').contains('3').should('exist')
         cy.findByTitle('Checkboxes').contains('2/4').should('exist')
@@ -55,7 +55,7 @@ describe('Card badges', () => {
         // Hide card badges
         cy.log('**Hide card badges**')
         cy.findByRole('button', {name: 'Properties menu'}).click()
-        cy.findByRole('button', {name: 'Comments and Description'}).click()
+        cy.findByRole('button', {name: 'Comments and description'}).click()
         cy.findByTitle('This card has a description').should('not.exist')
         cy.findByTitle('Comments').should('not.exist')
         cy.findByTitle('Checkboxes').should('not.exist')
diff --git a/webapp/cypress/integration/createBoard.ts b/webapp/cypress/integration/createBoard.ts
index 60a6bb0b4..895ab9fcb 100644
--- a/webapp/cypress/integration/createBoard.ts
+++ b/webapp/cypress/integration/createBoard.ts
@@ -30,7 +30,7 @@ describe('Create and delete board / card', () => {
         // Create empty board
         cy.contains('Create empty board').should('exist').click({force: true})
         cy.get('.BoardComponent').should('exist')
-        cy.get('.Editable.title').invoke('attr', 'placeholder').should('contain', 'Untitled Board')
+        cy.get('.Editable.title').invoke('attr', 'placeholder').should('contain', 'Untitled board')
 
         // Change Title
         cy.get('.Editable.title').
diff --git a/webapp/cypress/support/api_commands.ts b/webapp/cypress/support/api_commands.ts
index 0fa9e06f8..428926601 100644
--- a/webapp/cypress/support/api_commands.ts
+++ b/webapp/cypress/support/api_commands.ts
@@ -119,11 +119,11 @@ Cypress.Commands.add('uiCreateNewBoard', (title?: string) => {
     cy.log('**Create new empty board**')
     cy.uiCreateEmptyBoard()
 
-    cy.findByPlaceholderText('Untitled Board').should('exist')
+    cy.findByPlaceholderText('Untitled board').should('exist')
     cy.wait(10)
     if (title) {
         cy.log('**Rename board**')
-        cy.findByPlaceholderText('Untitled Board').type(`${title}{enter}`)
+        cy.findByPlaceholderText('Untitled board').type(`${title}{enter}`)
         cy.findByRole('textbox', {name: title}).should('exist')
     }
     cy.wait(500)
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index eb69ee69f..5948c5e70 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -8,9 +8,11 @@
   "BoardComponent.no-property-title": "Items with an empty {property} property will go here. This column cannot be removed.",
   "BoardComponent.show": "Show",
   "BoardMember.schemeAdmin": "Admin",
+  "BoardMember.schemeCommenter": "Commenter",
   "BoardMember.schemeEditor": "Editor",
   "BoardMember.schemeNone": "None",
   "BoardMember.schemeViewer": "Viewer",
+  "BoardMember.schemeViwer": "Viewer",
   "BoardPage.newVersion": "A new version of Boards is available, click here to reload.",
   "BoardPage.syncFailed": "Board may be deleted or access revoked.",
   "BoardTemplateSelector.add-template": "New template",
@@ -20,7 +22,7 @@
   "BoardTemplateSelector.edit-template": "Edit",
   "BoardTemplateSelector.plugin.no-content-description": "Add a board to the sidebar using any of the templates defined below or start from scratch.{lineBreak} Members of \"{teamName}\" will have access to boards created here.",
   "BoardTemplateSelector.plugin.no-content-title": "Create a Board in {teamName}",
-  "BoardTemplateSelector.title": "Create a Board",
+  "BoardTemplateSelector.title": "Create a board",
   "BoardTemplateSelector.use-this-template": "Use this template",
   "BoardsSwitcher.Title": "Find Boards",
   "BoardsUnfurl.Remainder": "+{remainder} more",
@@ -30,13 +32,13 @@
   "Calculations.Options.count.displayName": "Count",
   "Calculations.Options.count.label": "Count",
   "Calculations.Options.countChecked.displayName": "Checked",
-  "Calculations.Options.countChecked.label": "Count Checked",
+  "Calculations.Options.countChecked.label": "Count checked",
   "Calculations.Options.countUnchecked.displayName": "Unchecked",
-  "Calculations.Options.countUnchecked.label": "Count Unchecked",
+  "Calculations.Options.countUnchecked.label": "Count unchecked",
   "Calculations.Options.countUniqueValue.displayName": "Unique",
-  "Calculations.Options.countUniqueValue.label": "Count Unique Values",
+  "Calculations.Options.countUniqueValue.label": "Count unique values",
   "Calculations.Options.countValue.displayName": "Values",
-  "Calculations.Options.countValue.label": "Count Value",
+  "Calculations.Options.countValue.label": "Count value",
   "Calculations.Options.dateRange.displayName": "Range",
   "Calculations.Options.dateRange.label": "Range",
   "Calculations.Options.earliest.displayName": "Earliest",
@@ -52,9 +54,9 @@
   "Calculations.Options.none.displayName": "Calculate",
   "Calculations.Options.none.label": "None",
   "Calculations.Options.percentChecked.displayName": "Checked",
-  "Calculations.Options.percentChecked.label": "Percent Checked",
+  "Calculations.Options.percentChecked.label": "Percent checked",
   "Calculations.Options.percentUnchecked.displayName": "Unchecked",
-  "Calculations.Options.percentUnchecked.label": "Percent Unchecked",
+  "Calculations.Options.percentUnchecked.label": "Percent unchecked",
   "Calculations.Options.range.displayName": "Range",
   "Calculations.Options.range.label": "Range",
   "Calculations.Options.sum.displayName": "Sum",
@@ -68,16 +70,16 @@
   "CardDetail.add-icon": "Add icon",
   "CardDetail.add-property": "+ Add a property",
   "CardDetail.addCardText": "add card text",
-  "CardDetail.moveContent": "move card content",
+  "CardDetail.moveContent": "Move card content",
   "CardDetail.new-comment-placeholder": "Add a comment...",
-  "CardDetailProperty.confirm-delete-heading": "Confirm Delete Property",
+  "CardDetailProperty.confirm-delete-heading": "Confirm delete property",
   "CardDetailProperty.confirm-delete-subtext": "Are you sure you want to delete the property \"{propertyName}\"? Deleting it will delete the property from all cards in this board.",
   "CardDetailProperty.confirm-property-name-change-subtext": "Are you sure you want to change property \"{propertyName}\" {customText}? This will affect value(s) across {numOfCards} card(s) in this board, and can result in data loss.",
-  "CardDetailProperty.confirm-property-type-change": "Confirm Property Type Change!",
+  "CardDetailProperty.confirm-property-type-change": "Confirm property type change",
   "CardDetailProperty.delete-action-button": "Delete",
-  "CardDetailProperty.property-change-action-button": "Change Property",
+  "CardDetailProperty.property-change-action-button": "Change property",
   "CardDetailProperty.property-changed": "Changed property successfully!",
-  "CardDetailProperty.property-deleted": "Deleted {propertyName} Successfully!",
+  "CardDetailProperty.property-deleted": "Deleted {propertyName} successfully!",
   "CardDetailProperty.property-name-change-subtext": "type from \"{oldPropType}\" to \"{newPropType}\"",
   "CardDetailProperty.property-type-change-subtext": "name to \"{newPropName}\"",
   "CardDialog.copiedLink": "Copied!",
@@ -92,6 +94,7 @@
   "Categories.CreateCategoryDialog.UpdateText": "Update",
   "CenterPanel.Login": "Login",
   "CenterPanel.Share": "Share",
+  "CloudMessage.cloud-server": "Get your own free cloud server.",
   "ColorOption.selectColor": "Select {color} Color",
   "Comment.delete": "Delete",
   "CommentsList.send": "Send",
@@ -118,8 +121,9 @@
   "DeleteBoardDialog.confirm-cancel": "Cancel",
   "DeleteBoardDialog.confirm-delete": "Delete",
   "DeleteBoardDialog.confirm-info": "Are you sure you want to delete the board “{boardTitle}”? Deleting it will delete all cards in the board.",
-  "DeleteBoardDialog.confirm-tite": "Confirm Delete Board",
-  "DeleteBoardDialog.confirm-tite-template": "Confirm Delete Board Template",
+  "DeleteBoardDialog.confirm-info-template": "Are you sure you want to delete the board template “{boardTitle}”?",
+  "DeleteBoardDialog.confirm-tite": "Confirm delete board",
+  "DeleteBoardDialog.confirm-tite-template": "Confirm delete board template",
   "Dialog.closeDialog": "Close dialog",
   "EditableDayPicker.today": "Today",
   "Error.mobileweb": "Mobile web support is currently in early beta. Not all functionality may be present.",
@@ -157,7 +161,7 @@
   "OnboardingTour.AddProperties.Title": "Add properties",
   "OnboardingTour.AddView.Body": "Go here to create a new view to organise your board using different layouts.",
   "OnboardingTour.AddView.Title": "Add a new view",
-  "OnboardingTour.CopyLink.Body": "You can share your cards with teammates by copying the link and pasting it in a channel, Direct Message, or Group Message.",
+  "OnboardingTour.CopyLink.Body": "You can share your cards with teammates by copying the link and pasting it in a channel, direct message, or group message.",
   "OnboardingTour.CopyLink.Title": "Copy link",
   "OnboardingTour.OpenACard.Body": "Open a card to explore the powerful ways that Boards can help you organize your work.",
   "OnboardingTour.OpenACard.Title": "Open a card",
@@ -172,8 +176,8 @@
   "PropertyType.CreatedTime": "Created time",
   "PropertyType.Date": "Date",
   "PropertyType.Email": "Email",
-  "PropertyType.File": "File or Media",
-  "PropertyType.MultiSelect": "Multi Select",
+  "PropertyType.File": "File or media",
+  "PropertyType.MultiSelect": "Multi select",
   "PropertyType.Number": "Number",
   "PropertyType.Person": "Person",
   "PropertyType.Phone": "Phone",
@@ -189,10 +193,10 @@
   "RegistrationLink.description": "Share this link for others to create accounts:",
   "RegistrationLink.regenerateToken": "Regenerate token",
   "RegistrationLink.tokenRegenerated": "Registration link regenerated",
-  "ShareBoard.PublishDescription": "Publish and share a “read only” link with everyone on the web",
+  "ShareBoard.PublishDescription": "Publish and share a read-only link with everyone on the web.",
   "ShareBoard.PublishTitle": "Publish to the web",
   "ShareBoard.ShareInternal": "Share internally",
-  "ShareBoard.ShareInternalDescription": "Users who have permissions will be able to use this link",
+  "ShareBoard.ShareInternalDescription": "Users who have permissions will be able to use this link.",
   "ShareBoard.Title": "Share Board",
   "ShareBoard.confirmRegenerateToken": "This will invalidate previously shared links. Continue?",
   "ShareBoard.copiedLink": "Copied!",
@@ -238,9 +242,9 @@
   "TableHeaderMenu.insert-right": "Insert right",
   "TableHeaderMenu.sort-ascending": "Sort ascending",
   "TableHeaderMenu.sort-descending": "Sort descending",
-  "TableRow.open": "Open",
   "TableRow.delete": "Delete",
-  "TopBar.give-feedback": "Give Feedback",
+  "TableRow.open": "Open",
+  "TopBar.give-feedback": "Give feedback",
   "URLProperty.copiedLink": "Copied!",
   "URLProperty.copy": "Copy",
   "URLProperty.edit": "Edit",
@@ -271,7 +275,6 @@
   "ViewHeader.new": "New",
   "ViewHeader.properties": "Properties",
   "ViewHeader.properties-menu": "Properties menu",
-  "ViewHeader.search": "Search",
   "ViewHeader.search-text": "Search cards",
   "ViewHeader.select-a-template": "Select a template",
   "ViewHeader.set-default-template": "Set as default",
@@ -284,8 +287,8 @@
   "ViewTitle.random-icon": "Random",
   "ViewTitle.remove-icon": "Remove icon",
   "ViewTitle.show-description": "show description",
-  "ViewTitle.untitled-board": "Untitled Board",
-  "WelcomePage.Description": "Boards is a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view",
+  "ViewTitle.untitled-board": "Untitled board",
+  "WelcomePage.Description": "Boards is a project management tool that helps define, organize, track, and manage work across teams using a familiar Kanban board view.",
   "WelcomePage.Explore.Button": "Take a tour",
   "WelcomePage.Heading": "Welcome To Boards",
   "WelcomePage.NoThanks.Text": "No thanks, I'll figure it out myself",
@@ -293,8 +296,9 @@
   "calendar.month": "Month",
   "calendar.today": "TODAY",
   "calendar.week": "Week",
+  "cloudMessage.learn-more": "Learn more",
   "createImageBlock.failed": "Unable to upload the file. File size limit reached.",
-  "default-properties.badges": "Comments and Description",
+  "default-properties.badges": "Comments and description",
   "default-properties.title": "Title",
   "error.page.title": "Sorry, something went wrong",
   "generic.previous": "Previous",
@@ -312,4 +316,4 @@
   "tutorial_tip.ok": "Next",
   "tutorial_tip.out": "Opt out of these tips.",
   "tutorial_tip.seen": "Seen this before?"
-}
+}
\ No newline at end of file
diff --git a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
index bec269297..daf2b9143 100644
--- a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`components/centerPanel return centerPanel and click on card to show car
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -594,7 +594,7 @@ exports[`components/centerPanel return centerPanel and press touch 1 with readon
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -1130,7 +1130,7 @@ exports[`components/centerPanel return centerPanel and press touch ctrl+d for on
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -1837,7 +1837,7 @@ exports[`components/centerPanel return centerPanel and press touch del for one c
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -2544,7 +2544,7 @@ exports[`components/centerPanel return centerPanel and press touch esc for one c
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -3251,7 +3251,7 @@ exports[`components/centerPanel return centerPanel and press touch esc for one c
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -3958,7 +3958,7 @@ exports[`components/centerPanel return centerPanel and press touch esc for two c
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -4665,7 +4665,7 @@ exports[`components/centerPanel return centerPanel and press touch esc for two c
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -5372,7 +5372,7 @@ exports[`components/centerPanel return centerPanel and press touch esc for two c
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -6079,7 +6079,7 @@ exports[`components/centerPanel return centerPanel and select one card and click
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -6786,7 +6786,7 @@ exports[`components/centerPanel return centerPanel and select one card and click
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -7493,7 +7493,7 @@ exports[`components/centerPanel should match snapshot for Gallery 1`] = `
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -7807,7 +7807,7 @@ exports[`components/centerPanel should match snapshot for Kanban 1`] = `
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -8351,7 +8351,7 @@ exports[`components/centerPanel should match snapshot for Kanban, not shared 1`]
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -8848,7 +8848,7 @@ exports[`components/centerPanel should match snapshot for Table 1`] = `
           rel="noreferrer"
           target="_blank"
         >
-          Give Feedback
+          Give feedback
         </a>
         <a
           href="https://www.focalboard.com/guide/user?utm_source=webapp"
diff --git a/webapp/src/components/__snapshots__/topBar.test.tsx.snap b/webapp/src/components/__snapshots__/topBar.test.tsx.snap
index 8e7917416..5dc5f04a8 100644
--- a/webapp/src/components/__snapshots__/topBar.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/topBar.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`src/components/topBar should match snapshot for focalboardPlugin 1`] =
       rel="noreferrer"
       target="_blank"
     >
-      Give Feedback
+      Give feedback
     </a>
     <div
       class="versionFrame"
@@ -38,7 +38,7 @@ exports[`src/components/topBar should match snapshot for none focalboardPlugin 1
       rel="noreferrer"
       target="_blank"
     >
-      Give Feedback
+      Give feedback
     </a>
     <a
       href="https://www.focalboard.com/guide/user?utm_source=webapp"
diff --git a/webapp/src/components/__snapshots__/workspace.test.tsx.snap b/webapp/src/components/__snapshots__/workspace.test.tsx.snap
index 2a5d6f2d9..4d5522d73 100644
--- a/webapp/src/components/__snapshots__/workspace.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/workspace.test.tsx.snap
@@ -284,7 +284,7 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
               rel="noreferrer"
               target="_blank"
             >
-              Give Feedback
+              Give feedback
             </a>
             <a
               href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -869,7 +869,7 @@ exports[`src/components/workspace return workspace readonly and showcard 1`] = `
               rel="noreferrer"
               target="_blank"
             >
-              Give Feedback
+              Give feedback
             </a>
             <a
               href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -1511,7 +1511,7 @@ exports[`src/components/workspace should match snapshot 1`] = `
               rel="noreferrer"
               target="_blank"
             >
-              Give Feedback
+              Give feedback
             </a>
             <a
               href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -2096,7 +2096,7 @@ exports[`src/components/workspace should match snapshot with readonly 1`] = `
               rel="noreferrer"
               target="_blank"
             >
-              Give Feedback
+              Give feedback
             </a>
             <a
               href="https://www.focalboard.com/guide/user?utm_source=webapp"
@@ -2583,7 +2583,7 @@ exports[`src/components/workspace show copy link tooltip 1`] = `
         <div
           class="tutorial-tour-tip__body"
         >
-          You can share your cards with teammates by copying the link and pasting it in a channel, Direct Message, or Group Message.
+          You can share your cards with teammates by copying the link and pasting it in a channel, direct message, or group message.
         </div>
         <div
           class="tutorial-tour-tip__footer"
diff --git a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap
index 4d03013ab..aba0e268c 100644
--- a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap
+++ b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap
@@ -24,7 +24,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector a focalboard Plu
       <h1
         class="title"
       >
-        Create a Board
+        Create a board
       </h1>
       <p
         class="description"
@@ -346,7 +346,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector a focalboard Plu
       <h1
         class="title"
       >
-        Create a Board
+        Create a board
       </h1>
       <p
         class="description"
@@ -517,7 +517,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector not a focalboard
       <h1
         class="title"
       >
-        Create a Board
+        Create a board
       </h1>
       <p
         class="description"
diff --git a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorItem.test.tsx.snap b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorItem.test.tsx.snap
index 9d03f95c3..c5e05d5a5 100644
--- a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorItem.test.tsx.snap
+++ b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorItem.test.tsx.snap
@@ -177,7 +177,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelectorItem should trigg
             <h2
               class="header text-heading5"
             >
-              Confirm Delete Board Template
+              Confirm delete board template
             </h2>
             <p
               class="body"
diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx
index 7fbd04bb5..8231035bb 100644
--- a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx
+++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx
@@ -64,7 +64,7 @@ const BoardTemplateSelector = (props: Props) => {
         TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.DeleteBoardTemplate, {board: template.id})
         mutator.deleteBoard(
             template,
-            intl.formatMessage({id: 'BoardTemplateSelector.delete-template', defaultMessage: 'Delete template'}),
+            intl.formatMessage({id: 'BoardTemplateSelector.delete-template', defaultMessage: 'Delete'}),
             async () => {},
             async () => {
                 showBoard(template.id)
@@ -132,7 +132,7 @@ const BoardTemplateSelector = (props: Props) => {
                     {title || (
                         <FormattedMessage
                             id='BoardTemplateSelector.title'
-                            defaultMessage='Create a Board'
+                            defaultMessage='Create a board'
                         />
                     )}
                 </h1>
diff --git a/webapp/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx b/webapp/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx
index 419eeba17..a40715309 100644
--- a/webapp/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx
+++ b/webapp/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx
@@ -56,7 +56,7 @@ const BoardSwitcherDialog = (props: Props): JSX.Element => {
         }
 
         const items = await octoClient.search(team.id, query)
-        const untitledBoardTitle = intl.formatMessage({id: 'ViewTitle.untitled-board', defaultMessage: 'Untitled Board'})
+        const untitledBoardTitle = intl.formatMessage({id: 'ViewTitle.untitled-board', defaultMessage: 'Untitled board'})
         return items.map((item) => {
             const resultTitle = item.title || untitledBoardTitle
             const teamTitle = teamsById[item.teamId].title
diff --git a/webapp/src/components/calculations/options.tsx b/webapp/src/components/calculations/options.tsx
index 18a439f63..063d0b1f2 100644
--- a/webapp/src/components/calculations/options.tsx
+++ b/webapp/src/components/calculations/options.tsx
@@ -46,12 +46,12 @@ export const optionLabelString = (option: Option, intl: IntlShape): string => {
     switch (option.value) {
     case 'none': return intl.formatMessage({id: 'Calculations.Options.none.label', defaultMessage: 'None'})
     case 'count': return intl.formatMessage({id: 'Calculations.Options.count.label', defaultMessage: 'Count'})
-    case 'countValue': return intl.formatMessage({id: 'Calculations.Options.countValue.label', defaultMessage: 'Count Value'})
-    case 'countChecked': return intl.formatMessage({id: 'Calculations.Options.countChecked.label', defaultMessage: 'Count Checked'})
-    case 'percentChecked': return intl.formatMessage({id: 'Calculations.Options.percentChecked.label', defaultMessage: 'Percent Checked'})
-    case 'percentUnchecked': return intl.formatMessage({id: 'Calculations.Options.percentUnchecked.label', defaultMessage: 'Percent Unchecked'})
-    case 'countUnchecked': return intl.formatMessage({id: 'Calculations.Options.countUnchecked.label', defaultMessage: 'Count Unchecked'})
-    case 'countUniqueValue': return intl.formatMessage({id: 'Calculations.Options.countUniqueValue.label', defaultMessage: 'Count Unique Values'})
+    case 'countValue': return intl.formatMessage({id: 'Calculations.Options.countValue.label', defaultMessage: 'Count value'})
+    case 'countChecked': return intl.formatMessage({id: 'Calculations.Options.countChecked.label', defaultMessage: 'Count checked'})
+    case 'percentChecked': return intl.formatMessage({id: 'Calculations.Options.percentChecked.label', defaultMessage: 'Percent checked'})
+    case 'percentUnchecked': return intl.formatMessage({id: 'Calculations.Options.percentUnchecked.label', defaultMessage: 'Percent unchecked'})
+    case 'countUnchecked': return intl.formatMessage({id: 'Calculations.Options.countUnchecked.label', defaultMessage: 'Count unchecked'})
+    case 'countUniqueValue': return intl.formatMessage({id: 'Calculations.Options.countUniqueValue.label', defaultMessage: 'Count unique values'})
     case 'sum': return intl.formatMessage({id: 'Calculations.Options.sum.label', defaultMessage: 'Sum'})
     case 'average': return intl.formatMessage({id: 'Calculations.Options.average.label', defaultMessage: 'Average'})
     case 'median': return intl.formatMessage({id: 'Calculations.Options.median.label', defaultMessage: 'Median'})
diff --git a/webapp/src/components/cardDetail/__snapshots__/cardDetailProperties.test.tsx.snap b/webapp/src/components/cardDetail/__snapshots__/cardDetailProperties.test.tsx.snap
index 8f2097f7f..5558cebc9 100644
--- a/webapp/src/components/cardDetail/__snapshots__/cardDetailProperties.test.tsx.snap
+++ b/webapp/src/components/cardDetail/__snapshots__/cardDetailProperties.test.tsx.snap
@@ -527,7 +527,7 @@ exports[`components/cardDetail/CardDetailProperties should show property types m
                   />
                 </div>
                 <div
-                  aria-label="Multi Select"
+                  aria-label="Multi select"
                   class="MenuOption TextOption menu-option"
                   role="button"
                 >
@@ -541,7 +541,7 @@ exports[`components/cardDetail/CardDetailProperties should show property types m
                   <div
                     class="menu-name"
                   >
-                    Multi Select
+                    Multi select
                   </div>
                   <div
                     class="noicon"
diff --git a/webapp/src/components/cardDetail/cardDetailContents.tsx b/webapp/src/components/cardDetail/cardDetailContents.tsx
index cb90cd6f1..672741cdb 100644
--- a/webapp/src/components/cardDetail/cardDetailContents.tsx
+++ b/webapp/src/components/cardDetail/cardDetailContents.tsx
@@ -77,7 +77,7 @@ function moveBlock(card: Card, srcBlock: IContentBlockWithCords, dstBlock: ICont
     const newContentOrder = dragAndDropRearrange({contentOrder, srcBlockId, srcBlockX, srcBlockY, dstBlockId, dstBlockX, dstBlockY, moveTo})
 
     mutator.performAsUndoGroup(async () => {
-        const description = intl.formatMessage({id: 'CardDetail.moveContent', defaultMessage: 'move card content'})
+        const description = intl.formatMessage({id: 'CardDetail.moveContent', defaultMessage: 'Move card content'})
         await mutator.changeCardContentOrder(card.boardId, card.id, card.fields.contentOrder, newContentOrder, description)
     })
 }
diff --git a/webapp/src/components/cardDetail/cardDetailProperties.test.tsx b/webapp/src/components/cardDetail/cardDetailProperties.test.tsx
index d32c9e7af..f89d0faa3 100644
--- a/webapp/src/components/cardDetail/cardDetailProperties.test.tsx
+++ b/webapp/src/components/cardDetail/cardDetailProperties.test.tsx
@@ -144,7 +144,7 @@ describe('components/cardDetail/CardDetailProperties', () => {
         const deleteButton = screen.getByRole('button', {name: /delete/i})
         userEvent.click(deleteButton)
 
-        expect(screen.getByRole('heading', {name: 'Confirm Delete Property'})).toBeInTheDocument()
+        expect(screen.getByRole('heading', {name: 'Confirm delete property'})).toBeInTheDocument()
         expect(screen.getByRole('button', {name: /delete/i})).toBeInTheDocument()
     })
 
@@ -173,7 +173,7 @@ describe('components/cardDetail/CardDetailProperties', () => {
 
         const propertyTemplate = board.cardProperties[0]
 
-        const confirmButton = result.getByTitle('Change Property')
+        const confirmButton = result.getByTitle('Change property')
         expect(confirmButton).toBeDefined()
 
         userEvent.click(confirmButton!)
diff --git a/webapp/src/components/cardDetail/cardDetailProperties.tsx b/webapp/src/components/cardDetail/cardDetailProperties.tsx
index 1f6c9c2ee..b0740d67e 100644
--- a/webapp/src/components/cardDetail/cardDetailProperties.tsx
+++ b/webapp/src/components/cardDetail/cardDetailProperties.tsx
@@ -77,7 +77,7 @@ const CardDetailProperties = (props: Props) => {
         }
 
         setConfirmationDialogBox({
-            heading: intl.formatMessage({id: 'CardDetailProperty.confirm-property-type-change', defaultMessage: 'Confirm Property Type Change!'}),
+            heading: intl.formatMessage({id: 'CardDetailProperty.confirm-property-type-change', defaultMessage: 'Confirm property type change'}),
             subText: intl.formatMessage({
                 id: 'CardDetailProperty.confirm-property-name-change-subtext',
                 defaultMessage: 'Are you sure you want to change property "{propertyName}" {customText}? This will affect value(s) across {numOfCards} card(s) in this board, and can result in data loss.',
@@ -88,7 +88,7 @@ const CardDetailProperties = (props: Props) => {
                 numOfCards: affectsNumOfCards,
             }),
 
-            confirmButtonText: intl.formatMessage({id: 'CardDetailProperty.property-change-action-button', defaultMessage: 'Change Property'}),
+            confirmButtonText: intl.formatMessage({id: 'CardDetailProperty.property-change-action-button', defaultMessage: 'Change property'}),
             onConfirm: async () => {
                 setShowConfirmationDialog(false)
                 try {
@@ -108,7 +108,7 @@ const CardDetailProperties = (props: Props) => {
     function onPropertyDeleteSetAndOpenConfirmationDialog(propertyTemplate:IPropertyTemplate) {
         // set ConfirmationDialogBox Props
         setConfirmationDialogBox({
-            heading: intl.formatMessage({id: 'CardDetailProperty.confirm-delete-heading', defaultMessage: 'Confirm Delete Property'}),
+            heading: intl.formatMessage({id: 'CardDetailProperty.confirm-delete-heading', defaultMessage: 'Confirm delete property'}),
             subText: intl.formatMessage({
                 id: 'CardDetailProperty.confirm-delete-subtext',
                 defaultMessage: 'Are you sure you want to delete the property "{propertyName}"? Deleting it will delete the property from all cards in this board.',
@@ -120,7 +120,7 @@ const CardDetailProperties = (props: Props) => {
                 setShowConfirmationDialog(false)
                 try {
                     await mutator.deleteProperty(board, views, cards, propertyTemplate.id)
-                    sendFlashMessage({content: intl.formatMessage({id: 'CardDetailProperty.property-deleted', defaultMessage: 'Deleted {propertyName} Successfully!'}, {propertyName: deletingPropName}), severity: 'high'})
+                    sendFlashMessage({content: intl.formatMessage({id: 'CardDetailProperty.property-deleted', defaultMessage: 'Deleted {propertyName} successfully!'}, {propertyName: deletingPropName}), severity: 'high'})
                 } catch (err:any) {
                     Utils.logError(`Error Deleting Property!: Could Not delete Property -" + ${deletingPropName} ${err?.toString()}`)
                 }
diff --git a/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap b/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap
index ab3d2841f..edece51f5 100644
--- a/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`components/onboardingTour/addComments/CopyLinkTourStep after hover 1`]
         <div
           class="tutorial-tour-tip__body"
         >
-          You can share your cards with teammates by copying the link and pasting it in a channel, Direct Message, or Group Message.
+          You can share your cards with teammates by copying the link and pasting it in a channel, direct message, or group message.
         </div>
         <div
           class="tutorial-tour-tip__image"
diff --git a/webapp/src/components/onboardingTour/copyLink/copy_link.tsx b/webapp/src/components/onboardingTour/copyLink/copy_link.tsx
index 51d9ce95c..8655f28a4 100644
--- a/webapp/src/components/onboardingTour/copyLink/copy_link.tsx
+++ b/webapp/src/components/onboardingTour/copyLink/copy_link.tsx
@@ -24,7 +24,7 @@ const CopyLinkTourStep = (): JSX.Element | null => {
     const screen = (
         <FormattedMessage
             id='OnboardingTour.CopyLink.Body'
-            defaultMessage='You can share your cards with teammates by copying the link and pasting it in a channel, Direct Message, or Group Message.'
+            defaultMessage='You can share your cards with teammates by copying the link and pasting it in a channel, direct message, or group message.'
         />
     )
 
diff --git a/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap b/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
index a24fad834..0d3122b8b 100644
--- a/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
+++ b/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
@@ -185,7 +185,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Copy l
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -409,7 +409,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Copy l
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -633,7 +633,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Regene
                 <div
                   class="text-light"
                 >
-                  Publish and share a “read only” link with everyone on the web
+                  Publish and share a read-only link with everyone on the web.
                 </div>
               </div>
               <div>
@@ -854,7 +854,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -1176,7 +1176,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -1374,7 +1374,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -1696,7 +1696,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -1920,7 +1920,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard, and click switc
                 <div
                   class="text-light"
                 >
-                  Publish and share a “read only” link with everyone on the web
+                  Publish and share a read-only link with everyone on the web.
                 </div>
               </div>
               <div>
@@ -2167,7 +2167,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoardComponent and cli
                 <div
                   class="text-light"
                 >
-                  Publish and share a “read only” link with everyone on the web
+                  Publish and share a read-only link with everyone on the web.
                 </div>
               </div>
               <div>
@@ -2414,7 +2414,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot 1`] = `
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -2638,7 +2638,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -2862,7 +2862,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
@@ -3086,7 +3086,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
                 <div
                   class="text-light"
                 >
-                  Users who have permissions will be able to use this link
+                  Users who have permissions will be able to use this link.
                 </div>
               </div>
             </div>
diff --git a/webapp/src/components/shareBoard/shareBoard.tsx b/webapp/src/components/shareBoard/shareBoard.tsx
index 81d98c246..f01cfbbe7 100644
--- a/webapp/src/components/shareBoard/shareBoard.tsx
+++ b/webapp/src/components/shareBoard/shareBoard.tsx
@@ -366,7 +366,7 @@ export default function ShareBoardDialog(props: Props): JSX.Element {
                         <div className='d-flex justify-content-between'>
                             <div className='d-flex flex-column'>
                                 <div className='text-heading2'>{intl.formatMessage({id: 'ShareBoard.PublishTitle', defaultMessage: 'Publish to the web'})}</div>
-                                <div className='text-light'>{intl.formatMessage({id: 'ShareBoard.PublishDescription', defaultMessage: 'Publish and share a “read only” link with everyone on the web'})}</div>
+                                <div className='text-light'>{intl.formatMessage({id: 'ShareBoard.PublishDescription', defaultMessage: 'Publish and share a read-only link with everyone on the web.'})}</div>
                             </div>
                             <div>
                                 <Switch
@@ -443,7 +443,7 @@ export default function ShareBoardDialog(props: Props): JSX.Element {
                         <div className='d-flex justify-content-between'>
                             <div className='d-flex flex-column'>
                                 <div className='text-heading2'>{intl.formatMessage({id: 'ShareBoard.ShareInternal', defaultMessage: 'Share internally'})}</div>
-                                <div className='text-light'>{intl.formatMessage({id: 'ShareBoard.ShareInternalDescription', defaultMessage: 'Users who have permissions will be able to use this link'})}</div>
+                                <div className='text-light'>{intl.formatMessage({id: 'ShareBoard.ShareInternalDescription', defaultMessage: 'Users who have permissions will be able to use this link.'})}</div>
                             </div>
                         </div>
                     </div>
diff --git a/webapp/src/components/sidebar/deleteBoardDialog.tsx b/webapp/src/components/sidebar/deleteBoardDialog.tsx
index 25e932de9..f33cf9582 100644
--- a/webapp/src/components/sidebar/deleteBoardDialog.tsx
+++ b/webapp/src/components/sidebar/deleteBoardDialog.tsx
@@ -33,18 +33,18 @@ export default function DeleteBoardDialog(props: Props): JSX.Element {
                         {props.isTemplate &&
                             <FormattedMessage
                                 id='DeleteBoardDialog.confirm-tite-template'
-                                defaultMessage='Confirm Delete Board Template'
+                                defaultMessage='Confirm delete board template'
                             />}
                         {!props.isTemplate &&
                             <FormattedMessage
                                 id='DeleteBoardDialog.confirm-tite'
-                                defaultMessage='Confirm Delete Board'
+                                defaultMessage='Confirm delete board'
                             />}
                     </h2>
                     <p className='body'>
                         {props.isTemplate &&
                             <FormattedMessage
-                                id='DeleteBoardDialog.confirm-info'
+                                id='DeleteBoardDialog.confirm-info-template'
                                 defaultMessage='Are you sure you want to delete the board template “{boardTitle}”?'
                                 values={{
                                     boardTitle: props.boardTitle,
diff --git a/webapp/src/components/sidebar/sidebarBoardItem.tsx b/webapp/src/components/sidebar/sidebarBoardItem.tsx
index c7df88084..07826311d 100644
--- a/webapp/src/components/sidebar/sidebarBoardItem.tsx
+++ b/webapp/src/components/sidebar/sidebarBoardItem.tsx
@@ -145,7 +145,7 @@ const SidebarBoardItem = (props: Props) => {
                             <Menu.Text
                                 key={`deleteBlock-${board.id}`}
                                 id='deleteBlock'
-                                name={intl.formatMessage({id: 'Sidebar.delete-board', defaultMessage: 'Delete Board'})}
+                                name={intl.formatMessage({id: 'Sidebar.delete-board', defaultMessage: 'Delete board'})}
                                 icon={<DeleteIcon/>}
                                 onClick={() => {
                                     props.onDeleteRequest(board)
diff --git a/webapp/src/components/topBar.tsx b/webapp/src/components/topBar.tsx
index 22d4b1ce2..ad6f5358b 100644
--- a/webapp/src/components/topBar.tsx
+++ b/webapp/src/components/topBar.tsx
@@ -25,7 +25,7 @@ const TopBar = (): JSX.Element => {
                 >
                     <FormattedMessage
                         id='TopBar.give-feedback'
-                        defaultMessage='Give Feedback'
+                        defaultMessage='Give feedback'
                     />
                 </a>
                 <div className='versionFrame'>
@@ -53,7 +53,7 @@ const TopBar = (): JSX.Element => {
             >
                 <FormattedMessage
                     id='TopBar.give-feedback'
-                    defaultMessage='Give Feedback'
+                    defaultMessage='Give feedback'
                 />
             </a>
             <a
diff --git a/webapp/src/components/viewHeader/__snapshots__/viewHeaderPropertiesMenu.test.tsx.snap b/webapp/src/components/viewHeader/__snapshots__/viewHeaderPropertiesMenu.test.tsx.snap
index 0d81b8013..ee4db06f3 100644
--- a/webapp/src/components/viewHeader/__snapshots__/viewHeaderPropertiesMenu.test.tsx.snap
+++ b/webapp/src/components/viewHeader/__snapshots__/viewHeaderPropertiesMenu.test.tsx.snap
@@ -119,7 +119,7 @@ exports[`components/viewHeader/viewHeaderPropertiesMenu return properties menu 1
           </div>
           <div>
             <div
-              aria-label="Comments and Description"
+              aria-label="Comments and description"
               class="MenuOption SwitchOption menu-option"
               role="button"
             >
@@ -129,7 +129,7 @@ exports[`components/viewHeader/viewHeaderPropertiesMenu return properties menu 1
               <div
                 class="menu-name"
               >
-                Comments and Description
+                Comments and description
               </div>
               <div
                 class="Switch override-main size--small"
@@ -316,7 +316,7 @@ exports[`components/viewHeader/viewHeaderPropertiesMenu return properties menu w
           </div>
           <div>
             <div
-              aria-label="Comments and Description"
+              aria-label="Comments and description"
               class="MenuOption SwitchOption menu-option"
               role="button"
             >
@@ -326,7 +326,7 @@ exports[`components/viewHeader/viewHeaderPropertiesMenu return properties menu w
               <div
                 class="menu-name"
               >
-                Comments and Description
+                Comments and description
               </div>
               <div
                 class="Switch override-main size--small"
diff --git a/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.test.tsx b/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.test.tsx
index b38138c6a..a6d6c1bc4 100644
--- a/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.test.tsx
+++ b/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.test.tsx
@@ -84,7 +84,7 @@ describe('components/viewHeader/viewHeaderPropertiesMenu', () => {
         )
         const menuButton = screen.getByRole('button', {name: 'Properties menu'})
         userEvent.click(menuButton)
-        const badgesButton = screen.getByRole('button', {name: 'Comments and Description'})
+        const badgesButton = screen.getByRole('button', {name: 'Comments and description'})
         userEvent.click(badgesButton)
         expect(mockedMutator.changeViewVisibleProperties).toHaveBeenCalledWith(
             activeView.boardId,
diff --git a/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx b/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx
index 03a71b6c1..3e9ad363a 100644
--- a/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx
+++ b/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx
@@ -61,7 +61,7 @@ const ViewHeaderPropertiesMenu = (props: Props) => {
                     <Menu.Switch
                         key={Constants.badgesColumnId}
                         id={Constants.badgesColumnId}
-                        name={intl.formatMessage({id: 'default-properties.badges', defaultMessage: 'Comments and Description'})}
+                        name={intl.formatMessage({id: 'default-properties.badges', defaultMessage: 'Comments and description'})}
                         isOn={visiblePropertyIds.includes(Constants.badgesColumnId)}
                         onClick={toggleVisibility}
                     />}
diff --git a/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap b/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap
index 10df69df5..2dfc52f90 100644
--- a/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap
+++ b/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`pages/welcome Welcome Page shows Explore Page 1`] = `
       <div
         class="WelcomePage__subtitle"
       >
-        Boards is a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view
+        Boards is a project management tool that helps define, organize, track, and manage work across teams using a familiar Kanban board view.
       </div>
       <img
         alt="Boards Welcome Image"
@@ -65,7 +65,7 @@ exports[`pages/welcome Welcome Page shows Explore Page with subpath 1`] = `
       <div
         class="WelcomePage__subtitle"
       >
-        Boards is a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view
+        Boards is a project management tool that helps define, organize, track, and manage work across teams using a familiar Kanban board view.
       </div>
       <img
         alt="Boards Welcome Image"
diff --git a/webapp/src/pages/welcome/welcomePage.tsx b/webapp/src/pages/welcome/welcomePage.tsx
index bf758e317..8cc71336f 100644
--- a/webapp/src/pages/welcome/welcomePage.tsx
+++ b/webapp/src/pages/welcome/welcomePage.tsx
@@ -110,7 +110,7 @@ const WelcomePage = () => {
                 <div className='WelcomePage__subtitle'>
                     <FormattedMessage
                         id='WelcomePage.Description'
-                        defaultMessage='Boards is a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view'
+                        defaultMessage='Boards is a project management tool that helps define, organize, track, and manage work across teams using a familiar Kanban board view.'
                     />
                 </div>
 
diff --git a/webapp/src/widgets/__snapshots__/propertyMenu.test.tsx.snap b/webapp/src/widgets/__snapshots__/propertyMenu.test.tsx.snap
index 290b03d87..61dc06096 100644
--- a/webapp/src/widgets/__snapshots__/propertyMenu.test.tsx.snap
+++ b/webapp/src/widgets/__snapshots__/propertyMenu.test.tsx.snap
@@ -198,7 +198,7 @@ exports[`widgets/PropertyMenu should match snapshot 1`] = `
                     />
                   </div>
                   <div
-                    aria-label="Multi Select"
+                    aria-label="Multi select"
                     class="MenuOption TextOption menu-option"
                     role="button"
                   >
@@ -212,7 +212,7 @@ exports[`widgets/PropertyMenu should match snapshot 1`] = `
                     <div
                       class="menu-name"
                     >
-                      Multi Select
+                      Multi select
                     </div>
                     <div
                       class="noicon"
diff --git a/webapp/src/widgets/propertyMenu.tsx b/webapp/src/widgets/propertyMenu.tsx
index 1ed98c31d..dca3adcc1 100644
--- a/webapp/src/widgets/propertyMenu.tsx
+++ b/webapp/src/widgets/propertyMenu.tsx
@@ -21,9 +21,9 @@ export function typeDisplayName(intl: IntlShape, type: PropertyType): string {
     case 'text': return intl.formatMessage({id: 'PropertyType.Text', defaultMessage: 'Text'})
     case 'number': return intl.formatMessage({id: 'PropertyType.Number', defaultMessage: 'Number'})
     case 'select': return intl.formatMessage({id: 'PropertyType.Select', defaultMessage: 'Select'})
-    case 'multiSelect': return intl.formatMessage({id: 'PropertyType.MultiSelect', defaultMessage: 'Multi Select'})
+    case 'multiSelect': return intl.formatMessage({id: 'PropertyType.MultiSelect', defaultMessage: 'Multi select'})
     case 'person': return intl.formatMessage({id: 'PropertyType.Person', defaultMessage: 'Person'})
-    case 'file': return intl.formatMessage({id: 'PropertyType.File', defaultMessage: 'File or Media'})
+    case 'file': return intl.formatMessage({id: 'PropertyType.File', defaultMessage: 'File or media'})
     case 'checkbox': return intl.formatMessage({id: 'PropertyType.Checkbox', defaultMessage: 'Checkbox'})
     case 'url': return intl.formatMessage({id: 'PropertyType.URL', defaultMessage: 'URL'})
     case 'email': return intl.formatMessage({id: 'PropertyType.Email', defaultMessage: 'Email'})