@sapui5/sap.ushell 1.142.0 → 1.143.0

package/src/main/js/sap/ushell/renderer/Shell.controller.js

@@ -1312,12 +1312,14 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            const sFixedShellHash = UrlParsing.ensureLeadingHash(sShellHash);
-            const sFixedOldShellHash = UrlParsing.ensureLeadingHash(sOldShellHash);
+            const sFullShellHash = `${sShellHash}${sInnerAppRoute ?? ""}`;
+            const oParsedHash = UrlParsing.parseShellHash(sFullShellHash, true);
+            const sOldFullShellHash = `${sOldShellHash}${sOldInnerAppRoute ?? ""}`;
+            const oOldParsedHash = UrlParsing.parseShellHash(sOldFullShellHash, true);
 
             // todo [FLPCOREANDUX-10024] where does this oParseError come from?
             if (oParseError) {
-                Log.error(`Error when parsing the hash: '${sFixedShellHash}'`, oParseError);
+                Log.error(`Error when parsing the hash: '${sFullShellHash}'`, oParseError);
                 this.hashChangeFailure(
                     this.history.getHistoryLength(),
                     oParseError.message,
@@ -1333,7 +1335,7 @@ sap.ui.define([
 
             const fnResolveInteraction = this._notifyAsyncStep();
 
-            this._doHashChange(sFixedShellHash, sInnerAppRoute, sFixedOldShellHash)
+            this._doHashChange(oParsedHash, oOldParsedHash)
                 .catch(() => {
                     EventHub.emit("doHashChangeError", Date.now());
                 })
@@ -1348,12 +1350,21 @@ sap.ui.define([
             return oDeferred.promise();
         },
 
-        _doHashChange: async function (sShellHash, sInnerAppRoute, sOldShellHash) {
+        _doHashChange: async function (oParsedHash, oOldParsedHash) {
+            // todo: [FLPCOREANDUX-10024] simplify Renderer History
             // save current history length to handle errors (in case)
             const iOriginalHistoryLength = this.history.getHistoryLength();
 
             // track hash change
-            this.history.hashChange(sShellHash, sOldShellHash);
+            const sShellHashWithoutAppRoute = UrlParsing.constructShellHash({
+                ...oParsedHash,
+                appSpecificRoute: undefined
+            }, true);
+            const sOldShellHashWithoutAppRoute = UrlParsing.constructShellHash({
+                ...oOldParsedHash,
+                appSpecificRoute: undefined
+            }, true);
+            this.history.hashChange(sShellHashWithoutAppRoute, sOldShellHashWithoutAppRoute);
 
             // we save the current-application before resolving the next navigation's fragment,
             // as in cases of navigation in a new window we need to set it back for the app-configuration to be consistent
@@ -1361,17 +1372,14 @@ sap.ui.define([
 
             try {
                 // NOTE: AppConfiguration.setCurrentApplication was called with the currently resolved target.
-                const oResult = await this._resolveHashFragment(sShellHash, sInnerAppRoute);
+                const oResolvedHashFragment = await this._resolveHashFragment(oParsedHash);
 
                 // Only for testing
-                if (!oResult && window.QUnit !== undefined) {
+                if (!oResolvedHashFragment && window.QUnit !== undefined) {
                     // return without navigation if no result was returned.
                     return;
                 }
 
-                const oResolvedHashFragment = oResult.resolvedHashFragment;
-                const oParsedShellHash = oResult.parsedShellHash;
-
                 // todo: [FLPCOREANDUX-10024] is this a real life use case?
                 /*
                  * A null navigationMode indicates that no hashFragment was resolved.
@@ -1398,7 +1406,7 @@ sap.ui.define([
 
                 const bOpenedViaNWBC = await this._openAppViaNWBC(oResolvedHashFragment, oOldResolvedHashFragment);
                 if (bOpenedViaNWBC === true) {
-                    this.logOpenAppAction(oResolvedHashFragment, sInnerAppRoute).catch(() => {
+                    this.logOpenAppAction(oResolvedHashFragment, oParsedHash).catch(() => {
                         Log.info("NWBC application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
                     });
 
@@ -1408,7 +1416,7 @@ sap.ui.define([
 
                 if (oResolvedHashFragment.navigationMode === NavigationMode.newWindow) {
                     // add the app to application usage log
-                    this.logOpenAppAction(oResolvedHashFragment, sInnerAppRoute).catch(() => {
+                    this.logOpenAppAction(oResolvedHashFragment, oParsedHash).catch(() => {
                         Log.info("Application in new window was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
                     });
                     await this._openAppExplace(oResolvedHashFragment, oOldResolvedHashFragment);
@@ -1418,7 +1426,7 @@ sap.ui.define([
                 }
 
                 // Handle "/core/shell/model/migrationConfig"
-                const bHandledViaMigrationConfig = this._rewriteRootIntentForMigrationConfig(oResolvedHashFragment, sShellHash);
+                const bHandledViaMigrationConfig = this._rewriteRootIntentForMigrationConfig(oResolvedHashFragment, oParsedHash);
                 if (bHandledViaMigrationConfig) {
                     StateManager.applyStalledChanges(); // no changes were done by the source application
                     return;
@@ -1428,12 +1436,13 @@ sap.ui.define([
                 try {
                     const bPreviousIsInitialNavigation = this.oShellNavigationInternal.isInitialNavigation();
                     try {
-                        await this._openAppInplace(oParsedShellHash, sShellHash, oResolvedHashFragment, sOldShellHash, sInnerAppRoute, oOldResolvedHashFragment);
+                        await this._openAppInplace(oParsedHash, oResolvedHashFragment, oOldParsedHash, oOldResolvedHashFragment);
                     } catch (oError) {
+                        const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
                         Log.error(`Application initialization for intent "${sShellHash}" failed.`, oError);
 
                         // assumption is that the resolvedHashFragment already contains the componentHandle
-                        const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
+                        const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oParsedHash);
                         this.oShellNavigationInternal.setIsInitialNavigation(bPreviousIsInitialNavigation);
                         await this.hashChangeFailure(
                             iOriginalHistoryLength,
@@ -1444,6 +1453,7 @@ sap.ui.define([
                         );
                     }
                 } catch (oError) {
+                    const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
                     Log.error("Failed to open application", oError, "sap.ushell.renderer.Shell.controller");
 
                     const sErrorReason = ushellResources.i18n.getText("cannot_load_ui5_component_details", [sShellHash]);
@@ -1466,6 +1476,7 @@ sap.ui.define([
                     );
                 }
             } catch (oError) {
+                const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
                 Log.error("Hash change handling failed. Could not open app.", oError, "sap.ushell.renderer.Shell.controller");
                 const sErrorReason = ushellResources.i18n.getText("cannot_resolve_navigation_target_details", [sShellHash]);
                 // eslint-disable-next-line max-len
@@ -1491,22 +1502,24 @@ sap.ui.define([
             }
         },
 
-        _rewriteRootIntentForMigrationConfig: function (oResolvedHashFragment, sShellHash) {
+        _rewriteRootIntentForMigrationConfig: function (oResolvedHashFragment, oParsedHash) {
             // In case of empty hash, if there is a resolved target, set the flag to false, from now on the rootIntent
             // will be an empty hash. Otherwise, change hash to rootIntent to trigger normal resolution.
             if (Config.last("/core/shell/model/migrationConfig")) {
                 oConfig.migrationConfig = false;
                 this._getConfigModel().setProperty("/migrationConfig", false);
 
-                // todo: [FLPCOREANDUX-10024] is this an actual use case? oResolvedHashFragment seems to be always defined
-                if (oResolvedHashFragment && sShellHash === "#") {
-                    oConfig.rootIntent = "";
-                } else if (sShellHash === "#") {
-                    window.setTimeout(() => {
-                        hasher.setHash(oConfig.rootIntent);
-                    }, 0);
+                if (UrlParsing.isEmptyHash(oParsedHash)) {
+                    // todo: [FLPCOREANDUX-10024] is this an actual use case? oResolvedHashFragment seems to be always defined
+                    if (oResolvedHashFragment) {
+                        oConfig.rootIntent = "";
+                    } else {
+                        window.setTimeout(() => {
+                            hasher.setHash(oConfig.rootIntent);
+                        }, 0);
 
-                    return true;
+                        return true;
+                    }
                 }
             }
             return false;
@@ -1548,15 +1561,12 @@ sap.ui.define([
         /**
          * Callback registered with NavService. Triggered on navigation requests
          *
-         * @param {string} sShellHash the hash fragment to parse (must start with "#")
-         * @param {string|null} sInnerAppRoute the inner app route starting with '&/'
-         * @returns {Promise<{ resolvedHashFragment: object , parsedShellHash: object }>} Resolves with an object containing the resolved hash fragment (i.e., the result of
-         *   {@link sap.ushell.services.NavTargetResolutionInternal#resolveHashFragment}), the parsed shell hash obtained via
-         *   {@link sap.ushell.services.URLParsing#parseShellHash}, and a boolean value indicating whether application dependencies
-         *   <b>and</b> core-ext-light were loaded earlier. The promise is rejected with an error message in case errors occur.
+         * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash The parsed shell hash
+         * @returns {Promise<object>} Resolves with an object containing the resolved hash fragment (i.e., the result of
+         *   {@link sap.ushell.services.NavTargetResolutionInternal#resolveHashFragment})
          */
-        _resolveHashFragment: async function (sShellHash, sInnerAppRoute) {
-            const oParsedShellHash = UrlParsing.parseShellHash(sShellHash) || {}; // might be empty in tests
+        _resolveHashFragment: async function (oParsedHash) {
+            const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
             const oConfig = this._getConfig(); // for testing
             let oResolvedHashFragment;
 
@@ -1574,7 +1584,7 @@ sap.ui.define([
             } else {
                 // Perform target resolution as normal...
                 const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
-                oResolvedHashFragment = await ushellUtils.promisify(NavTargetResolutionInternal.resolveHashFragment(sShellHash + (sInnerAppRoute ?? "")));
+                oResolvedHashFragment = await ushellUtils.promisify(NavTargetResolutionInternal.resolveHashFragment(sShellHash));
             }
 
             // Only for testing: return without result if the NavTargetResolutionInternal resolved nothing
@@ -1592,7 +1602,7 @@ sap.ui.define([
             AppConfiguration.setCurrentApplication(oResolvedHashFragment);
 
             // add application config to the application properties
-            const sBasicHash = UrlParsing.getBasicHash(sShellHash);
+            const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
             if (oConfig?.applications?.[sBasicHash]) {
                 oResolvedHashFragment.applicationConfiguration = oConfig.applications[sBasicHash];
             }
@@ -1602,7 +1612,7 @@ sap.ui.define([
 
             // Override navigation mode for root intent.
             // Shell home should be opened in embedded mode to allow a new window to be opened from GUI applications.
-            if (`${oParsedShellHash.semanticObject}-${oParsedShellHash.action}` === oConfig.rootIntent) {
+            if (UrlParsing.isRootIntent(oParsedHash)) {
                 oResolvedHashFragment.navigationMode = NavigationMode.embedded;
             }
 
@@ -1620,10 +1630,7 @@ sap.ui.define([
 
             ushellUtils.setPerformanceMark("FLP-ShellController-resolveHashFragment-end");
 
-            return {
-                resolvedHashFragment: oResolvedHashFragment,
-                parsedShellHash: oParsedShellHash
-            };
+            return oResolvedHashFragment;
         },
 
         /**
@@ -1691,15 +1698,13 @@ sap.ui.define([
         /**
          * Performs navigation based on the given resolved hash fragment.
          *
-         * @param {object} oParsedShellHash the parsed shell hash obtained via {@link sap.ushell.services.URLParsing} service.
-         * @param {string} sShellHash the hash fragment to navigate to. It must start with "#" (i.e., fixed).
+         * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash the parsed shell hash.
          * @param {object} oResolvedHashFragment the hash fragment resolved via {@link sap.ushell.services.NavTargetResolutionInternal#resolveHashFragment}
-         * @param {string} sOldShellHash the old hash fragment. It must start with "#" (i.e., fixed).
-         * @param {string|null} sInnerAppRoute the inner app route.
+         * @param {sap.ushell.services.URLParsing.DecomposedHash} oOldParsedShellHash the old parsed shell hash.
          *
          * @returns {Promise} Navigation Promise
          */
-        _openAppInplace: async function (oParsedShellHash, sShellHash, oResolvedHashFragment, sOldShellHash, sInnerAppRoute) {
+        _openAppInplace: async function (oParsedHash, oResolvedHashFragment, oOldParsedShellHash) {
             // The url template resolution allows to set the appSpecificRoute to be set via parameter.
             // Therefore we need to update the innerAppRoute before actually opening the app.
             if (oResolvedHashFragment.replaceHashBeforeOpenAppInplace) {
@@ -1753,12 +1758,12 @@ sap.ui.define([
 
             AppLifeCycleAI.resetGlobalShellUIService();
 
-            const bNavigationFromHome = this._isFLPIntent(sOldShellHash);
+            // historically this also includes the app finder
+            const bNavigationFromHome = this._isFLPIntent(oOldParsedShellHash);
 
             const oApplicationHandle = await AppLifeCycleAI.startApplication(
-                oParsedShellHash,
                 oResolvedHashFragment,
-                sInnerAppRoute || "",
+                oParsedHash,
                 bNavigationFromHome
             );
 
@@ -1772,11 +1777,8 @@ sap.ui.define([
                 return ShellNavigationInternal.toExternal({ target: { shellHash: sNavigationRedirectHash } }, undefined, false);
             }
 
-            const oShellConfig = this._getConfig();
-
-            const sBasicShellHash = UrlParsing.getBasicHash(sShellHash);
             // this only targets the overwritten rootIntent (e.g. workzone advanced)
-            const bIsNavToHome = sShellHash === "#" || (oShellConfig.rootIntent && sBasicShellHash === UrlParsing.getBasicHash(oShellConfig.rootIntent));
+            const bIsNavToHome = UrlParsing.isEmptyHash(oParsedHash) || UrlParsing.isRootIntent(oParsedHash);
             await oApplicationHandle.navTo(bIsNavToHome); // todo: [FLPCOREANDUX-10024] triggers appLoaded event and switches the state
 
             // todo: [FLPCOREANDUX-10024] Move this into the regular flow
@@ -1785,7 +1787,7 @@ sap.ui.define([
              * Normally FESR record is closed on the "AppRendered" event, but for some cases (stateful container, etc.)
              * the application container is not re-rendered and EmbeddedNavigationDone is additionally fired to close the record.
              */
-            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
+            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oParsedHash);
             EventHub.emit("CloseFesrRecord", { time: Date.now(), technicalName: oMetadata.technicalName });
             return;
         },
@@ -1944,10 +1946,6 @@ sap.ui.define([
             EventHub.emit("openedAppInNewWindow", Date.now());
         },
 
-        _isShellHomeIntent: function (sIntent) {
-            return sIntent === "#" || sIntent === oConfig.rootIntent;
-        },
-
         /**
          * Shows an error message and navigates to the previous page.
          *
@@ -2061,14 +2059,14 @@ sap.ui.define([
             }
             this._setSideNavigationVisible(true);
 
-            const sAppHash = this.oShellNavigationInternal.hashChanger.getAppHash();
-            const sInnerAppRoute = sAppHash ? `&/${sAppHash}` : null;
+            const sShellHash = oResolvedHashFragment.sFixedShellHash;
+            const oParsedHash = UrlParsing.parseShellHash(sShellHash);
 
-            this.logOpenAppAction(oResolvedHashFragment, sInnerAppRoute).catch(() => {
-                Log.info("Opened application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
+            this.logOpenAppAction(oResolvedHashFragment, oParsedHash).catch((oError) => {
+                Log.info("Opened application was not logged.", oError, "sap.ushell.renderer.Shell.controller");
             });
 
-            this._notifyUITracer(oResolvedHashFragment);
+            this._notifyUITracer(oResolvedHashFragment, oParsedHash);
         },
 
         externalSearchTriggered: function (sChannelId, sEventId, oData) {
@@ -2093,55 +2091,48 @@ sap.ui.define([
          * Logs an application to the recent activities.
          *
          * @param {object} oResolvedHashFragment The resolved target intent
-         * @param {string} sInnerAppRoute The inner app route part of the intent
+         * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash The decomposed shell hash
          * @returns {Promise} A promise that is resolved once the action is logged
          * @throws {Error} If the application was not logged.
          */
-        logOpenAppAction: async function (oResolvedHashFragment, sInnerAppRoute) {
+        logOpenAppAction: async function (oResolvedHashFragment, oParsedHash) {
             const bEnableRecentActivity = Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging");
             if (!bEnableRecentActivity) {
                 throw new Error("Tracking of RecentActivity is disabled.");
             }
 
-            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
-            // If the app is kept alive in the background, the fixedShellHash is often not supplied.
-            // In these cases, we then try to get the hash from the current location.
-            const sShellHash = oResolvedHashFragment.sFixedShellHash || this._getCurrentLocationHash();
+            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oParsedHash);
+
             const oRecentEntry = {
                 title: oMetadata.title,
                 appType: AppType.APP, // default app type the shell adds is 'Application'
-                url: sInnerAppRoute ? sShellHash + sInnerAppRoute : sShellHash
+                url: UrlParsing.constructShellHash(oParsedHash, true)
             };
 
-            const oParsed = UrlParsing.parseShellHash(sShellHash);
-            if (oParsed) {
-                // This is the key that determines whether an existing activity should be updated or added.
+            // This is the key that determines whether an existing activity should be updated or added.
 
-                // In theory we could use the full hash without parameters here, however this causes the same application to be logged
-                // multiple times with the same title, confusing the user.
+            // In theory we could use the full hash without parameters here, however this causes the same application to be logged
+            // multiple times with the same title, confusing the user.
 
-                // Therefore we choose to update a previous entry in case just the parameters change. This might cause a bit of
-                // confusion in case another target mapping is opened, as the title of a previously logged entry would be updated
-                // instead of having a new title added to the recent activities (same target mapping but different title).
+            // Therefore we choose to update a previous entry in case just the parameters change. This might cause a bit of
+            // confusion in case another target mapping is opened, as the title of a previously logged entry would be updated
+            // instead of having a new title added to the recent activities (same target mapping but different title).
 
-                // Perhaps this could be further fixed by hashing a target mapping on the client before returning the resolution
-                // result, and using the hash as the id.
-                oRecentEntry.appId = `#${UrlParsing.constructShellHash({
-                    semanticObject: oParsed.semanticObject,
-                    action: oParsed.action
-                })}`;
-            } else {
-                oRecentEntry.appId = sShellHash;
-            }
+            // Perhaps this could be further fixed by hashing a target mapping on the client before returning the resolution
+            // result, and using the hash as the id.
+            oRecentEntry.appId = UrlParsing.constructBasicHash(oParsedHash, true);
 
             // The recent activity for searches is done in a different way, see this._logSearchActivity
-            if (sShellHash && sShellHash.indexOf("#Action-search") === -1 && sShellHash.indexOf("#Shell-startIntent") === -1) {
-                await ushellUtils.awaitTimeout(1500);
-                await this._logRecentActivity(oRecentEntry);
-                return;
+            const aSpecialCases = [
+                "#Action-search",
+                "#Shell-startIntent"
+            ];
+            if (aSpecialCases.includes(oRecentEntry.appId)) {
+                throw new Error("RecentActivity was not logged.");
             }
 
-            throw new Error("RecentActivity was not logged.");
+            await ushellUtils.awaitTimeout(1500);
+            await this._logRecentActivity(oRecentEntry);
         },
 
         /**
@@ -2149,13 +2140,19 @@ sap.ui.define([
          * a corresponding event on the event hub.
          *
          * @param {object} oResolvedHashFragment - the result of the NavTargetResolutionInternal service
+         * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash - the parsed shell hash
          */
-        _notifyUITracer: function (oResolvedHashFragment) {
+        _notifyUITracer: function (oResolvedHashFragment, oParsedHash) {
             try {
-                const sApplicationId =
-                    oResolvedHashFragment.reservedParameters?.["sap-fiori-id"]?.[0] ||
-                    oResolvedHashFragment.reservedParameters?.["sap-ui-app-id-hint"]?.[0] ||
-                    oResolvedHashFragment.ui5ComponentName;
+                const sApplicationId = oResolvedHashFragment.reservedParameters?.["sap-fiori-id"]?.[0]
+                    || oResolvedHashFragment.reservedParameters?.["sap-ui-app-id-hint"]?.[0]
+                    || oResolvedHashFragment.ui5ComponentName;
+
+                const oParsedHashWithoutInnerAppRoute = {
+                    ...oParsedHash,
+                    appSpecificRoute: undefined
+                };
+                const sHash = UrlParsing.constructShellHash(oParsedHashWithoutInnerAppRoute, true);
 
                 EventHub.emit("UITracer.trace", {
                     reason: "NavigateApp",
@@ -2163,7 +2160,7 @@ sap.ui.define([
                     data: {
                         applicationId: sApplicationId || "",
                         applicationType: oResolvedHashFragment.applicationType || "",
-                        hash: oResolvedHashFragment.sFixedShellHash || "",
+                        hash: sHash,
                         targetNavigationMode: oResolvedHashFragment.targetNavigationMode || "",
                         providerId: oResolvedHashFragment.contentProviderId || "",
                         targetUrl: oResolvedHashFragment.url || ""
@@ -2541,8 +2538,8 @@ sap.ui.define([
             EventHub.emit("showNotifications", bSelected);
         },
 
-        _isFLPIntent: function (sHash) {
-            const sBasicHash = UrlParsing.getBasicHash(sHash);
+        _isFLPIntent: function (oParsedHash) {
+            const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
             const aFLPIntents = [
                 "Shell-home",
                 "Shell-appfinder",

package/src/main/js/sap/ushell/renderer/resources/resources.properties

@@ -1474,7 +1474,7 @@ AppearanceContentDensityLabel=Optimized for Touch Input
 #XFLD
 AnchorBarLabel=Home Page Display
 #XTIT
-AppearanceThemeMenu=Theme
+AppearanceThemeMenu=Themes
 #XTIT
 AppearanceLayoutAndBehaviorMenu=Display Settings
 

package/src/main/js/sap/ushell/renderer/resources/resources_ar.properties

@@ -825,7 +825,7 @@ DontDisplayImg=\u0639\u062F\u0645 \u0639\u0631\u0636 \u0627\u0644\u0635\u0648\u0
 
 AnchorNavigationBar_AriaLabel=\u062A\u0646\u0642\u0644 \u0641\u064A \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629
 SidePane_AriaLabel=\u0627\u0644\u0645\u062D\u062A\u0648\u0649 \u0627\u0644\u062B\u0627\u0646\u0648\u0649
-ShellContent.AriaLabel=\u0645\u062D\u062A\u0648\u0649 Shell
+ShellContent.AriaLabel=\u0627\u0644\u0645\u062D\u062A\u0648\u0649
 ToolArea_AriaLabel=\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0623\u062F\u0627\u0629
 FloatingContainer_AriaLabel=\u062D\u0627\u0648\u064A\u0629 \u0639\u0627\u0626\u0645\u0629
 ShellNavigationMenu_HierarchyItemsAriaLabel=\u062A\u0646\u0642\u0644 \u0647\u0631\u0645\u064A
@@ -859,8 +859,8 @@ ToggleButtonShow=\u0625\u0638\u0647\u0627\u0631 \u0627\u0644\u0642\u0627\u0626\u
 ToggleButtonHide=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0642\u0627\u0626\u0645\u0629
 embeddedNavigationMode=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
 newWindowNavigationMode=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629
-replaceNavigationMode=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0627\u0644\u0646\u0627\u0641\u0630\u0629 \u0628\u062F\u0648\u0646 shell \u0644\u0644\u0648\u062D\u0629 \u0627\u0644\u062A\u0634\u063A\u064A\u0644
-newWindowThenEmbeddedNavigationMode=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629 \u0628\u062F\u0648\u0646 shell \u0644\u0644\u0648\u062D\u0629 \u0627\u0644\u062A\u0634\u063A\u064A\u0644
+replaceNavigationMode=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0627\u0644\u0645\u0643\u0627\u0646 \u0628\u062F\u0648\u0646 \u0634\u0631\u064A\u0637 shell \u0644\u0644\u0648\u062D\u0629 \u0627\u0644\u062A\u0634\u063A\u064A\u0644
+newWindowThenEmbeddedNavigationMode=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629 \u0628\u062F\u0648\u0646 \u0634\u0631\u064A\u0637 shell \u0644\u0644\u0648\u062D\u0629 \u0627\u0644\u062A\u0634\u063A\u064A\u0644
 
 Page.NoSectionText=\u0644\u0627 \u062A\u0648\u062C\u062F \u0625\u0637\u0627\u0631\u0627\u062A. \u0627\u0644\u0635\u0641\u062D\u0629 \u0641\u0627\u0631\u063A\u0629.
 Page.Button.AddSection=\u0625\u0636\u0627\u0641\u0629 \u0642\u0633\u0645

package/src/main/js/sap/ushell/renderer/resources/resources_bg.properties

@@ -825,7 +825,7 @@ DontDisplayImg=\u0414\u0430 \u043D\u0435 \u0441\u0435 \u043F\u043E\u043A\u0430\u
 
 AnchorNavigationBar_AriaLabel=\u0413\u0440\u0443\u043F\u043E\u0432\u0430 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
 SidePane_AriaLabel=\u0412\u0442\u043E\u0440\u0438\u0447\u043D\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
-ShellContent.AriaLabel=\u0421\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0430 \u043E\u0431\u0432\u0438\u0432\u043A\u0430
+ShellContent.AriaLabel=\u0421\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
 ToolArea_AriaLabel=\u041E\u0431\u043B\u0430\u0441\u0442 \u043D\u0430 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442
 FloatingContainer_AriaLabel=\u041F\u043B\u0430\u0432\u0430\u0449 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440
 ShellNavigationMenu_HierarchyItemsAriaLabel=\u0419\u0435\u0440\u0430\u0440\u0445\u0438\u0447\u043D\u0430 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
@@ -859,8 +859,8 @@ ToggleButtonShow=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u
 ToggleButtonHide=\u0421\u043A\u0440\u0438\u0432\u0430\u043D\u0435 \u043D\u0430 \u043C\u0435\u043D\u044E
 embeddedNavigationMode=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u043C\u044F\u0441\u0442\u043E
 newWindowNavigationMode=\u041E\u0442\u0432\u0430\u0440\u044F \u0441\u0435 \u0432 \u043D\u043E\u0432 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446
-replaceNavigationMode=\u041E\u0442\u0432\u0430\u0440\u044F \u0441\u0435 \u043D\u0430 \u043C\u044F\u0441\u0442\u043E \u0431\u0435\u0437 \u0433\u0440\u0430\u0444\u0438\u0447\u043D\u0430\u0442\u0430 \u043E\u0431\u0432\u0438\u0432\u043A\u0430 \u043D\u0430 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043D\u0438\u044F \u043F\u0430\u043D\u0435\u043B
-newWindowThenEmbeddedNavigationMode=\u041E\u0442\u0432\u0430\u0440\u044F \u0441\u0435 \u0432 \u043D\u043E\u0432 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446 \u0431\u0435\u0437 \u0433\u0440\u0430\u0444\u0438\u0447\u043D\u0430\u0442\u0430 \u043E\u0431\u0432\u0438\u0432\u043A\u0430 \u043D\u0430 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043D\u0438\u044F \u043F\u0430\u043D\u0435\u043B
+replaceNavigationMode=\u041E\u0442\u0432\u0430\u0440\u044F \u0441\u0435 \u043D\u0430 \u043C\u044F\u0441\u0442\u043E \u0431\u0435\u0437 \u043B\u0435\u043D\u0442\u0430\u0442\u0430 \u0437\u0430 \u043A\u043E\u043C\u0430\u043D\u0434\u043D\u0438\u044F \u043D\u0430\u0447\u0430\u043B\u0435\u043D \u0440\u0435\u0434 \u043D\u0430 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043D\u0438\u044F \u043F\u0430\u043D\u0435\u043B
+newWindowThenEmbeddedNavigationMode=\u041E\u0442\u0432\u0430\u0440\u044F \u0441\u0435 \u0432 \u043D\u043E\u0432 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446 \u0431\u0435\u0437 \u043B\u0435\u043D\u0442\u0430\u0442\u0430 \u0437\u0430 \u043A\u043E\u043C\u0430\u043D\u0434\u043D\u0438\u044F \u043D\u0430\u0447\u0430\u043B\u0435\u043D \u0440\u0435\u0434 \u043D\u0430 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043D\u0438\u044F \u043F\u0430\u043D\u0435\u043B
 
 Page.NoSectionText=\u041D\u044F\u043C\u0430 \u043F\u043B\u043E\u0447\u043A\u0438. \u0421\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u0442\u0430 \u0435 \u043F\u0440\u0430\u0437\u043D\u0430.
 Page.Button.AddSection=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0440\u0430\u0437\u0434\u0435\u043B

package/src/main/js/sap/ushell/renderer/resources/resources_ca.properties

@@ -825,7 +825,7 @@ DontDisplayImg=No mostrar la imatge
 
 AnchorNavigationBar_AriaLabel=Navegaci\u00F3 de grup
 SidePane_AriaLabel=Contingut secundari
-ShellContent.AriaLabel=Contingut de shell
+ShellContent.AriaLabel=Contingut
 ToolArea_AriaLabel=\u00C0rea d'eines
 FloatingContainer_AriaLabel=Contenidor flotant
 ShellNavigationMenu_HierarchyItemsAriaLabel=Navegaci\u00F3 jer\u00E0rquica
@@ -859,8 +859,8 @@ ToggleButtonShow=Mostrar men\u00FA
 ToggleButtonHide=Ocultar men\u00FA
 embeddedNavigationMode=S\u2019obre al lloc
 newWindowNavigationMode=S\u2019obre en una finestra nova
-replaceNavigationMode=S\u2019obre al lloc sense un shell de plataforma de llan\u00E7ament
-newWindowThenEmbeddedNavigationMode=S\u2019obre en una finestra nova sense un shell de plataforma de llan\u00E7ament
+replaceNavigationMode=S'obre al lloc sense barra superior de rampa de llan\u00E7ament
+newWindowThenEmbeddedNavigationMode=S\u2019obre en una finestra nova sense barra superior de rampa de llan\u00E7ament
 
 Page.NoSectionText=No hi ha cap mosaic. La p\u00E0gina \u00E9s buida.
 Page.Button.AddSection=Afegir secci\u00F3

package/src/main/js/sap/ushell/renderer/resources/resources_cnr.properties

@@ -825,7 +825,7 @@ DontDisplayImg=Nemoj prikazati sliku
 
 AnchorNavigationBar_AriaLabel=Grupno usmjeravanje
 SidePane_AriaLabel=Sekundarni sadr\u017Eaj
-ShellContent.AriaLabel=Sadr\u017Eaj komandi
+ShellContent.AriaLabel=Sadr\u017Eaj
 ToolArea_AriaLabel=Oblast alata
 FloatingContainer_AriaLabel=Pokretni spremnik
 ShellNavigationMenu_HierarchyItemsAriaLabel=Hijerarhijsko usmjeravanje
@@ -859,8 +859,8 @@ ToggleButtonShow=Poka\u017Ei meni
 ToggleButtonHide=Sakrij meni
 embeddedNavigationMode=Otvara se na mjestu
 newWindowNavigationMode=Otvara se u novom prozoru
-replaceNavigationMode=Otvara se na mjestu bez launchpad shell-a
-newWindowThenEmbeddedNavigationMode=Otvara se u novom prozoru bez launchpad shell-a
+replaceNavigationMode=Otvara se u trenutnom prikazu bez trake okru\u017Eenja launchpad-a
+newWindowThenEmbeddedNavigationMode=Otvara se u novom prozoru bez trake okru\u017Eenja launchpad-a
 
 Page.NoSectionText=Nema podekrana. Stranica je prazna.
 Page.Button.AddSection=Dodaj odjeljak

package/src/main/js/sap/ushell/renderer/resources/resources_cs.properties

@@ -825,7 +825,7 @@ DontDisplayImg=Nezobrazovat obr\u00E1zek
 
 AnchorNavigationBar_AriaLabel=Skupinov\u00E1 navigace
 SidePane_AriaLabel=Sekund\u00E1rn\u00ED obsah
-ShellContent.AriaLabel=Obsah shell
+ShellContent.AriaLabel=Obsah
 ToolArea_AriaLabel=Oblast n\u00E1stroj\u016F
 FloatingContainer_AriaLabel=Pohybliv\u00FD kontejner
 ShellNavigationMenu_HierarchyItemsAriaLabel=Hierarchick\u00E1 navigace
@@ -859,8 +859,8 @@ ToggleButtonShow=Zobrazit menu
 ToggleButtonHide=Skr\u00FDt menu
 embeddedNavigationMode=Otev\u0159e na m\u00EDst\u011B
 newWindowNavigationMode=Otev\u0159e v nov\u00E9m okn\u011B
-replaceNavigationMode=Otev\u0159e na m\u00EDst\u011B bez launchpad shell
-newWindowThenEmbeddedNavigationMode=Otev\u0159e v nov\u00E9m okn\u011B bez launchpad shell
+replaceNavigationMode=Otev\u0159e na m\u00EDst\u011B bez launchpadu pruh shell
+newWindowThenEmbeddedNavigationMode=Otev\u0159e v nov\u00E9m okn\u011B bez launchpadu pruh shell
 
 Page.NoSectionText=\u017D\u00E1dn\u00E9 dla\u017Edice neexistuj\u00ED. Str\u00E1nka je pr\u00E1zdn\u00E1.
 Page.Button.AddSection=P\u0159idat sekci

package/src/main/js/sap/ushell/renderer/resources/resources_cy.properties

@@ -825,7 +825,7 @@ DontDisplayImg=Peidio \u00E2 Dangos Delwedd
 
 AnchorNavigationBar_AriaLabel=Llywio Gr\u0175p
 SidePane_AriaLabel=Cynnwys Eilaidd
-ShellContent.AriaLabel=Cynnwys Cragen
+ShellContent.AriaLabel=Cynnwys
 ToolArea_AriaLabel=Adran Offer
 FloatingContainer_AriaLabel=Cynhwysydd Rhydd
 ShellNavigationMenu_HierarchyItemsAriaLabel=Llywio Hierarchaidd
@@ -859,8 +859,8 @@ ToggleButtonShow=Dangos Dewislen
 ToggleButtonHide=Cuddio Dewislen
 embeddedNavigationMode=Yn agor mewn lle
 newWindowNavigationMode=Yn agor mewn ffenestr newydd
-replaceNavigationMode=Yn agor mewn lle heb gragen pad lawnsio
-newWindowThenEmbeddedNavigationMode=Yn agor mewn ffenestr newydd heb gragen pad lansio
+replaceNavigationMode=Yn agor mewn lle heb Far Cragen pad lawnsio
+newWindowThenEmbeddedNavigationMode=Yn agor mewn ffenestr newydd heb Far Cragen pad lansio
 
 Page.NoSectionText=Does dim teils. Mae\u2019r dudalen yn wag.
 Page.Button.AddSection=Ychwanegu Adran

package/src/main/js/sap/ushell/renderer/resources/resources_da.properties

@@ -825,7 +825,7 @@ DontDisplayImg=Vis ikke billede
 
 AnchorNavigationBar_AriaLabel=Gruppenavigation
 SidePane_AriaLabel=Sekund\u00E6rt indhold
-ShellContent.AriaLabel=Shell-indhold
+ShellContent.AriaLabel=Indhold
 ToolArea_AriaLabel=V\u00E6rkt\u00F8jsomr\u00E5de
 FloatingContainer_AriaLabel=Container uden systemtilknytning
 ShellNavigationMenu_HierarchyItemsAriaLabel=Hierarkisk navigation
@@ -859,8 +859,8 @@ ToggleButtonShow=Vis menu
 ToggleButtonHide=Skjul menu
 embeddedNavigationMode=\u00C5bner p\u00E5 et sted
 newWindowNavigationMode=\u00C5bner i et nyt vindue
-replaceNavigationMode=\u00C5bner p\u00E5 et sted uden et launchpad-shell
-newWindowThenEmbeddedNavigationMode=\u00C5bner i et nyt vindue uden et launchpad-shell
+replaceNavigationMode=\u00C5bner p\u00E5 et sted uden en launchpad-shell-linje
+newWindowThenEmbeddedNavigationMode=\u00C5bner i et nyt vindue uden en launchpad-shell-linje
 
 Page.NoSectionText=Der er ingen fliser. Siden er tom.
 Page.Button.AddSection=Tilf\u00F8j afsnit

package/src/main/js/sap/ushell/renderer/resources/resources_de.properties

@@ -825,7 +825,7 @@ DontDisplayImg=Bild nicht anzeigen
 
 AnchorNavigationBar_AriaLabel=Gruppennavigation
 SidePane_AriaLabel=Sekund\u00E4rinhalt
-ShellContent.AriaLabel=Shell-Inhalt
+ShellContent.AriaLabel=Inhalt
 ToolArea_AriaLabel=Werkzeugbereich
 FloatingContainer_AriaLabel=Beweglicher (Floating) Container
 ShellNavigationMenu_HierarchyItemsAriaLabel=Hierarchische Navigation
@@ -859,8 +859,8 @@ ToggleButtonShow=Men\u00FC einblenden
 ToggleButtonHide=Men\u00FC ausblenden
 embeddedNavigationMode=\u00D6ffnet direkt
 newWindowNavigationMode=\u00D6ffnet ein neues Fenster
-replaceNavigationMode=\u00D6ffnet direkt ohne Launchpad-Shell
-newWindowThenEmbeddedNavigationMode=\u00D6ffnet ein neues Fenster ohne Launchpad-Shell
+replaceNavigationMode=Opens in place without a launchpad Shell Bar
+newWindowThenEmbeddedNavigationMode=Opens in a new window without a launchpad Shell Bar
 
 Page.NoSectionText=Keine Kacheln vorhanden. Die Seite ist leer.
 Page.Button.AddSection=Abschnitt hinzuf\u00FCgen