From 1399b49c165aeb06500ebeab3d3fa6bc8fdb8f4c Mon Sep 17 00:00:00 2001
From: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Date: Wed, 31 Mar 2021 16:07:37 -0700
Subject: [PATCH] UI text edits (#32524)

* Update TeamSettings.tsx

* Update navModel.ts

* Update ChangePasswordForm.tsx

* Update UserProfileEditForm.tsx

* Update DashboardImportPage.tsx

* Update uploadDashboardDirective.ts

* Update ImportDashboardForm.tsx

* Update ImportDashboardOverview.tsx

* Update validation.ts

* Update PlaylistEditPage.tsx

* ui text edits

* text edits

* Update buildCategories.ts

* text edits

* text edits

* Fix formatting

* Update test snapshots

Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
---
 .../datasources/DataSourcesListPage.tsx       |  2 +-
 .../datasources/NewDataSourcePage.tsx         |  4 ++--
 .../datasources/settings/BasicSettings.tsx    |  2 +-
 .../datasources/settings/ButtonRow.tsx        |  2 +-
 .../datasources/settings/CloudInfoBox.tsx     |  2 +-
 .../settings/DataSourceSettingsPage.tsx       |  6 ++---
 .../datasources/settings/PluginSettings.tsx   |  2 +-
 .../__snapshots__/BasicSettings.test.tsx.snap |  2 +-
 .../__snapshots__/ButtonRow.test.tsx.snap     |  2 +-
 .../DataSourceSettingsPage.test.tsx.snap      |  2 +-
 .../app/features/datasources/state/actions.ts |  2 +-
 .../datasources/state/buildCategories.ts      | 22 +++++++++----------
 .../datasources/utils/passwordHandlers.ts     |  2 +-
 .../features/folders/FolderSettingsPage.tsx   |  2 +-
 .../FolderSettingsPage.test.tsx.snap          |  4 ++--
 public/app/features/folders/state/navModel.ts |  2 +-
 .../manage-dashboards/DashboardImportPage.tsx |  6 ++---
 .../components/ImportDashboardForm.tsx        |  6 ++---
 .../components/ImportDashboardOverview.tsx    |  2 +-
 .../uploadDashboardDirective.ts               |  4 ++--
 .../manage-dashboards/utils/validation.ts     |  4 ++--
 .../features/playlist/PlaylistEditPage.tsx    |  4 ++--
 .../app/features/playlist/PlaylistNewPage.tsx |  2 +-
 .../features/playlist/PlaylistTableRows.tsx   |  2 +-
 .../features/profile/ChangePasswordForm.tsx   |  4 ++--
 .../features/profile/UserProfileEditForm.tsx  |  4 ++--
 .../query/components/QueryGroupOptions.tsx    |  2 +-
 .../features/query/state/PanelQueryRunner.ts  |  4 ++--
 public/app/features/teams/TeamSettings.tsx    |  4 ++--
 .../__snapshots__/TeamSettings.test.tsx.snap  |  2 +-
 public/app/features/teams/state/navModel.ts   |  2 +-
 31 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx
index 4784bdfda40..386a9b5621d 100644
--- a/public/app/features/datasources/DataSourcesListPage.tsx
+++ b/public/app/features/datasources/DataSourcesListPage.tsx
@@ -37,7 +37,7 @@ export interface Props {
 }
 
 const emptyListModel = {
-  title: 'There are no data sources defined yet',
+  title: 'No data sources defined',
   buttonIcon: 'database' as IconName,
   buttonLink: 'datasources/new',
   buttonTitle: 'Add data source',
diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx
index 051180e6906..0a2befcad12 100644
--- a/public/app/features/datasources/NewDataSourcePage.tsx
+++ b/public/app/features/datasources/NewDataSourcePage.tsx
@@ -103,8 +103,8 @@ class NewDataSourcePage extends PureComponent<Props> {
               <>
                 <br />
                 <p>
-                  Note that <strong>unsigned front-end datasource plugins</strong> are still usable, but this is subject
-                  to change in the upcoming releases of Grafana
+                  Note that unsigned front-end data source plugins are still usable, but this is subject to change in
+                  the upcoming releases of Grafana.
                 </p>
               </>
             </PluginsErrorsInfo>
diff --git a/public/app/features/datasources/settings/BasicSettings.tsx b/public/app/features/datasources/settings/BasicSettings.tsx
index 5816563ef70..1271672e6e6 100644
--- a/public/app/features/datasources/settings/BasicSettings.tsx
+++ b/public/app/features/datasources/settings/BasicSettings.tsx
@@ -18,7 +18,7 @@ const BasicSettings: FC<Props> = ({ dataSourceName, isDefault, onDefaultChange,
         <div className="gf-form max-width-30" style={{ marginRight: '3px' }}>
           <InlineFormLabel
             tooltip={
-              'The name is used when you select the data source in panels. The Default data source is ' +
+              'The name is used when you select the data source in panels. The default data source is ' +
               'preselected in new panels.'
             }
           >
diff --git a/public/app/features/datasources/settings/ButtonRow.tsx b/public/app/features/datasources/settings/ButtonRow.tsx
index 2a9a6dfcaf5..3fd78a42bf0 100644
--- a/public/app/features/datasources/settings/ButtonRow.tsx
+++ b/public/app/features/datasources/settings/ButtonRow.tsx
@@ -21,7 +21,7 @@ const ButtonRow: FC<Props> = ({ isReadOnly, onDelete, onSubmit, onTest }) => {
           onClick={(event) => onSubmit(event)}
           aria-label={selectors.pages.DataSource.saveAndTest}
         >
-          Save &amp; Test
+          Save &amp; test
         </button>
       )}
       {isReadOnly && (
diff --git a/public/app/features/datasources/settings/CloudInfoBox.tsx b/public/app/features/datasources/settings/CloudInfoBox.tsx
index 28ee4730f28..f9e92dd5b5f 100644
--- a/public/app/features/datasources/settings/CloudInfoBox.tsx
+++ b/public/app/features/datasources/settings/CloudInfoBox.tsx
@@ -56,7 +56,7 @@ export const CloudInfoBox: FC<Props> = ({ dataSource }) => {
             }}
           >
             <div className={styles.text}>
-              Or skip the effort and get {mainDS} (and {extraDS}) as fully managed, scalable and hosted data sources
+              Or skip the effort and get {mainDS} (and {extraDS}) as fully-managed, scalable, and hosted data sources
               from Grafana Labs with the{' '}
               <a
                 className="external-link"
diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
index b277e98e402..7fc561c7ec1 100644
--- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
+++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
@@ -128,8 +128,8 @@ export class DataSourceSettingsPage extends PureComponent<Props> {
   renderIsReadOnlyMessage() {
     return (
       <InfoBox severity="info">
-        This datasource was added by config and cannot be modified using the UI. Please contact your server admin to
-        update this datasource.
+        This data source was added by config and cannot be modified using the UI. Please contact your server admin to
+        update this data source.
       </InfoBox>
     );
   }
@@ -197,7 +197,7 @@ export class DataSourceSettingsPage extends PureComponent<Props> {
       }
     }
 
-    return <div>Page Not Found: {page}</div>;
+    return <div>Page not found: {page}</div>;
   }
 
   renderSettings() {
diff --git a/public/app/features/datasources/settings/PluginSettings.tsx b/public/app/features/datasources/settings/PluginSettings.tsx
index 9e4b84e22fe..b0f3375a040 100644
--- a/public/app/features/datasources/settings/PluginSettings.tsx
+++ b/public/app/features/datasources/settings/PluginSettings.tsx
@@ -46,7 +46,7 @@ export class PluginSettings extends PureComponent<Props> {
 
     if (!plugin.components.ConfigEditor) {
       // React editor is not specified, let's render angular editor
-      // How to apprach this better? Introduce ReactDataSourcePlugin interface and typeguard it here?
+      // How to approach this better? Introduce ReactDataSourcePlugin interface and typeguard it here?
       const loader = getAngularLoader();
       const template = '<plugin-component type="datasource-config-ctrl" />';
 
diff --git a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap
index e9ee2a6f705..a91abfb7c9f 100644
--- a/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/BasicSettings.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`Render should render component 1`] = `
       }
     >
       <FormLabel
-        tooltip="The name is used when you select the data source in panels. The Default data source is preselected in new panels."
+        tooltip="The name is used when you select the data source in panels. The default data source is preselected in new panels."
       >
         Name
       </FormLabel>
diff --git a/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
index 94823ff3dfc..97853450fca 100644
--- a/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
@@ -40,7 +40,7 @@ exports[`Render should render with buttons enabled 1`] = `
     onClick={[Function]}
     type="submit"
   >
-    Save & Test
+    Save & test
   </button>
   <button
     aria-label="Data source settings page Delete button"
diff --git a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
index 01fdf2dd1db..82db4395d93 100644
--- a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
@@ -302,7 +302,7 @@ exports[`Render should render is ready only message 1`] = `
         <InfoBox
           severity="info"
         >
-          This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
+          This data source was added by config and cannot be modified using the UI. Please contact your server admin to update this data source.
         </InfoBox>
         <CloudInfoBox
           dataSource={
diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index 85176d122f1..f08d6a1331d 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -98,7 +98,7 @@ export const testDataSource = (
         let message = '';
 
         if (err.statusText) {
-          message = 'HTTP Error ' + err.statusText;
+          message = 'HTTP error ' + err.statusText;
         } else {
           message = err.message;
         }
diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts
index 9f1b6e9bd37..3a26ec81ac8 100644
--- a/public/app/features/datasources/state/buildCategories.ts
+++ b/public/app/features/datasources/state/buildCategories.ts
@@ -99,60 +99,60 @@ function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] {
     getPhantomPlugin({
       id: 'grafana-splunk-datasource',
       name: 'Splunk',
-      description: 'Visualize & explore Splunk logs',
+      description: 'Visualize and explore Splunk logs',
       imgUrl: 'public/img/plugins/splunk_logo_128.png',
     }),
     getPhantomPlugin({
       id: 'grafana-oracle-datasource',
       name: 'Oracle',
-      description: 'Visualize & explore Oracle SQL',
+      description: 'Visualize and explore Oracle SQL',
       imgUrl: 'public/img/plugins/oracle.png',
     }),
     getPhantomPlugin({
       id: 'grafana-dynatrace-datasource',
       name: 'Dynatrace',
-      description: 'Visualize & explore Dynatrace data',
+      description: 'Visualize and explore Dynatrace data',
       imgUrl: 'public/img/plugins/dynatrace.png',
     }),
     getPhantomPlugin({
       id: 'grafana-servicenow-datasource',
-      description: 'ServiceNow integration & data source',
+      description: 'ServiceNow integration and data source',
       name: 'ServiceNow',
       imgUrl: 'public/img/plugins/servicenow.svg',
     }),
     getPhantomPlugin({
       id: 'grafana-datadog-datasource',
-      description: 'DataDog integration & data source',
+      description: 'DataDog integration and data source',
       name: 'DataDog',
       imgUrl: 'public/img/plugins/datadog.png',
     }),
     getPhantomPlugin({
       id: 'grafana-newrelic-datasource',
-      description: 'New Relic integration & data source',
+      description: 'New Relic integration and data source',
       name: 'New Relic',
       imgUrl: 'public/img/plugins/newrelic.svg',
     }),
     getPhantomPlugin({
       id: 'grafana-mongodb-datasource',
-      description: 'MongoDB integration & data source',
+      description: 'MongoDB integration and data source',
       name: 'MongoDB',
       imgUrl: 'public/img/plugins/mongodb.svg',
     }),
     getPhantomPlugin({
       id: 'grafana-snowflake-datasource',
-      description: 'Snowflake integration & data source',
+      description: 'Snowflake integration and data source',
       name: 'Snowflake',
       imgUrl: 'public/img/plugins/snowflake.svg',
     }),
     getPhantomPlugin({
       id: 'grafana-wavefront-datasource',
-      description: 'Wavefront integration & data source',
+      description: 'Wavefront integration and data source',
       name: 'Wavefront',
       imgUrl: 'public/img/plugins/wavefront.svg',
     }),
     getPhantomPlugin({
       id: 'dlopes7-appdynamics-datasource',
-      description: 'AppDynamics integration & data source',
+      description: 'AppDynamics integration and data source',
       name: 'AppDynamics',
       imgUrl: 'public/img/plugins/appdynamics.svg',
     }),
@@ -167,7 +167,7 @@ function getGrafanaCloudPhantomPlugin(): DataSourcePluginMeta {
     module: 'phantom',
     baseUrl: '',
     info: {
-      description: 'Hosted Graphite, Prometheus and Loki',
+      description: 'Hosted Graphite, Prometheus, and Loki',
       logos: { small: 'public/img/grafana_icon.svg', large: 'asd' },
       author: { name: 'Grafana Labs' },
       links: [
diff --git a/public/app/features/datasources/utils/passwordHandlers.ts b/public/app/features/datasources/utils/passwordHandlers.ts
index 9d46f210833..63db5f8ca8b 100644
--- a/public/app/features/datasources/utils/passwordHandlers.ts
+++ b/public/app/features/datasources/utils/passwordHandlers.ts
@@ -11,7 +11,7 @@ export enum PasswordFieldEnum {
 }
 
 /**
- * Basic shape for settings controllers in at the moment mostly angular datasource plugins.
+ * Basic shape for settings controllers in at the moment mostly angular data source plugins.
  */
 export type Ctrl = {
   current: {
diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx
index b0a5c222374..db07ac56a5f 100644
--- a/public/app/features/folders/FolderSettingsPage.tsx
+++ b/public/app/features/folders/FolderSettingsPage.tsx
@@ -85,7 +85,7 @@ export class FolderSettingsPage extends PureComponent<Props, State> {
     return (
       <Page navModel={navModel}>
         <Page.Contents isLoading={this.state.isLoading}>
-          <h3 className="page-sub-heading">Folder Settings</h3>
+          <h3 className="page-sub-heading">Folder settings</h3>
 
           <div className="section gf-form-group">
             <form name="folderSettingsForm" onSubmit={this.onSave}>
diff --git a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
index a7d4abb180e..4d86792a20c 100644
--- a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
+++ b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`Render should enable save button 1`] = `
     <h3
       className="page-sub-heading"
     >
-      Folder Settings
+      Folder settings
     </h3>
     <div
       className="section gf-form-group"
@@ -68,7 +68,7 @@ exports[`Render should render component 1`] = `
     <h3
       className="page-sub-heading"
     >
-      Folder Settings
+      Folder settings
     </h3>
     <div
       className="section gf-form-group"
diff --git a/public/app/features/folders/state/navModel.ts b/public/app/features/folders/state/navModel.ts
index c0734427775..b15e0870411 100644
--- a/public/app/features/folders/state/navModel.ts
+++ b/public/app/features/folders/state/navModel.ts
@@ -5,7 +5,7 @@ export function buildNavModel(folder: FolderDTO): NavModelItem {
   const model = {
     icon: 'folder',
     id: 'manage-folder',
-    subTitle: 'Manage folder dashboards & permissions',
+    subTitle: 'Manage folder dashboards and permissions',
     url: '',
     text: folder.title,
     breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx
index 0596d9259a3..16430610f97 100644
--- a/public/app/features/manage-dashboards/DashboardImportPage.tsx
+++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx
@@ -88,10 +88,10 @@ class DashboardImportUnConnected extends PureComponent<Props> {
               <Field invalid={!!errors.gcomDashboard} error={errors.gcomDashboard && errors.gcomDashboard.message}>
                 <Input
                   name="gcomDashboard"
-                  placeholder="Grafana.com dashboard url or id"
+                  placeholder="Grafana.com dashboard URL or ID"
                   type="text"
                   ref={register({
-                    required: 'A Grafana dashboard url or id is required',
+                    required: 'A Grafana dashboard URL or ID is required',
                     validate: validateGcomDashboard,
                   })}
                   addonAfter={<Button type="submit">Load</Button>}
@@ -109,7 +109,7 @@ class DashboardImportUnConnected extends PureComponent<Props> {
                   <TextArea
                     name="dashboardJson"
                     ref={register({
-                      required: 'Need a dashboard json model',
+                      required: 'Need a dashboard JSON model',
                       validate: validateDashboardJson,
                     })}
                     rows={10}
diff --git a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
index a3c54f6db04..3e417a8b500 100644
--- a/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
+++ b/public/app/features/manage-dashboards/components/ImportDashboardForm.tsx
@@ -74,9 +74,9 @@ export const ImportDashboardForm: FC<Props> = ({
         />
       </Field>
       <Field
-        label="Unique identifier (uid)"
-        description="The unique identifier (uid) of a dashboard can be used for uniquely identify a dashboard between multiple Grafana installs.
-                The uid allows having consistent URL’s for accessing dashboards so changing the title of a dashboard will not break any
+        label="Unique identifier (UID)"
+        description="The unique identifier (UID) of a dashboard can be used for uniquely identify a dashboard between multiple Grafana installs.
+                The UID allows having consistent URLs for accessing dashboards so changing the title of a dashboard will not break any
                 bookmarked links to that dashboard."
         invalid={!!errors.uid}
         error={errors.uid && errors.uid.message}
diff --git a/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx b/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
index dec6b963cea..26fc2afa0df 100644
--- a/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
+++ b/public/app/features/manage-dashboards/components/ImportDashboardOverview.tsx
@@ -56,7 +56,7 @@ class ImportDashboardOverviewUnConnected extends PureComponent<Props, State> {
           <div style={{ marginBottom: '24px' }}>
             <div>
               <Legend>
-                Importing Dashboard from{' '}
+                Importing dashboard from{' '}
                 <a
                   href={`https://grafana.com/dashboards/${dashboard.gnetId}`}
                   className="external-link"
diff --git a/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
index bbfe7c3e9b9..5f2a226bf27 100644
--- a/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
+++ b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
@@ -33,7 +33,7 @@ export function uploadDashboardDirective() {
               console.error(err);
               appEvents.emit(AppEvents.alertError, [
                 'Import failed',
-                'JSON -> JS Serialization failed: ' + err.message,
+                'JSON -> JS serialization failed: ' + err.message,
               ]);
               return;
             }
@@ -62,7 +62,7 @@ export function uploadDashboardDirective() {
         // Something
         elem[0].addEventListener('change', file_selected, false);
       } else {
-        appEvents.emit(AppEvents.alertError, ['Oops', 'The HTML5 File APIs are not fully supported in this browser']);
+        appEvents.emit(AppEvents.alertError, ['Oops', 'The HTML5 file APIs are not fully supported in this browser']);
       }
     },
   };
diff --git a/public/app/features/manage-dashboards/utils/validation.ts b/public/app/features/manage-dashboards/utils/validation.ts
index 9b2f667964e..d60b3fc95b4 100644
--- a/public/app/features/manage-dashboards/utils/validation.ts
+++ b/public/app/features/manage-dashboards/utils/validation.ts
@@ -14,7 +14,7 @@ export const validateGcomDashboard = (gcomDashboard: string) => {
   // From DashboardImportCtrl
   const match = /(^\d+$)|dashboards\/(\d+)/.exec(gcomDashboard);
 
-  return match && (match[1] || match[2]) ? true : 'Could not find a valid Grafana.com id';
+  return match && (match[1] || match[2]) ? true : 'Could not find a valid Grafana.com ID';
 };
 
 export const validateTitle = (newTitle: string, folderId: number) => {
@@ -34,7 +34,7 @@ export const validateUid = (value: string) => {
   return getBackendSrv()
     .get(`/api/dashboards/uid/${value}`)
     .then((existingDashboard) => {
-      return `Dashboard named '${existingDashboard?.dashboard.title}' in folder '${existingDashboard?.meta.folderTitle}' has the same uid`;
+      return `Dashboard named '${existingDashboard?.dashboard.title}' in folder '${existingDashboard?.meta.folderTitle}' has the same UID`;
     })
     .catch((error) => {
       error.isHandled = true;
diff --git a/public/app/features/playlist/PlaylistEditPage.tsx b/public/app/features/playlist/PlaylistEditPage.tsx
index f41ce64681e..ed9dbb6377a 100644
--- a/public/app/features/playlist/PlaylistEditPage.tsx
+++ b/public/app/features/playlist/PlaylistEditPage.tsx
@@ -35,10 +35,10 @@ export const PlaylistEditPage: FC<Props> = ({ navModel, match }) => {
   return (
     <Page navModel={navModel}>
       <Page.Contents isLoading={loading}>
-        <h3 className={styles.subHeading}>Edit Playlist</h3>
+        <h3 className={styles.subHeading}>Edit playlist</h3>
 
         <p className={styles.description}>
-          A playlist rotates through a pre-selected list of Dashboards. A Playlist can be a great way to build
+          A playlist rotates through a pre-selected list of dashboards. A playlist can be a great way to build
           situational awareness, or just show off your metrics to your team or visitors.
         </p>
 
diff --git a/public/app/features/playlist/PlaylistNewPage.tsx b/public/app/features/playlist/PlaylistNewPage.tsx
index d37597a7085..dbb3dca1bcf 100644
--- a/public/app/features/playlist/PlaylistNewPage.tsx
+++ b/public/app/features/playlist/PlaylistNewPage.tsx
@@ -34,7 +34,7 @@ export const PlaylistNewPage: FC<Props> = ({ navModel }) => {
         <h3 className={styles.subHeading}>New Playlist</h3>
 
         <p className={styles.description}>
-          A playlist rotates through a pre-selected list of Dashboards. A Playlist can be a great way to build
+          A playlist rotates through a pre-selected list of dashboards. A playlist can be a great way to build
           situational awareness, or just show off your metrics to your team or visitors.
         </p>
 
diff --git a/public/app/features/playlist/PlaylistTableRows.tsx b/public/app/features/playlist/PlaylistTableRows.tsx
index d1af268e06c..bef103ba3ad 100644
--- a/public/app/features/playlist/PlaylistTableRows.tsx
+++ b/public/app/features/playlist/PlaylistTableRows.tsx
@@ -15,7 +15,7 @@ export const PlaylistTableRows: FC<PlaylistTableRowsProps> = ({ items, onMoveUp,
     return (
       <tr>
         <td>
-          <em>Playlist is empty, add dashboards below.</em>
+          <em>Playlist is empty. Add dashboards below.</em>
         </td>
       </tr>
     );
diff --git a/public/app/features/profile/ChangePasswordForm.tsx b/public/app/features/profile/ChangePasswordForm.tsx
index bf27dba2233..2a4608af692 100644
--- a/public/app/features/profile/ChangePasswordForm.tsx
+++ b/public/app/features/profile/ChangePasswordForm.tsx
@@ -16,10 +16,10 @@ export const ChangePasswordForm: FC<Props> = ({ user, onChangePassword, isSaving
   const authSource = user.authLabels?.length && user.authLabels[0];
 
   if (ldapEnabled || authProxyEnabled) {
-    return <p>You cannot change password when ldap or auth proxy authentication is enabled.</p>;
+    return <p>You cannot change password when LDAP or auth proxy authentication is enabled.</p>;
   }
   if (authSource && disableLoginForm) {
-    return <p>Password cannot be changed here!</p>;
+    return <p>Password cannot be changed here.</p>;
   }
 
   return (
diff --git a/public/app/features/profile/UserProfileEditForm.tsx b/public/app/features/profile/UserProfileEditForm.tsx
index 71a0b7f600a..3e549761cb4 100644
--- a/public/app/features/profile/UserProfileEditForm.tsx
+++ b/public/app/features/profile/UserProfileEditForm.tsx
@@ -21,7 +21,7 @@ export const UserProfileEditForm: FC<Props> = ({ user, isSavingUser, updateProfi
     <Form onSubmit={onSubmitProfileUpdate} validateOn="onBlur">
       {({ register, errors }) => {
         return (
-          <FieldSet label="Edit Profile">
+          <FieldSet label="Edit profile">
             <Field label="Name" invalid={!!errors.name} error="Name is required" disabled={disableLoginForm}>
               <Input
                 name="name"
@@ -65,7 +65,7 @@ export default UserProfileEditForm;
 
 const InputSuffix: FC = () => {
   return disableLoginForm ? (
-    <Tooltip content="Login Details Locked - managed in another system.">
+    <Tooltip content="Login details locked because they are managed in another system.">
       <Icon name="lock" />
     </Tooltip>
   ) : null;
diff --git a/public/app/features/query/components/QueryGroupOptions.tsx b/public/app/features/query/components/QueryGroupOptions.tsx
index c561faee3c1..46d5aff010b 100644
--- a/public/app/features/query/components/QueryGroupOptions.tsx
+++ b/public/app/features/query/components/QueryGroupOptions.tsx
@@ -250,7 +250,7 @@ export class QueryGroupOptionsEditor extends PureComponent<Props, State> {
               width={9}
               tooltip={
                 <>
-                  The evaluated Interval that is sent to data source and is used in <code>$__interval</code> and{' '}
+                  The evaluated interval that is sent to data source and is used in <code>$__interval</code> and{' '}
                   <code>$__interval_ms</code>
                 </>
               }
diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index f68196514e6..210a51f282d 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -79,7 +79,7 @@ export class PanelQueryRunner {
         let processedData = data;
 
         if (withFieldConfig) {
-          // Apply field defaults & overrides
+          // Apply field defaults and overrides
           const fieldConfig = this.dataConfigSource.getFieldOverrideOptions();
           const timeZone = data.request?.timezone ?? 'browser';
 
@@ -162,7 +162,7 @@ export class PanelQueryRunner {
     try {
       const ds = await getDataSource(datasource, request.scopedVars);
 
-      // Attach the datasource name to each query
+      // Attach the data source name to each query
       request.targets = request.targets.map((query) => {
         if (!query.datasource) {
           query.datasource = ds.name;
diff --git a/public/app/features/teams/TeamSettings.tsx b/public/app/features/teams/TeamSettings.tsx
index 00b4ed9b5fa..5f42ca4ee0f 100644
--- a/public/app/features/teams/TeamSettings.tsx
+++ b/public/app/features/teams/TeamSettings.tsx
@@ -14,7 +14,7 @@ export interface Props {
 export const TeamSettings: FC<Props> = ({ team, updateTeam }) => {
   return (
     <VerticalGroup>
-      <FieldSet label="Team Settings">
+      <FieldSet label="Team settings">
         <Form
           defaultValues={{ ...team }}
           onSubmit={(formTeam: Team) => {
@@ -29,7 +29,7 @@ export const TeamSettings: FC<Props> = ({ team, updateTeam }) => {
 
               <Field
                 label="Email"
-                description="This is optional and is primarily used to set the team profile avatar (via gravatar service)"
+                description="This is optional and is primarily used to set the team profile avatar (via gravatar service)."
               >
                 <Input placeholder="team@email.com" type="email" name="email" ref={register} />
               </Field>
diff --git a/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap
index a8e44c8514d..f460cc9ead9 100644
--- a/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`Render should render component 1`] = `
 <VerticalGroup>
   <FieldSet
-    label="Team Settings"
+    label="Team settings"
   >
     <Form
       defaultValues={
diff --git a/public/app/features/teams/state/navModel.ts b/public/app/features/teams/state/navModel.ts
index 12faf41a733..1868162af0a 100644
--- a/public/app/features/teams/state/navModel.ts
+++ b/public/app/features/teams/state/navModel.ts
@@ -6,7 +6,7 @@ export function buildNavModel(team: Team): NavModelItem {
   const navModel = {
     img: team.avatarUrl,
     id: 'team-' + team.id,
-    subTitle: 'Manage members & settings',
+    subTitle: 'Manage members and settings',
     url: '',
     text: team.name,
     breadcrumbs: [{ title: 'Teams', url: 'org/teams' }],