Merge branch 'v15/dev' into release/15.2

Author: iOvergaard

src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts

@@ -123,6 +123,7 @@ export default {
 	buttons: {
 		clearSelection: 'Ryd valg',
 		select: 'Vælg',
+		choose: 'Vælg',
 		somethingElse: 'Gør noget andet',
 		bold: 'Fed',
 		deindent: 'Fortryd indryk afsnit',
@@ -546,12 +547,14 @@ export default {
 		selectMember: 'Vælg medlem',
 		selectMembers: 'Vælg medlemmer',
 		selectMemberGroup: 'Vælg medlemsgruppe',
+		chooseMemberGroup: 'Vælg medlemsgruppe',
 		selectMemberType: 'Vælg medlemstype',
 		selectNode: 'Vælg node',
 		selectLanguages: 'Vælg sprog',
 		selectSections: 'Vælg sektioner',
 		selectUser: 'Vælg bruger',
 		selectUsers: 'Vælg brugere',
+		chooseUsers: 'Vælg brugere',
 		noIconsFound: 'Ingen ikoner blev fundet',
 		noMacroParams: 'Der er ingen parametre for denne makro',
 		noMacros: 'Der er ikke tilføjet nogen makroer',
@@ -1919,6 +1922,9 @@ export default {
 		selectUserGroup: (multiple: boolean) => {
 			return multiple ? 'Vælg brugergrupper' : 'Vælg brugergruppe';
 		},
+		chooseUserGroup: (multiple: boolean) => {
+			return multiple ? 'Vælg brugergrupper' : 'Vælg brugergruppe';
+		},
 		noStartNode: 'Ingen startnode valgt',
 		noStartNodes: 'Ingen startnoder valgt',
 		startnode: 'Indhold startnode',

src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts

@@ -129,6 +129,7 @@ export default {
 	buttons: {
 		clearSelection: 'Clear selection',
 		select: 'Select',
+		choose: 'Choose',
 		somethingElse: 'Do something else',
 		bold: 'Bold',
 		deindent: 'Cancel Paragraph Indent',
@@ -578,12 +579,14 @@ export default {
 		selectMember: 'Choose member',
 		selectMembers: 'Choose members',
 		selectMemberGroup: 'Select member group',
+		chooseMemberGroup: 'Choose member group',
 		selectMemberType: 'Select member type',
 		selectNode: 'Select node',
 		selectLanguages: 'Select languages',
 		selectSections: 'Select sections',
 		selectUser: 'Select user',
 		selectUsers: 'Select users',
+		chooseUsers: 'Choose users',
 		noIconsFound: 'No icons were found',
 		noMacroParams: 'There are no parameters for this macro',
 		noMacros: 'There are no macros available to insert',
@@ -1971,6 +1974,9 @@ export default {
 		selectUserGroup: (multiple: boolean) => {
 			return multiple ? 'Select User Groups' : 'Select User Group';
 		},
+		chooseUserGroup: (multiple: boolean) => {
+			return multiple ? 'Choose User Groups' : 'Choose User Group';
+		},
 		noStartNode: 'No start node selected',
 		noStartNodes: 'No start nodes selected',
 		startnode: 'Content start node',

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

@@ -129,6 +129,7 @@ export default {
 	buttons: {
 		clearSelection: 'Clear selection',
 		select: 'Select',
+		choose: 'Choose',
 		somethingElse: 'Do something else',
 		bold: 'Bold',
 		deindent: 'Cancel Paragraph Indent',
@@ -569,12 +570,14 @@ export default {
 		selectMember: 'Choose member',
 		selectMembers: 'Choose members',
 		selectMemberGroup: 'Select member group',
+		chooseMemberGroup: 'Choose member group',
 		selectMemberType: 'Select member type',
 		selectNode: 'Select node',
 		selectLanguages: 'Select languages',
 		selectSections: 'Select sections',
 		selectUser: 'Select user',
 		selectUsers: 'Select users',
+		chooseUsers: 'Choose users',
 		noIconsFound: 'No icons were found',
 		noMacroParams: 'There are no parameters for this macro',
 		noMacros: 'There are no macros available to insert',
@@ -2010,6 +2013,9 @@ export default {
 		selectUserGroup: (multiple: boolean) => {
 			return multiple ? 'Select User Groups' : 'Select User Group';
 		},
+		chooseUserGroup: (multiple: boolean) => {
+			return multiple ? 'Choose User Groups' : 'Choose User Group';
+		},
 		noStartNode: 'No start node selected',
 		noStartNodes: 'No start nodes selected',
 		startnode: 'Content start node',

src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker-modal/tree-picker-modal.element.ts

@@ -148,7 +148,7 @@ export class UmbTreePickerModalElement<TreeItemType extends UmbTreeItemModelBase
 
 	override render() {
 		return html`
-			<umb-body-layout headline="Select">
+			<umb-body-layout  headline=${this.localize.term('general_choose')}>
 				<uui-box> ${this.#renderSearch()} ${this.#renderTree()}</uui-box>
 				${this.#renderActions()}
 			</umb-body-layout>

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts

@@ -368,6 +368,10 @@ export class UmbWorkspaceSplitViewVariantSelectorElement<
 				white-space: nowrap;
 			}
 
+			uui-scroll-container {
+				max-height: 50dvh;
+			}
+
 			ul {
 				list-style-type: none;
 				padding: 0;

src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/media-recycle-bin-tree.repository.ts

@@ -21,7 +21,7 @@ export class UmbMediaRecycleBinTreeRepository
 		const data = {
 			unique: null,
 			entityType: UMB_MEDIA_RECYCLE_BIN_ROOT_ENTITY_TYPE,
-			name: 'Recycle Bin',
+			name: '#treeHeaders_contentRecycleBin',
 			icon: 'icon-trash',
 			hasChildren,
 			isContainer: false,

src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/member-group-picker-modal/member-group-picker-modal.element.ts

@@ -49,7 +49,7 @@ export class UmbMemberGroupPickerModalElement extends UmbModalBaseElement<
 	}
 
 	override render() {
-		return html`<umb-body-layout headline=${this.localize.term('defaultdialogs_selectMemberGroup')}>
+		return html`<umb-body-layout headline=${this.localize.term('defaultdialogs_chooseMemberGroup')}>
 			<uui-box>
 				${repeat(
 					this.#filteredMemberGroups,
@@ -67,8 +67,12 @@ export class UmbMemberGroupPickerModalElement extends UmbModalBaseElement<
 				)}
 			</uui-box>
 			<div slot="actions">
-				<uui-button label="Close" @click=${this.#close}></uui-button>
-				<uui-button label="Submit" look="primary" color="positive" @click=${this.#submit}></uui-button>
+				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
+				<uui-button
+					label=${this.localize.term('general_choose')}
+					look="primary"
+					color="positive"
+					@click=${this.#submit}></uui-button>
 			</div>
 		</umb-body-layout> `;
 	}

src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts

@@ -70,7 +70,7 @@ export class UmbUserGroupPickerModalElement extends UmbModalBaseElement<
 
 	override render() {
 		return html`
-			<umb-body-layout headline=${this.localize.term('user_selectUserGroup', true)}>
+			<umb-body-layout headline=${this.localize.term('user_chooseUserGroup', true)}>
 				<uui-box>
 					${repeat(
 						this._userGroups,
@@ -96,7 +96,7 @@ export class UmbUserGroupPickerModalElement extends UmbModalBaseElement<
 				<div slot="actions">
 					<uui-button label=${this.localize.term('general_cancel')} @click=${this._rejectModal}></uui-button>
 					<uui-button
-						label=${this.localize.term('buttons_select')}
+						label=${this.localize.term('buttons_choose')}
 						look="primary"
 						color="positive"
 						@click=${this.#onSubmit}></uui-button>

src/Umbraco.Web.UI.Client/src/packages/user/user/modals/user-picker/user-picker-modal.element.ts

@@ -48,7 +48,7 @@ export class UmbUserPickerModalElement extends UmbModalBaseElement<UmbUserPicker
 
 	override render() {
 		return html`
-			<umb-body-layout headline=${this.localize.term('defaultdialogs_selectUsers')}>
+			<umb-body-layout headline=${this.localize.term('defaultdialogs_chooseUsers')}>
 				<uui-box>
 					${this._users.map(
 						(user) => html`
@@ -68,8 +68,12 @@ export class UmbUserPickerModalElement extends UmbModalBaseElement<UmbUserPicker
 					)}
 				</uui-box>
 				<div slot="actions">
-					<uui-button label="Close" @click=${this.#close}></uui-button>
-					<uui-button label="Submit" look="primary" color="positive" @click=${this.#submit}></uui-button>
+					<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
+					<uui-button
+						label=${this.localize.term('general_choose')}
+						look="primary"
+						color="positive"
+						@click=${this.#submit}></uui-button>
 				</div>
 			</umb-body-layout>
 		`;