grammar errors (#3583)

* Grammar errors

* Grammar errors

cli/sync.ts

@@ -730,7 +730,7 @@ async function pull(opts: GlobalOptions & SyncOptions) {
           showConflict(conflict.path, conflict.local, conflict.change.after);
         }
         log.info(
-          colors.red(`Please resolve theses conflicts manually by either:
+          colors.red(`Please resolve these conflicts manually by either:
   - reverting the content back to its remote (\`wmill pull\` and refuse to preserve local when prompted)
   - pushing the changes with \`wmill push --skip-pull\` to override wmill with all your local changes
 `)

frontend/src/lib/components/apps/editor/component/components.ts

@@ -1006,7 +1006,7 @@ export const components = {
 					type: 'static',
 					selectOptions: selectOptions.buttonColorOptions,
 					value: 'blue',
-					tooltip: 'Theses presets can be overwritten with custom styles.'
+					tooltip: 'These presets can be overwritten with custom styles.'
 				},
 				size: {
 					fieldType: 'select',
@@ -1222,7 +1222,7 @@ export const components = {
 					type: 'static',
 					value: 'dark',
 					selectOptions: buttonColorOptions,
-					tooltip: 'Theses presets can be overwritten with custom styles.'
+					tooltip: 'These presets can be overwritten with custom styles.'
 				},
 				size: {
 					fieldType: 'select',
@@ -2965,7 +2965,7 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 
 					selectOptions: buttonColorOptions,
 					value: 'blue',
-					tooltip: 'Theses presets can be overwritten with custom styles.'
+					tooltip: 'These presets can be overwritten with custom styles.'
 				},
 				buttonSize: {
 					fieldType: 'select',

frontend/src/lib/components/apps/editor/settingsPanel/StylePanel.svelte

@@ -159,8 +159,9 @@
 					</Badge>
 
 					<Tooltip light>
-						You can customise the CSS and the classes of this component instance. Theses
-						customisations will only be applied to this component.
+						You can customise the CSS and the classes of this component instance. These
+						customisations will only be applied to this component. You can also apply
+						custom classes set on the Global styling panel.
 					</Tooltip>
 				</div>
 			</Tab>
@@ -169,7 +170,7 @@
 					Global: {type ? ccomponents[type].name : ''}
 
 					<Tooltip light>
-						You can customise the CSS and the classes of all components of this type. Theses
+						You can customise the CSS and the classes of all components of this type. These
 						customisations will be applied to all components of this type.
 					</Tooltip>
 				</div>