@umbraco-cms/backoffice 17.0.0-beta → 17.0.0-rc2

package/dist-cms/apps/backoffice/components/backoffice-header-sections.element.js

@@ -55,8 +55,9 @@ let UmbBackofficeHeaderSectionsElement = class UmbBackofficeHeaderSectionsElemen
             throw new Error('Section manifest is missing');
         }
         const clickedSectionAlias = manifest.alias;
-        // If the clicked section is the same as the current section, we just load the original section path to load the section root
-        if (this._currentSectionAlias === clickedSectionAlias) {
+        // If preventUrlRetention is set to true then go to the section root.
+        // Or if the clicked section is the current active one, then navigate to the section root
+        if (manifest?.meta.preventUrlRetention === true || this._currentSectionAlias === clickedSectionAlias) {
             const sectionPath = this.#getSectionPath(manifest);
             history.pushState(null, '', sectionPath);
             return;

package/dist-cms/apps/preview/apps/preview-exit.element.js

@@ -10,7 +10,7 @@ import { UmbLitElement } from '../../../packages/core/lit-element/index.js';
 let UmbPreviewExitElement = class UmbPreviewExitElement extends UmbLitElement {
     async #onClick() {
         const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
-        previewContext?.exitPreview(0);
+        await previewContext?.exitPreview(0);
     }
     render() {
         return html `

package/dist-cms/apps/preview/apps/preview-open-website.element.js

@@ -10,7 +10,7 @@ import { UmbLitElement } from '../../../packages/core/lit-element/index.js';
 let UmbPreviewOpenWebsiteElement = class UmbPreviewOpenWebsiteElement extends UmbLitElement {
     async #onClick() {
         const previewContext = await this.getContext(UMB_PREVIEW_CONTEXT);
-        previewContext?.openWebsite();
+        await previewContext?.openWebsite();
     }
     render() {
         return html `

package/dist-cms/apps/preview/preview.context.d.ts

@@ -18,7 +18,7 @@ export declare class UmbPreviewContext extends UmbContextBase {
     exitSession(): Promise<void>;
     iframeLoaded(iframe: HTMLIFrameElement): void;
     getIFrameWrapper(): HTMLElement | undefined;
-    openWebsite(): void;
+    openWebsite(): Promise<void>;
     reloadIFrame(iframe: HTMLIFrameElement): void;
     restartSession(): Promise<void>;
     startSession(): void;

package/dist-cms/apps/preview/preview.context.js

@@ -1,19 +1,26 @@
-import { UmbBooleanState, UmbStringState } from '../../libs/observable-api/index.js';
+import { tryExecute } from '../../packages/core/resources/index.js';
 import { umbConfirmModal } from '../../packages/core/modal/index.js';
+import { DocumentService } from '../../packages/core/backend-api/index.js';
+import { UmbBooleanState, UmbStringState } from '../../libs/observable-api/index.js';
 import { UmbContextBase } from '../../libs/class-api/index.js';
 import { UmbContextToken } from '../../libs/context-api/index.js';
 import { UmbDocumentPreviewRepository } from '../../packages/documents/documents/index.js';
 import { UMB_SERVER_CONTEXT } from '../../packages/core/server/index.js';
+import { HubConnectionBuilder } from '../../external/signalr/index.js';
+import { UMB_NOTIFICATION_CONTEXT } from '../../packages/core/notification/index.js';
+import { UmbLocalizationController } from '../../libs/localization-api/index.js';
 const UMB_LOCALSTORAGE_SESSION_KEY = 'umb:previewSessions';
 export class UmbPreviewContext extends UmbContextBase {
     #unique;
     #culture;
     #segment;
     #serverUrl;
-    #webSocket;
+    #connection;
     #iframeReady;
     #previewUrl;
     #documentPreviewRepository;
+    #notificationContext;
+    #localize;
     constructor(host) {
         super(host, UMB_PREVIEW_CONTEXT);
         this.#serverUrl = '';
@@ -22,9 +29,9 @@ export class UmbPreviewContext extends UmbContextBase {
         this.#previewUrl = new UmbStringState(undefined);
         this.previewUrl = this.#previewUrl.asObservable();
         this.#documentPreviewRepository = new UmbDocumentPreviewRepository(this);
+        this.#localize = new UmbLocalizationController(this);
         this.#currentArgs = {};
         this.consumeContext(UMB_SERVER_CONTEXT, (instance) => {
-            this.#serverUrl = instance?.getServerUrl() ?? '';
             const params = new URLSearchParams(window.location.search);
             this.#unique = params.get('id');
             this.#culture = params.get('culture');
@@ -33,32 +40,64 @@ export class UmbPreviewContext extends UmbContextBase {
                 console.error('No unique ID found in query string.');
                 return;
             }
-            this.#setPreviewUrl();
+            const serverUrl = instance?.getServerUrl();
+            if (!serverUrl) {
+                console.error('No server URL found in context');
+                return;
+            }
+            this.#serverUrl = serverUrl;
+            this.#setPreviewUrl({ serverUrl });
+            this.#initHubConnection(serverUrl);
         });
-    }
-    #configureWebSocket() {
-        if (this.#webSocket && this.#webSocket.readyState < 2)
-            return;
-        const url = `${this.#serverUrl.replace('https://', 'wss://')}/umbraco/PreviewHub`;
-        this.#webSocket = new WebSocket(url);
-        this.#webSocket.addEventListener('open', () => {
-            // NOTE: SignalR protocol handshake; it requires a terminating control character.
-            const endChar = String.fromCharCode(30);
-            this.#webSocket?.send(`{"protocol":"json","version":1}${endChar}`);
+        this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
+            this.#notificationContext = instance;
         });
-        this.#webSocket.addEventListener('message', (event) => {
-            if (!event?.data)
-                return;
-            // NOTE: Strip the terminating control character, (from SignalR).
-            const data = event.data.substring(0, event.data.length - 1);
-            const json = JSON.parse(data);
-            if (json.type === 1 && json.target === 'refreshed') {
-                const pageId = json.arguments?.[0];
-                if (pageId === this.#unique) {
-                    this.#setPreviewUrl({ rnd: Math.random() });
-                }
+    }
+    async #initHubConnection(serverUrl) {
+        const previewHubUrl = `${serverUrl}/umbraco/PreviewHub`;
+        // Make sure that no previous connection exists.
+        if (this.#connection) {
+            await this.#connection.stop();
+            this.#connection = undefined;
+        }
+        this.#connection = new HubConnectionBuilder().withUrl(previewHubUrl).build();
+        this.#connection.on('refreshed', (payload) => {
+            if (payload === this.#unique) {
+                this.#setPreviewUrl({ rnd: Math.random() });
             }
         });
+        this.#connection.onclose(() => {
+            this.#notificationContext?.peek('warning', {
+                data: {
+                    headline: this.#localize.term('general_preview'),
+                    message: this.#localize.term('preview_connectionLost'),
+                },
+            });
+        });
+        try {
+            await this.#connection.start();
+        }
+        catch (error) {
+            console.error('The SignalR connection could not be established', error);
+            this.#notificationContext?.peek('warning', {
+                data: {
+                    headline: this.#localize.term('general_preview'),
+                    message: this.#localize.term('preview_connectionFailed'),
+                },
+            });
+        }
+    }
+    async #getPublishedUrl() {
+        if (!this.#unique)
+            return null;
+        // NOTE: We should be reusing `UmbDocumentUrlRepository` here, but the preview app doesn't register the `itemStore` extensions, so can't resolve/consume `UMB_DOCUMENT_URL_STORE_CONTEXT`. [LK]
+        const { data } = await tryExecute(this, DocumentService.getDocumentUrls({ query: { id: [this.#unique] } }));
+        if (!data?.length)
+            return null;
+        const urlInfo = this.#culture ? data[0].urlInfos.find((x) => x.culture === this.#culture) : data[0].urlInfos[0];
+        if (!urlInfo?.url)
+            return null;
+        return urlInfo.url.startsWith('/') ? `${this.#serverUrl}${urlInfo.url}` : urlInfo.url;
     }
     #getSessionCount() {
         return Math.max(Number(localStorage.getItem(UMB_LOCALSTORAGE_SESSION_KEY)), 0) || 0;
@@ -94,7 +133,7 @@ export class UmbPreviewContext extends UmbContextBase {
         else {
             params.delete(segmentParam);
         }
-        const previewUrl = new URL(url.pathname + '?' + params.toString(), host);
+        const previewUrl = new URL(`${url.pathname}?${params.toString()}`, host);
         const previewUrlString = previewUrl.toString();
         this.#previewUrl.setValue(previewUrlString);
     }
@@ -124,11 +163,14 @@ export class UmbPreviewContext extends UmbContextBase {
         if (sessions <= 0) {
             await this.#documentPreviewRepository.exit();
         }
-        if (this.#webSocket) {
-            this.#webSocket.close();
-            this.#webSocket = undefined;
+        if (this.#connection) {
+            await this.#connection.stop();
+            this.#connection = undefined;
+        }
+        let url = await this.#getPublishedUrl();
+        if (!url) {
+            url = this.#previewUrl.getValue();
         }
-        const url = this.#previewUrl.getValue();
         window.location.replace(url);
     }
     async exitSession() {
@@ -139,14 +181,16 @@ export class UmbPreviewContext extends UmbContextBase {
     iframeLoaded(iframe) {
         if (!iframe)
             return;
-        this.#configureWebSocket();
         this.#iframeReady.setValue(true);
     }
     getIFrameWrapper() {
         return this.getHostElement().shadowRoot?.querySelector('#wrapper');
     }
-    openWebsite() {
-        const url = this.#previewUrl.getValue();
+    async openWebsite() {
+        let url = await this.#getPublishedUrl();
+        if (!url) {
+            url = this.#previewUrl.getValue();
+        }
         window.open(url, '_blank');
     }
     reloadIFrame(iframe) {

package/dist-cms/assets/lang/ar.js

@@ -898,7 +898,6 @@ export default {
         databaseHeader: 'تكوين قاعدة البيانات',
         databaseInstall: 'اضغط على زر <strong>التثبيت</strong> لتثبيت قاعدة بيانات Umbraco %0%',
         databaseInstallDone: 'تم نسخ Umbraco %0% الآن إلى قاعدة بياناتك. اضغط على <strong>التالي</strong> للمتابعة.',
-        databaseNotFound: '<p>لم يتم العثور على قاعدة البيانات! يرجى التحقق من أن المعلومات في سلسلة الاتصال في ملف "web.config" صحيحة.</p>\n              <p>للمتابعة، يرجى تعديل ملف "web.config" (باستخدام Visual Studio أو محرر النصوص المفضل لديك)، والتمرير إلى الأسفل، وإضافة سلسلة الاتصال لقاعدة البيانات الخاصة بك في المفتاح المسمى "UmbracoDbDSN" وحفظ الملف.</p>\n              <p>اضغط على زر <strong>إعادة المحاولة</strong> عند الانتهاء.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">\n\t\t\t              مزيد من المعلومات حول تحرير web.config هنا</a>.</p>',
         databaseText: 'لإكمال هذه الخطوة، يجب أن تكون لديك بعض المعلومات حول خادم قاعدة البيانات الخاص بك ("سلسلة الاتصال").<br />\n        يرجى الاتصال بمزود خدمة الإنترنت الخاص بك إذا لزم الأمر.\n        إذا كنت تقوم بالتثبيت على جهاز محلي أو خادم، قد تحتاج إلى معلومات من مسؤول النظام الخاص بك.',
         databaseUpgrade: '<p>اضغط على زر <strong>الترقية</strong> لترقية قاعدة البيانات إلى Umbraco %0%</p>\n      <p>لا تقلق - لن يتم حذف أي محتوى وكل شيء سيستمر في العمل بعد ذلك!</p>',
         databaseUpgradeDone: 'تم ترقية قاعدة البيانات الخاصة بك إلى الإصدار النهائي %0%.<br/>اضغط على <strong>التالي</strong> للمتابعة.',
@@ -1200,14 +1199,6 @@ export default {
         translation: 'القاموس',
         users: 'المستخدمون',
     },
-    help: {
-        tours: 'الجولات',
-        theBestUmbracoVideoTutorials: 'أفضل دروس الفيديو في Umbraco',
-        umbracoForum: 'زيارة our.umbraco.com',
-        umbracoTv: 'زيارة umbraco.tv',
-        umbracoLearningBase: 'شاهد دروس الفيديو المجانية لدينا',
-        umbracoLearningBaseDescription: 'على قاعدة تعلم Umbraco',
-    },
     settings: {
         defaulttemplate: 'القالب الافتراضي',
         importDocumentTypeHelp: 'للاستيراد نوع الوثيقة ابحث عن ملف ".udt" على جهاز الكمبيوتر الخاص بك بالنقر على زر "استيراد" (سيُطلب منك تأكيد ذلك في الشاشة التالية)',
@@ -2136,15 +2127,11 @@ export default {
         reminderDescription: '<p>يجب ألا تدع موقع الإنتاج يعمل في وضع التصحيح. يتم إيقاف وضع التصحيح عن طريق تعيين <strong>Umbraco:CMS:Hosting:Debug</strong> إلى <strong>false</strong> في appsettings.json أو appsettings.{Environment}.json أو عبر متغير بيئة.</p>',
         profilerEnabledDescription: '<p>Umbraco حاليًا لا يعمل في وضع التصحيح، لذا لا يمكنك استخدام أداة التحليل المدمجة. هذا هو الوضع الصحيح لموقع الإنتاج.</p><p>يتم تشغيل وضع التصحيح عن طريق تعيين <strong>Umbraco:CMS:Hosting:Debug</strong> إلى <strong>true</strong> في appsettings.json أو appsettings.{Environment}.json أو عبر متغير بيئة.</p>',
     },
-    settingsDashboardVideos: {
-        trainingHeadline: 'ساعات من مقاطع فيديو تدريب Umbraco على بعد نقرة واحدة',
-        trainingDescription: '<p>هل تريد إتقان Umbraco؟ اقض بضع دقائق في تعلم بعض الممارسات الأفضل من خلال مشاهدة واحدة من هذه الفيديوهات حول استخدام Umbraco. وزيارة <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> لمزيد من مقاطع الفيديو حول Umbraco</p>',
-    },
     settingsDashboard: {
         documentationHeader: 'التوثيق',
         documentationDescription: 'اقرأ المزيد عن العمل مع العناصر في الإعدادات في توثيقنا.',
         communityHeader: 'المجتمع',
-        communityDescription: 'اطرح سؤالاً في منتدى المجتمع أو مجتمع Discord لدينا.',
+        communityDescription: 'اطرح سؤالاً في منتدى مجتمعنا.',
         trainingHeader: 'التدريب',
         trainingDescription: 'اكتشف فرص التدريب والتأهيل الرسمية',
         supportHeader: 'الدعم',

package/dist-cms/assets/lang/bs.js

@@ -832,7 +832,6 @@ export default {
         databaseHeader: 'Konfiguracija baze podataka',
         databaseInstall: '\n      Pritisnite <strong>Instaliraj</strong> za instalaciju Umbraco %0% baze podataka\n    ',
         databaseInstallDone: 'Umbraco %0% je sada kopiran u vašu bazu podataka. Pritisnite <strong>Dalje</strong> da nastavite.',
-        databaseNotFound: '<p>Baza podataka nije pronađena! Provjerite jesu li informacije u "konekcijskom string" u "web.config" fajlu ispravne.</p>\n              <p>Da nastavite, uredite "web.config" fajl. (koristeći Visual Studio ili vaš omiljeni uređivač teksta), skrolujte do dna, dodajte konekcijski string za vašu bazu podataka u ključ nazvan "UmbracoDbDSN" i sačuvajte fajl. </p>\n              <p>\n              Kliknite na <strong>pokušaj ponovo</strong> dugme kada završite.<br />\n\t\t\t  <a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">\n\t\t\t              Više informacija o uređivanju web.config fajla možete pronaći ovdje</a>.</p>',
         databaseText: 'Da biste dovršili ovaj korak, morate znati neke informacije o vašem poslužitelju baze podataka ("konekcijski string").<br />\n        Molimo kontaktirajte svog ISP-a ako je potrebno.\n        Ako instalirate na lokalnoj mašini ili serveru, možda će vam trebati informacije od administratora sistema.',
         databaseUpgrade: '\n      <p>\n      Pritisnite <strong>nadogradnja</strong> za nadogradnju vaše baze podataka na Umbraco %0%</p>\n      <p>\n      Ne brinite - nijedan sadržaj neće biti obrisan i sve će nastaviti raditi nakon toga!\n      </p>\n      ',
         databaseUpgradeDone: 'Vaša baza podataka je nadograđena na konačnu verziju %0%.<br />Pritisnite <strong>Dalje</strong> da nastavite.',
@@ -1116,14 +1115,6 @@ export default {
         translation: 'Prevodi',
         users: 'Korisnici',
     },
-    help: {
-        tours: 'Ture',
-        theBestUmbracoVideoTutorials: 'Najbolji Umbraco video tutorijali',
-        umbracoForum: 'Posjetite our.umbraco.com',
-        umbracoTv: 'Posjetite umbraco.tv',
-        umbracoLearningBase: 'Pogledajte naše besplatne video tutoriale',
-        umbracoLearningBaseDescription: 'na Umbraco Learning Base',
-    },
     settings: {
         defaulttemplate: 'Podrazumevani šablon',
         importDocumentTypeHelp: 'Da biste uvezli vrstu dokumenta, pronađite ".udt" datoteku na svom računaru klikom na\n       dugme "Uvezi" (na sljedećem ekranu će se tražiti da potvrdite)\n    ',
@@ -1964,16 +1955,6 @@ export default {
         learningBaseDescription: '\n        <p>Želite savladati Umbraco? Provedite nekoliko minuta učeći neke najbolje prakse gledajući jedan od ovih videozapisa o korištenju Umbraco-a <a class="btn-link -underline" href="https://www.youtube.com/c/UmbracoLearningBase" target="_blank" rel="noopener"> Umbraco Learning Base Youtube kanal</a>. Ovdje možete pronaći gomilu video materijala koji pokriva mnoge aspekte Umbraco-a.</p>\n      ',
         getStarted: 'Za početak',
     },
-    settingsDashboard: {
-        start: 'Počni ovdje',
-        startDescription: 'Ovaj odjeljak sadrži blokove za izgradnju vaše Umbraco stranice. Slijedite dolje\n      veze da saznate više o radu sa stavkama u odjeljku Postavke\n    ',
-        more: 'Saznajte više',
-        bulletPointOne: '\n        Pročitajte više o radu sa stavkama u Postavkama <a class="btn-link -underline" href="https://docs.umbraco.com/umbraco-cms/fundamentals/backoffice/sections/" target="_blank" rel="noopener">u odjeljku Dokumentacija</a> na Our Umbraco\n    ',
-        bulletPointTwo: '\n        Postavite pitanje na <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Forumu zajednice</a>\n    ',
-        bulletPointTutorials: '\n        Gledajte besplatno <a class="btn-link -underline" href="https://umbra.co/ulb" target="_blank" rel="noopener">video tutorijale na Umbraco Learning Base</a>\n    ',
-        bulletPointFour: '\n        Saznajte više o našim <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">alatima za povećanje produktivnosti i komercijalna podrška</a>\n    ',
-        bulletPointFive: '\n        Saznajte nešto o mogućnosti stvarne <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">obuke i certifikacije</a>\n    ',
-    },
     startupDashboard: {
         fallbackHeadline: 'Dobrodošli u The Friendly CMS',
         fallbackDescription: 'Hvala vam što ste odabrali Umbraco - mislimo da bi ovo mogao biti početak nečega\n      predivno. Iako se u početku može činiti neodoljivim, učinili smo mnogo da kriva učenja bude što glatka i brza\n      što je moguće.\n    ',

package/dist-cms/assets/lang/cs.js

@@ -1028,12 +1028,6 @@ export default {
         statistics: 'Statistiky',
         help: 'Nápověda',
     },
-    help: {
-        tours: 'Příručky',
-        theBestUmbracoVideoTutorials: 'Nejlepší videopříručky Umbraco',
-        umbracoForum: 'Navštívit our.umbraco.com',
-        umbracoTv: 'Navštívit umbraco.tv',
-    },
     settings: {
         defaulttemplate: 'Výchozí šablona',
         importDocumentTypeHelp: 'Pro importování typu dokumentu vyhledejte soubor ".udt" ve svém počítači tak, že kliknete na tlačítko "Prohledat" a pak kliknete na "Import" (na následující obrazovce budete vyzváni k potvrzení)',
@@ -1772,21 +1766,6 @@ export default {
         activateByDefault: 'Ve výchozím stavu aktivovat profiler',
         reminder: 'Přátelské připomenutí',
     },
-    settingsDashboardVideos: {
-        trainingHeadline: 'Hodiny tréninkových videí Umbraco jsou blíž než si myslíte',
-        trainingDescription: '\n        <p> Chcete ovládnout Umbraco? Stačí strávit pár minut sledování jednoho z těchto videí o používání Umbraco. Nebo navštivte <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a>, kde najdete ještě více videí o Umbraco </p>\n    ',
-        getStarted: 'Chcete-li začít',
-    },
-    settingsDashboard: {
-        start: 'Začněte zde',
-        startDescription: 'Tato část obsahuje stavební bloky pro váš web Umbraco. Podle níže uvedených odkazů se dozvíte více o práci s položkami v části Nastavení',
-        more: 'Zjistit více',
-        bulletPointOne: '\n            Další informace o práci s položkami naleznete v části Nastavení <a class="btn-link -underline" href="https://docs.umbraco.com/umbraco-cms/fundamentals/backoffice/sections" target="_blank" rel="noopener">v sekci Dokumentace</a> v Our Umbraco\n        ',
-        bulletPointTwo: '\n            Zeptejte se na <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">fóru komunity</a>\n        ',
-        bulletPointThree: '\n            Podívejte se na naše <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">výuková videa</a> (některá jsou zdarma, jiná vyžadují předplatné)\n        ',
-        bulletPointFour: '\n            Další informace o našich <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">nástrojích zvyšujících produktivitu a komerční podpoře</a>\n        ',
-        bulletPointFive: '\n            Zjistěte více o možnostech <a class="btn-link -underline" href="https://umbraco.com/training" target="_blank" rel="noopener">školení a certifikace</a>\n        ',
-    },
     startupDashboard: {
         fallbackHeadline: 'Vítejte v přátelském CMS',
         fallbackDescription: 'Děkujeme, že jste si vybrali Umbraco - myslíme si, že by to mohl být začátek něčeho krásného. I když se to může zpočátku zdát ohromující, udělali jsme hodně pro to, aby byla křivka učení co nejhladší a nejrychlejší.',

package/dist-cms/assets/lang/cy.js

@@ -874,7 +874,6 @@ export default {
         theEndInstallFailed: '.\n    ',
         databaseInstall: '\n      Gwasgwch y botwm <strong>gosod</strong> i osod y gronfa ddata %0% Umbraco\n    ',
         databaseInstallDone: "Mae Umbraco %0% yn awr wedi copïo i'ch gronfa ddata. Gwasgwch <strong>Nesaf</strong> i fwrw ymlaen.",
-        databaseNotFound: '<p>Cronfa ddata heb ei ganfod! Gwiriwch fod y gwybodaeth yn y "llinyn gyswllt" o\'r ffeil "web.config" yn gywir.</p>\n              <p>Er mwyn parhau, newidiwch y ffeil "web.config" (gan ddefnyddio Visual Studio neu eich hoff olygydd testun), rholiwch at y gwaelod, ychwanegwch y llinyn gyswllt ar gyfer eich cronfa ddata yn yr allwedd o\'r enw "UmbracoDbDSN" ac achub y ffeil. </p>\n              <p>\n              Cliciwch y botwm <strong>ceisio eto</strong> pan rydych wedi\n              gorffen.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">\n\t\t\t              Mwy o wybodaeth am newid y ffeil web.config yma</a>.</p>',
         databaseText: "Er mwyn cwblhau'r cam yma, rhaid i chi berchen gwybodaeth am eich gweinydd gronfa ddata (\"llinyn gyswllt\").<br />\n        Cysylltwch â'ch darparwr gwe (ISP) os oes angen.\n        Os ydych chi'n gosod ar beiriant leol neu weinydd, efallai bydd angen gwybodaeth o'ch gweinyddwr system arnoch.",
         databaseUpgrade: '\n      <p>\n      Gwasgwch y botwm <strong>uwchraddio</strong> i uwchraddio eoch gronfa ddata i Umbraco %0%</p>\n      <p>\n      Peidiwch â phoeni - ni fydd unrhyw gynnwys yn cael ei ddileu a bydd popeth yn parhau i weithio wedyn!\n      </p>\n      ',
         databaseUpgradeDone: "Mae eich cronfa ddata wedi'u uwchraddio at y fersiwn terfynol %0%.<br />Gwasgwch <strong>Nesaf</strong> i\n      barhau. ",
@@ -1200,14 +1199,6 @@ export default {
         users: 'Defnyddwyr',
         marketplace: 'Marchnad',
     },
-    help: {
-        tours: 'Teithiau',
-        theBestUmbracoVideoTutorials: 'Y fideos tiwtorial Umbraco gorau',
-        umbracoForum: 'Ymweld â our.umbraco.com',
-        umbracoTv: 'Ymweld â umbraco.tv',
-        umbracoLearningBase: 'Gwyliwch ein fideos tiwtorial am ddim',
-        umbracoLearningBaseDescription: 'ar Ganolfan Ddysgu Umbraco',
-    },
     settings: {
         defaulttemplate: 'Templed diofyn',
         importDocumentTypeHelp: 'Er mwyn mewnforio math o ddogfen, darganfyddwch y ffeil ".udt" ar ecih cyfrifiadur wrth glicio ar y botwn "Pori" a cliciwch "Mewnforio" (byddwch yn cael eich gofyn i gadarnhau ar y sgrîn nesaf)',
@@ -2137,16 +2128,6 @@ export default {
         trainingDescription: '\n                <P>Eisiau meistroli Umbraco? Treuliwch gwpl o funudau yn dysgu rhai o\'r arferion gorau gan wylio un o\'r fideos hyn am sut i ddefnyddio Umbraco. Ac ymweld â <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> am fwy o fideos am Umbraco</p>\n            ',
         getStarted: 'I roi cychwyn i chi',
     },
-    settingsDashboard: {
-        start: 'Dechrau yma',
-        startDescription: "Mae'r adran hon yn cynnwys y blociau adeiladu am eich safle Umbraco. Dilyn y dolenni isod i ddarganfod fwy am weithio gyda'r eitemau yn yr adran Gosodiadau",
-        more: 'Ddarganfod fwy',
-        bulletPointOne: '\n            Darllenwch fwy am weithio efo\'r eitemau yn yr adran Gosodiadau <a class="btn-link -underline" href="https://docs.umbraco.com/umbraco-cms/fundamentals/backoffice/sections/" target="_blank" rel="noopener">fewn yr adran Dogfennaeth</a> o Our Umbraco\n        ',
-        bulletPointTwo: '\n            Gofynnwch gwestiwn yn y <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Fforwm Cymunedol</a>\n        ',
-        bulletPointFour: '\n            Darganfyddwch fwy am ein <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">hoffer hybu cynhyrchiant a chefnogaeth fasnachol</a>\n        ',
-        bulletPointFive: '\n            Darganfyddwch fwy am gyfleoedd <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">hyfforddi ac ardystio</a>\n        ',
-        bulletPointTutorials: '\n            Gwyliwch ein <a class="btn-link -underline" href="https://umbra.co/ulb" target="_blank" rel="noopener">fideos tiwtorial rhad ac am ddim ar Ganolfan Ddysgu Umbraco</a>\n        ',
-    },
     startupDashboard: {
         fallbackHeadline: "Croeso i'r SRC cyfeillgar",
         fallbackDescription: "Diolch am ddewis Umbraco - rydyn ni'n credu y gallai hyn fod dechreuad i rywbeth prydferth. Er y gallai deilo'n llethol ar y dechrau, rydym wedi gwneud llawer i wneud y gromlin ddysgu mor llyfn a chyflym a phosib.",

package/dist-cms/assets/lang/da.js

@@ -68,6 +68,7 @@ export default {
         content: 'Indhold',
         administration: 'Administration',
         structure: 'Struktur',
+        general: 'Generelt',
         other: 'Andet',
     },
     actionDescriptions: {
@@ -994,7 +995,6 @@ export default {
         databaseHeader: 'Database konfiguration',
         databaseInstall: '\n      Klik på <strong>installér</strong> knappen for at installere Umbraco %0% databasen\n    ',
         databaseInstallDone: 'Umbraco %0% er nu blevet kopieret til din database. Tryk på <string>Næste</strong> for at fortsætte.',
-        databaseNotFound: '<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>\n<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank" rel="noopener">Mere information om at redigere web.config her.</a></p>',
         databaseText: 'For at afslutte dette skridt er du nødt til at have nogle informationer om din database parat ("database forbindelsesstrengen").<br/>Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.',
         databaseUpgrade: '<p>Tryk på <strong>Opgradér</strong> knappen for at opgradere din database til Umbraco %0%</p><p>Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!</p>',
         databaseUpgradeDone: 'Din database er blevet opgraderet til den endelige version %0%.<br/>Tryk på <strong>Næste</strong> for at fortsætte.',
@@ -1312,14 +1312,6 @@ export default {
         translation: 'Oversættelse',
         users: 'Brugere',
     },
-    help: {
-        tours: 'Tours',
-        theBestUmbracoVideoTutorials: 'De bedste Umbraco video tutorials',
-        umbracoForum: 'Besøg our.umbraco.com',
-        umbracoTv: 'Besøg umbraco.tv',
-        umbracoLearningBase: 'Watch our free tutorial videos',
-        umbracoLearningBaseDescription: 'on the Umbraco Learning Base',
-    },
     settings: {
         defaulttemplate: 'Standardskabelon',
         importDocumentTypeHelp: 'For at importere en dokumenttype, find ".udt"-filen på din computer ved at\n      klikke på "Gennemse"-knappen og klik "Import" (Du vil blive bedt om bekræftelse på næste skærmbillede)\n    ',
@@ -1934,10 +1926,10 @@ export default {
         permissionsGranularHelp: 'Sæt rettigheder for specifikke noder',
         granularRightsLabel: 'Dokumenter',
         granularRightsDescription: 'Tillad adgang til specifikke dokumenter',
-        permissionsEntityGroup_document: 'Indhold',
-        permissionsEntityGroup_media: 'Medie',
-        permissionsEntityGroup_member: 'Medlemmer',
-        'permissionsEntityGroup_document-property-value': 'Dokumentegenskabsværdi',
+        permissionsEntityGroup_document: 'Indholdsrettigheder',
+        permissionsEntityGroup_media: 'Medierettigheder',
+        permissionsEntityGroup_member: 'Medlemsrettigheder',
+        'permissionsEntityGroup_document-property-value': 'Feltrettigheder',
         permissionNoVerbs: 'Ingen tilladte rettigheder',
         profile: 'Profil',
         searchAllChildren: "Søg alle 'børn'",
@@ -2422,12 +2414,14 @@ export default {
         openWebsiteTitle: 'Åben forhåndsvisning i nyt vindue',
         returnToPreviewHeadline: 'Forhåndsvisning af indholdet?',
         returnToPreviewDescription: 'Du har afslutet forhåndsvisning, vil du starte forhåndsvisning igen for at\n      se seneste gemte version af indholdet?\n    ',
+        returnToPreviewAcceptButton: 'Start forhåndsvisning igen',
         returnToPreviewDeclineButton: 'Se udgivet indhold',
         viewPublishedContentHeadline: 'Se udgivet indhold?',
         viewPublishedContentDescription: 'Du er i forhåndsvisning, vil du afslutte for at se den udgivet\n      version?\n    ',
         viewPublishedContentAcceptButton: 'Se udgivet version',
         viewPublishedContentDeclineButton: 'Forbliv i forhåndsvisning',
-        returnToPreviewAcceptButton: 'Preview latest version',
+        connectionFailed: 'Kunne ikke etablere forbindelse til serveren, forhåndsvisning af liveopdateringer vil ikke fungere.',
+        connectionLost: 'Forbindelse til serveren mistet, forhåndsvisning af liveopdateringer vil ikke fungere.',
     },
     permissions: {
         FolderCreation: 'Mappeoprettelse',
@@ -2504,17 +2498,11 @@ export default {
         reminderDescription: '\n            <p>\n                You should never let a production site run in debug mode. Debug mode is turned off by setting <strong>Umbraco:CMS:Hosting:Debug</strong> to <strong>false</strong> in appsettings.json, appsettings.{Environment}.json or via an environment variable.\n            </p>\n        ',
         profilerEnabledDescription: "\n            <p>\n                Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.\n            </p>\n            <p>\n                Debug mode is turned on by setting <strong>Umbraco:CMS:Hosting:Debug</strong> to <strong>true</strong> in appsettings.json, appsettings.{Environment}.json or via an environment variable.\n            </p>\n        ",
     },
-    settingsDashboardVideos: {
-        trainingHeadline: 'Hours of Umbraco training videos are only a click away',
-        trainingDescription: '\n        <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>\n    ',
-        learningBaseDescription: '  <p>Vil du mestre Umbraco? Brug et par minutter på at lære nogle best practices ved at besøge <a class="btn-link -underline" href="https://www.youtube.com/c/UmbracoLearningBase" target="_blank" rel="noopener">Umbraco Learning Base YouTube-kanalen</a>. Her finder du en masse videoer, der dækker mange aspekter af Umbraco.</p> ',
-        getStarted: 'To get you started',
-    },
     settingsDashboard: {
         documentationHeader: 'Dokumentation',
         documentationDescription: 'Læs mere om at arbejde med elementerne i Indstillinger i vores Dokumentation.',
         communityHeader: 'Community',
-        communityDescription: 'Stil et spørgsmål i community forummet eller i vores Discord community',
+        communityDescription: 'Stil et spørgsmål i community forummet',
         trainingHeader: 'Træning',
         trainingDescription: 'Se mulighederne for real-life træning og certificering',
         supportHeader: 'Support',

package/dist-cms/assets/lang/de.js

@@ -1158,14 +1158,6 @@ export default {
         translation: 'Übersetzung',
         users: 'Benutzer',
     },
-    help: {
-        tours: 'Touren',
-        theBestUmbracoVideoTutorials: 'Die besten Umbraco-Video-Tutorials',
-        umbracoForum: 'Besuche our.umbraco.com',
-        umbracoTv: 'Besuche umbraco.tv',
-        umbracoLearningBase: 'Schaue gratis Tutorials',
-        umbracoLearningBaseDescription: 'von Umbraco Learning Base',
-    },
     settings: {
         defaulttemplate: 'Standardvorlage',
         importDocumentTypeHelp: 'Wählen Sie die lokale .udt-Datei aus, die den zu importierenden Dokumenttyp enthält und fahren Sie mit dem Import fort. Die endgültige Übernahme erfolgt im Anschluss erst nach einer weiteren Bestätigung.',

package/dist-cms/assets/lang/en-us.js

@@ -32,7 +32,6 @@ export default {
         color: 'Text color',
     },
     installer: {
-        databaseNotFound: '<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p><p>To proceed, please edit the "web.config" file (using Visual Studio or your favorite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.</p><p>Click the <strong>retry</strong> button when done.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">More information on editing web.config here</a>.</p>',
         showLabelDescription: 'Displays colored field and a label for each color in the color picker, rather than just a colored field.',
     },
     openidErrors: {