@sapui5/sap.ushell 1.134.1 → 1.135.0

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

@@ -19,8 +19,9 @@ sap.ui.define([
     "sap/ui/performance/trace/Interaction",
     "sap/ui/thirdparty/hasher",
     "sap/ui/thirdparty/jquery",
+    "sap/ushell/appIntegration/AppLifeCycle",
+    "sap/ushell/appIntegration/PostMessageManager",
     "sap/ushell/bootstrap/SchedulingAgent",
-    "sap/ushell/components/applicationIntegration/AppLifeCycle",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/ushell/library",
@@ -37,7 +38,6 @@ sap.ui.define([
     "sap/ushell/state/StateManager",
     "sap/ushell/renderers/fiori2/LogonFrameProvider", // restore deprecated globals
     "sap/ushell/renderers/fiori2/History", // restore deprecated globals
-    "sap/ushell/components/applicationIntegration/configuration/AppMeta",
     "sap/ushell/ui5service/ShellUIServiceFactory"
 ], (
     History,
@@ -55,8 +55,9 @@ sap.ui.define([
     Interaction,
     hasher,
     jQuery,
-    SchedulingAgent,
     AppLifeCycleAI,
+    PostMessageManager,
+    SchedulingAgent,
     Config,
     EventHub,
     ushellLibrary,
@@ -73,7 +74,6 @@ sap.ui.define([
     StateManager,
     DeprecatedLogonFrameProvider, // restore deprecated globals
     DeprecatedHistory, // restore deprecated globals
-    AppMeta,
     ShellUIServiceFactory
 ) => {
     "use strict";
@@ -221,18 +221,22 @@ sap.ui.define([
 
         onComponentTargetDisplay: function (oEvent) {
             const oParameters = oEvent.getParameters();
-            const oContainer = oParameters.control;
+            const oNavContainer = oParameters.control;
             const oComponentContainer = oParameters.object;
 
             if (this.bRestorePreviousHash) {
                 this.bRestorePreviousHash = false;
             }
 
-            oContainer.navTo("centerViewPort", oComponentContainer.getId(), "show");
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                oNavContainer.navTo("centerViewPort", oComponentContainer.getId(), "show");
+            } else {
+                oNavContainer.navTo(oComponentContainer.getId());
+            }
         },
 
         onInit: function () {
-            const oRouter = Component.getOwnerComponentFor(this.getView()).getRouter();
+            const oRouter = Component.getOwnerComponentFor(this.getView())?.getRouter();
 
             // TODO We still need to think about implementing a custom router to move the display handler from
             // this file to the custom router. Maybe use oRouter.attachBypassed?
@@ -270,6 +274,9 @@ sap.ui.define([
             oView.setModel(this._getConfigModel(), "configModel");
             oView.setModel(ShellModel.getModel(), "shellModel");
             this._bindTabTitle();
+            if (!Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                this._bindContentDensity();
+            }
 
             Config.emit("/core/shell/model/personalization", Config.last("/core/shell/enablePersonalization"));
 
@@ -296,8 +303,8 @@ sap.ui.define([
             ShellUIServiceFactory.attachBackNavigationChanged(this._onBackNavigationChanged, this);
 
             this.history = History;
-            this.oViewPortContainer = Element.getElementById("viewPortContainer");
-            AppLifeCycleAI.init(this.oViewPortContainer, oViewConfig.disableHomeAppCache);
+            this.oNavContainer = Element.getElementById("viewPortContainer");
+            AppLifeCycleAI.init(this.oNavContainer, oViewConfig.disableHomeAppCache);
 
             // init Shell Navigation
             Promise.all([
@@ -307,6 +314,7 @@ sap.ui.define([
                 .then((aServices) => {
                     const oShellNavigationInternal = aServices[0];
                     this._oAppLifeCycleService = aServices[1];
+                    this._oAppLifeCycleService.init(this.oNavContainer);
 
                     this._initShellNavigationInternal(oShellNavigationInternal, this._oAppLifeCycleService, oRouter);
                 });
@@ -334,12 +342,16 @@ sap.ui.define([
                 return;
             };
 
-            if (Config.last("/core/shell/model/contentDensity")) {
-                // do not call _applyContentDensity,
-                // no promise that the component-preload is fully loaded and _applyContentDensity loads the root application.
-                // we only want to display the shell in its default state, once the root application will be loaded
-                // then the _applyContentDensity will be called with promise that component-preload loaded.
-                AppMeta._applyContentDensityClass();
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                if (Config.last("/core/shell/model/contentDensity")) {
+                    // do not call _applyContentDensity,
+                    // no promise that the component-preload is fully loaded and _applyContentDensity loads the root application.
+                    // we only want to display the shell in its default state, once the root application will be loaded
+                    // then the _applyContentDensity will be called with promise that component-preload loaded.
+                    ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/configuration/AppMeta"]).then(([AppMeta]) => {
+                        AppMeta._applyContentDensityClass();
+                    });
+                }
             }
 
             if (oConfig.enableOnlineStatus) {
@@ -411,11 +423,39 @@ sap.ui.define([
         },
 
         /**
+         * Binds the contentDensity property of the ShellModel to the classes on the body.
+         *
+         * @since 1.135.0
+         * @private
+         */
+        _bindContentDensity: function () {
+            const oBinding = ShellModel.getModel().bindProperty("/application/contentDensity");
+
+            function fnBindingChangeHandler () {
+                const sContentDensity = oBinding.getValue();
+                const bCompact = sContentDensity === "compact";
+
+                document.body.classList.toggle("sapUiSizeCompact", bCompact);
+                document.body.classList.toggle("sapUiSizeCozy", !bCompact);
+            }
+            // set initial content density
+            fnBindingChangeHandler.call(this);
+
+            oBinding.attachChange(fnBindingChangeHandler);
+
+            this._aDanglingBindings.push(oBinding);
+        },
+
+        /**
+         * Binds the title and titleAdditionalInformation properties of the ShellModel to the window title.
+         *
+         * @private
          */
         _bindTabTitle: function () {
             const oTitleBinding = ShellModel.getModel().bindProperty("/application/title");
             const oTitleAdditionalInfoBinding = ShellModel.getModel().bindProperty("/application/titleAdditionalInformation");
-            const fnBindingChangeHandler = () => {
+
+            function fnBindingChangeHandler () {
                 const sCalculatedTitle = this._calculateWindowTitle();
                 /*
                  * the tab should have always a title
@@ -424,12 +464,15 @@ sap.ui.define([
                 if (sCalculatedTitle) {
                     AppConfiguration.setWindowTitle(sCalculatedTitle);
                 }
-            };
+            }
+            // set initial title
+            fnBindingChangeHandler.call(this);
 
-            oTitleBinding.attachChange(fnBindingChangeHandler);
-            oTitleAdditionalInfoBinding.attachChange(fnBindingChangeHandler);
+            oTitleBinding.attachChange(fnBindingChangeHandler.bind(this));
+            oTitleAdditionalInfoBinding.attachChange(fnBindingChangeHandler.bind(this));
 
             this._aDanglingBindings.push(oTitleBinding);
+            this._aDanglingBindings.push(oTitleAdditionalInfoBinding);
         },
 
         /**
@@ -496,7 +539,7 @@ sap.ui.define([
             return ShellModel.getConfigModel();
         },
 
-        getViewPortContainer: function () {
+        getNavContainer: function () {
             return Element.getElementById("viewPortContainer");
         },
 
@@ -508,7 +551,6 @@ sap.ui.define([
                 EventHub.once("CenterViewPointContentRendered").do(this._loadCoreExt.bind(this)),
                 EventHub.once("PagesRuntimeRendered").do(this._loadCoreExt.bind(this)),
                 EventHub.once("AppRendered").do(this._loadCoreExtNonUI5.bind(this)),
-                EventHub.on("toggleContentDensity").do(this.toggleContentDensity.bind(this)),
 
                 EventHub.once("CoreResourcesComplementLoaded").do(this._onCoreResourcesComplementLoaded.bind(this)),
                 EventHub.once("loadRendererExtensions").do(this._loadRendererExtensionPlugins.bind(this)),
@@ -521,6 +563,12 @@ sap.ui.define([
             ].forEach((oDoable) => {
                 this.addDoable(oDoable);
             });
+
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                this.addDoable(EventHub.on("toggleContentDensity").do(this.toggleContentDensityFallback.bind(this)));
+            } else {
+                this.addDoable(EventHub.on("toggleContentDensity").do(this.toggleContentDensity.bind(this)));
+            }
         },
 
         /**
@@ -552,11 +600,25 @@ sap.ui.define([
             }
         },
 
-        toggleContentDensity: function (oData) {
+        toggleContentDensityFallback: async function (oData) {
             const isCompact = oData.contentDensity === "compact";
+            const [AppMeta] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/configuration/AppMeta"]);
+
             AppMeta._applyContentDensityByPriority(isCompact, true);
         },
 
+        toggleContentDensity: function (oData) {
+            const bIsCompact = oData.contentDensity === "compact";
+
+            return PostMessageManager.sendRequestToAllApplications(
+                "sap.ushell.appRuntime.uiDensityChange",
+                {
+                    isTouch: (bIsCompact ? "0" : "1")
+                },
+                false
+            );
+        },
+
         _handleEmptyHash: function (sHash) {
             sHash = (typeof sHash === "string") ? sHash : "";
             sHash = sHash.split("?")[0];
@@ -1391,7 +1453,11 @@ sap.ui.define([
                 );
             }
 
-            EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+            } else {
+                AppLifeCycleAI.publishAppOpeningEvent(oResolvedHashFragment);
+            }
 
             const oNewWin = WindowUtils.openURL(oResolvedHashFragment.url);
             // Show a message when window.open returns null --> Popup Blocker
@@ -1401,7 +1467,11 @@ sap.ui.define([
                 this.delayedMessageError(msg);
             }
 
-            EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+            } else {
+                AppLifeCycleAI.publishAppOpenedEvent(oResolvedHashFragment);
+            }
             this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment, oOldResolvedHashFragment);
         },
 
@@ -1623,7 +1693,7 @@ sap.ui.define([
             const bNavigationFromHome = this._isFLPIntent(sOldShellHash);
             const bNavigationWithInnerAppRoute = !!sAppPart;
 
-            const sNavigationRedirectHash = await AppLifeCycleAI.createApplication(
+            const oApplicationHandle = await AppLifeCycleAI.startApplication(
                 sBasicShellHash, // sAppId
                 oParsedShellHash,
                 oResolvedHashFragment,
@@ -1631,6 +1701,7 @@ sap.ui.define([
                 bNavigationWithInnerAppRoute
             );
 
+            const sNavigationRedirectHash = oApplicationHandle.getNavigationRedirectHash();
             if (typeof sNavigationRedirectHash === "string") {
                 Log.warning(`Performing navigation redirect to hash "${sNavigationRedirectHash}"`);
 
@@ -1640,22 +1711,11 @@ sap.ui.define([
                 return ShellNavigationInternal.toExternal({ target: { shellHash: sNavigationRedirectHash } }, undefined, false);
             }
 
-            AppLifeCycleAI.navToCurrentApp(); // todo: [FLPCOREANDUX-10024] triggers appLoaded event
-
-            // todo: [FLPCOREANDUX-10024] move this into a common place and check where it should be
-            AppMeta.setAppIcons();
-
             const oShellConfig = this._getConfig();
 
-            // todo: [FLPCOREANDUX-10024] should this be done after handleControl?
             // this only targets the overwritten rootIntent (e.g. workzone advanced)
             const bIsNavToHome = sShellHash === "#" || (oShellConfig.rootIntent && sBasicShellHash === UrlParsing.getBasicHash(oShellConfig.rootIntent));
-            AppLifeCycleAI.switchViewState(
-                bIsNavToHome ? LaunchpadState.Home : LaunchpadState.App,
-                sBasicShellHash, // sAppId
-                oResolvedHashFragment.applicationType,
-                oResolvedHashFragment.explicitNavMode
-            );
+            oApplicationHandle.navTo(bIsNavToHome); // todo: [FLPCOREANDUX-10024] triggers appLoaded event and switches the state
 
             // todo: [FLPCOREANDUX-10024] Move this into the regular flow
             /*
@@ -1726,11 +1786,21 @@ sap.ui.define([
             }
 
             try {
-                EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+                if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                    EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+                } else {
+                    AppLifeCycleAI.publishAppOpeningEvent(oResolvedHashFragment);
+                }
+
                 if (!oEPCM.doNavigate(sUrlWithSapUserAndShellParam, iMode, undefined, undefined, undefined, undefined, undefined, oPostBodyParams)) {
                     return false;
                 }
-                EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+
+                if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                    EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+                } else {
+                    AppLifeCycleAI.publishAppOpenedEvent(oResolvedHashFragment);
+                }
 
                 await this._restoreAfterNwbcNavigation(oResolvedHashFragment, oOldResolvedHashFragment);
                 /*
@@ -1822,23 +1892,6 @@ sap.ui.define([
             return sIntent === "#" || sIntent === oConfig.rootIntent;
         },
 
-        /**
-         * Adds a listener to the "appComponentLoaded" Event that is published by the "sap.ushell".
-         * Once the "home app" Component is saved, the listener is removed, and this function will not do anything.
-         */
-        _saveHomePageComponent: function () {
-            if (this.oHomeApp) {
-                return;
-            }
-
-            const sContainerNS = "sap.ushell";
-            function fListener (oEvent, sChannel, oData) {
-                this.oHomeApp = oData.component;
-                EventBus.getInstance().unsubscribe(sContainerNS, "appComponentLoaded", fListener, this);
-            }
-            EventBus.getInstance().subscribe(sContainerNS, "appComponentLoaded", fListener, this);
-        },
-
         /**
          * Shows an error message and navigates to the previous page.
          *
@@ -1978,21 +2031,26 @@ sap.ui.define([
             const bToSwitcherView = oToView === oOwnerComponent.byId("runtimeSwitcher-component-container");
             const bMenuVisible = bToDashboardView || bToPagesView || bToHomeAppView || bToWorkpagesView || bToSwitcherView;
 
-            AppLifeCycleAI.onBeforeNavigate(oEvent.getParameter("fromId"), oEvent.getParameter("from"), oEvent.getParameter("toId"), oEvent.getParameter("to"));
+
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                AppLifeCycleAI.onBeforeNavigate(oEvent.getParameter("fromId"), oEvent.getParameter("from"), oEvent.getParameter("toId"), oEvent.getParameter("to"));
+            }
             this._setMenuVisible(bMenuVisible);
             this._setSideNavigationVisible(bMenuVisible);
         },
 
         onAfterNavigate: function (oEvent) {
-            const sToId = oEvent.mParameters ? oEvent.mParameters.toId : undefined;
-
             const oDashboard = Element.getElementById("sapUshellDashboardPage");
             if (oDashboard) {
                 oDashboard.setBlocked(false);
                 oDashboard.setBusy(false);
             }
 
-            AppLifeCycleAI.onAfterNavigate(oEvent.getParameter("fromId"), oEvent.getParameter("from"), sToId, oEvent.getParameter("to"));
+            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                const sToId = oEvent.mParameters ? oEvent.mParameters.toId : undefined;
+                AppLifeCycleAI.onAfterNavigate(oEvent.getParameter("fromId"), oEvent.getParameter("from"), sToId, oEvent.getParameter("to"));
+            }
+
             EventBus.getInstance().publish("sap.ushell", "navigated", {});
         },
 
@@ -2608,6 +2666,7 @@ sap.ui.define([
 
                 // @Alon Barnes: Is this call even needed? The beforehand given oMetadata has not included the accessed property in the AppMeta.js
                 // So, maybe this call can even be removed?
+                const [AppMeta] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/configuration/AppMeta"]);
                 AppMeta.setAppIcons();
 
                 // todo: [FLPCOREANDUX-10024] should this be done after handleControl?

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

@@ -19,8 +19,10 @@ sap.ui.define([
     "sap/ushell/renderer/Shell.controller", // controller must be preloaded to avoid naming clashes
     "sap/ushell/state/ShellModel",
     "sap/ushell/state/StateManager",
+    "sap/ushell/Config",
     "sap/ushell/Container",
-    "sap/ushell/state/BindingHelper"
+    "sap/ushell/state/BindingHelper",
+    "sap/ui/core/ComponentContainer"
 ], function (
     Log,
     Avatar,
@@ -40,8 +42,10 @@ sap.ui.define([
     ShellController,
     ShellModel,
     StateManager,
+    Config,
     Container,
-    BindingHelper
+    BindingHelper,
+    ComponentContainer
 ) {
     "use strict";
 
@@ -98,8 +102,13 @@ sap.ui.define([
             // NavigationBar
             this.setNavigationBarMinHeight();
 
-            // RendererRootView / viewPortContainer
-            var oRendererRootViewPromise = this.createRendererRootView();
+            // RendererRootView / NavContainer / viewPortContainer
+            var oRendererRootViewPromise;
+            if (!Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+                oRendererRootViewPromise = this.createRendererRootView();
+            } else {
+                oRendererRootViewPromise = this.createRendererRootViewFallback();
+            }
 
             this.setDisplayBlock(true);
 
@@ -142,32 +151,71 @@ sap.ui.define([
             });
         },
 
-        createShellHeader: function () {
-            var oHeaderController = new ShellHeaderController();
-
+        createRendererRootViewFallback: function () {
+            var oController = this.getController();
             return Fragment.load({
-                name: "sap.ushell.renderer.shellHeader.ShellHeader",
-                controller: oHeaderController
-            }).then(function (oShellHeader) {
-                BindingHelper.overrideUpdateAggregation(oShellHeader);
+                name: "sap.ushell.renderer.RendererRootViewFallback",
+                controller: oController
+            }).then(function (oRendererRootView) {
+                BindingHelper.overrideUpdateAggregation(oRendererRootView);
 
-                if (StateManager.getShellMode() === ShellMode.Embedded) {
-                    oShellHeader.setNoLogo();
-                }
+                return oRendererRootView;
+            });
+        },
 
-                // Assign models to the Shell Header
-                oShellHeader.setModel(ushellResources.i18nModel, "i18n");
-                oShellHeader.setModel(NewExperience.getModel(), "newExperience");
-                oShellHeader.setModel(ShellModel.getModel(), "shellModel");
-                this.addDanglingControl(oShellHeader);
-                // save for later use
-                this._oShellHeader = oShellHeader;
+        createShellHeader: async function () {
+            if (Config.last("/core/shellBar/enabled")) {
+                // Render the new ShellBar component
+                return Component.create({
+                    name: "sap.ushell.components.shell.ShellBar"
+                }).then((oShellBar) => {
+                    // Assign models to the Shell Bar
+                    oShellBar.setModel(ushellResources.i18nModel, "i18n");
+                    oShellBar.setModel(NewExperience.getModel(), "newExperience");
+                    oShellBar.setModel(ShellModel.getModel(), "shellModel");
+
+                    this.waitForShellLayout().then(() => {
+                        const oShellBarComponentContainer = new ComponentContainer({
+                            component: oShellBar,
+                            id: "shell-header",
+                            async: true
+                        });
+                        oShellBar.enhanceComponentContainerAPI(oShellBarComponentContainer);
+                        oShellBarComponentContainer.placeAt(ShellArea.ShellHeader, "only");
+
+                        this.addDanglingControl(oShellBarComponentContainer);
+                        this._oShellHeader = oShellBarComponentContainer;
+                    });
+                });
 
-                this.waitForShellLayout().then(function () {
-                    oShellHeader.placeAt(ShellArea.ShellHeader, "only");
-                    oHeaderController.onInit();
+            } else if (!Config.last("/core/shellBar/enabled")) {
+                // Render the old ShellHeader
+                var oHeaderController = new ShellHeaderController();
+
+                return Fragment.load({
+                    name: "sap.ushell.renderer.shellHeader.ShellHeader",
+                    controller: oHeaderController
+                }).then((oShellHeader) => {
+                    BindingHelper.overrideUpdateAggregation(oShellHeader);
+
+                    if (StateManager.getShellMode() === ShellMode.Embedded) {
+                        oShellHeader.setNoLogo();
+                    }
+
+                    // Assign models to the Shell Header
+                    oShellHeader.setModel(ushellResources.i18nModel, "i18n");
+                    oShellHeader.setModel(NewExperience.getModel(), "newExperience");
+                    oShellHeader.setModel(ShellModel.getModel(), "shellModel");
+                    this.addDanglingControl(oShellHeader);
+                    // save for later use
+                    this._oShellHeader = oShellHeader;
+
+                    this.waitForShellLayout().then(function () {
+                        oShellHeader.placeAt(ShellArea.ShellHeader, "only");
+                        oHeaderController.onInit();
+                    });
                 });
-            }.bind(this));
+            }
         },
 
         setNavigationBarMinHeight: function () {
@@ -349,7 +397,11 @@ sap.ui.define([
                     writeToDom: true
                 }));
                 this.addDanglingControl(allMyAppsView);
-                this.getShellHeader().getAppTitle().setAllMyApps(allMyAppsView);
+                if (Config.last("/core/shellBar/enabled")) {
+                    Element.getElementById(this.getShellHeader().getAppTitle()).setAllMyApps(allMyAppsView);
+                } else {
+                    this.getShellHeader().getAppTitle().setAllMyApps(allMyAppsView);
+                }
             }.bind(this));
         },
 

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

@@ -554,7 +554,7 @@ decimalFormat=Decimal Format
 #XFLD
 workWeek=Work Week
 #XMSG
-languageAndRegionsInfoPopup=Please note that these settings apply to SAP Build Work Zone site and integrated SAPUI5-based applications running on SAP BTP.
+languageAndRegionsInfoPopup=Please note that these settings apply to an SAP Build Work Zone site and integrated SAPUI5-based applications running on SAP BTP.
 #XMSG
 timeZoneTooltip=Time zone is determined by your browser settings
 #XFLD
@@ -598,6 +598,8 @@ aboutCategoryApplication=Application
 aboutCategorySystem=System
 #XFLD
 aboutCategoryEnvironment=Environment
+#XFLD
+abap.transaction=Transaction
 
 #XFLD: The label of a table column containing the labels of FLP pages
 contentNodeSelectorPage=Page

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

@@ -273,10 +273,19 @@ toggleSelectionModeBtn=\u062A\u0645\u0643\u064A\u0646 \u0623\u0648 \u062A\u0639\
 languageRegionFld=\u0627\u0644\u0644\u063A\u0629
 languageAndRegionTit=\u0627\u0644\u0644\u063A\u0629 \u0648\u0627\u0644\u0645\u0646\u0637\u0642\u0629
 languageAndRegionForm=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0644\u063A\u0629 \u0648\u0627\u0644\u0645\u0646\u0637\u0642\u0629
+languageSlashRegion=\u0627\u0644\u0644\u063A\u0629/\u0627\u0644\u0645\u0646\u0637\u0642\u0629
+date=\u0627\u0644\u062A\u0627\u0631\u064A\u062E
+time=\u0627\u0644\u0648\u0642\u062A
+decimalFormat=\u062A\u0646\u0633\u064A\u0642 \u0639\u0634\u0631\u064A
+workWeek=\u0623\u0633\u0628\u0648\u0639 \u0627\u0644\u0639\u0645\u0644
+languageAndRegionsInfoPopup=\u064A\u0631\u062C\u0649 \u0645\u0644\u0627\u062D\u0638\u0629 \u0623\u0646 \u0647\u0630\u0647 \u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u062A\u0646\u0637\u0628\u0642 \u0639\u0644\u0649 \u0645\u0648\u0642\u0639 SAP Build Work Zone \u0648\u0627\u0644\u062A\u0637\u0628\u064A\u0642\u0627\u062A \u0627\u0644\u0645\u062A\u0643\u0627\u0645\u0644\u0629 \u0639\u0644\u0649 \u0623\u0633\u0627\u0633 SAPUI5 \u0627\u0644\u062A\u064A \u062A\u0639\u0645\u0644 \u0639\u0644\u0649 SAP BTP.
+timeZoneTooltip=\u064A\u062A\u0645 \u062A\u062D\u062F\u064A\u062F \u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0632\u0645\u0646\u064A\u0629 \u0645\u0646 \u062E\u0644\u0627\u0644 \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0645\u0633\u062A\u0639\u0631\u0636 \u0644\u062F\u064A\u0643
 dateFormatFld=\u062A\u0646\u0633\u064A\u0642 \u0627\u0644\u062A\u0627\u0631\u064A\u062E
 timeFormatFld=\u062A\u0646\u0633\u064A\u0642 \u0627\u0644\u0648\u0642\u062A
 numberFormatFld=\u062A\u0646\u0633\u064A\u0642 \u0639\u0634\u0631\u064A
 timeZoneFld=\u0627\u0644\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0632\u0645\u0646\u064A\u0629
+fld12h=12 \u0633\u0627\u0639\u0629
+fld24h=24 \u0633\u0627\u0639\u0629
 btn12h=12 \u0633\u0627\u0639\u0629
 btn24h=24 \u0633\u0627\u0639\u0629
 SettingsCuaWarning=\u0628\u0639\u0636 \u0627\u0644\u062D\u0642\u0648\u0644 \u0645\u0639\u0637\u0644\u0629 \u0648\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u063A\u064A\u064A\u0631\u0647\u0627 \u0625\u0644\u0627 \u0641\u064A \u0646\u0638\u0627\u0645 \u0625\u062F\u0627\u0631\u0629 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645 \u0627\u0644\u0645\u0631\u0643\u0632\u064A.

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

@@ -273,10 +273,19 @@ toggleSelectionModeBtn=\u0410\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u043D\u0
 languageRegionFld=\u0415\u0437\u0438\u043A
 languageAndRegionTit=\u0415\u0437\u0438\u043A \u0438 \u0440\u0435\u0433\u0438\u043E\u043D
 languageAndRegionForm=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u0435\u0437\u0438\u043A \u0438 \u0440\u0435\u0433\u0438\u043E\u043D
+languageSlashRegion=\u0415\u0437\u0438\u043A/\u0440\u0435\u0433\u0438\u043E\u043D
+date=\u0414\u0430\u0442\u0430
+time=\u0412\u0440\u0435\u043C\u0435
+decimalFormat=\u0414\u0435\u0441\u0435\u0442\u0438\u0447\u0435\u043D \u0444\u043E\u0440\u043C\u0430\u0442
+workWeek=\u0420\u0430\u0431\u043E\u0442\u043D\u0430 \u0441\u0435\u0434\u043C\u0438\u0446\u0430
+languageAndRegionsInfoPopup=\u041E\u0431\u044A\u0440\u043D\u0435\u0442\u0435 \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435, \u0447\u0435 \u0442\u0435\u0437\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0435 \u043E\u0442\u043D\u0430\u0441\u044F\u0442 \u0437\u0430 \u0441\u0430\u0439\u0442 SAP Build Work Zone \u0438 \u0438\u043D\u0442\u0435\u0433\u0440\u0438\u0440\u0430\u043D\u0438\u0442\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0431\u0430\u0437\u0438\u0440\u0430\u043D\u0438 \u043D\u0430 SAPUI5, \u0440\u0430\u0431\u043E\u0442\u0435\u0449\u0438 \u0432 SAP BTP.
+timeZoneTooltip=\u0427\u0430\u0441\u043E\u0432\u0430\u0442\u0430 \u0437\u043E\u043D\u0430 \u0435 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0430 \u043F\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435 \u043D\u0430 \u0432\u0430\u0448\u0438\u044F \u0431\u0440\u0430\u0443\u0437\u044A\u0440.
 dateFormatFld=\u0424\u043E\u0440\u043C\u0430\u0442 \u043D\u0430 \u0434\u0430\u0442\u0430
 timeFormatFld=\u0424\u043E\u0440\u043C\u0430\u0442 \u043D\u0430 \u0447\u0430\u0441
 numberFormatFld=\u0414\u0435\u0441\u0435\u0442\u0438\u0447\u0435\u043D \u0444\u043E\u0440\u043C\u0430\u0442
 timeZoneFld=\u0427\u0430\u0441\u043E\u0432\u0438 \u043F\u043E\u044F\u0441
+fld12h=12 \u0447.
+fld24h=24 \u0447.
 btn12h=12 \u0447.
 btn24h=24 \u0447.
 SettingsCuaWarning=\u041D\u044F\u043A\u043E\u0438 \u043F\u043E\u043B\u0435\u0442\u0430 \u0441\u0430 \u0434\u0435\u0437\u0430\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u043D\u0438 \u0438 \u043C\u043E\u0433\u0430\u0442 \u0434\u0430 \u0441\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u044F\u0442 \u0441\u0430\u043C\u043E \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430 \u0437\u0430 \u0446\u0435\u043D\u0442\u0440\u0430\u043B\u043D\u043E \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438\u0442\u0435.

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

@@ -273,10 +273,19 @@ toggleSelectionModeBtn=Activar/desactivar mode de selecci\u00F3
 languageRegionFld=Idioma
 languageAndRegionTit=Idioma i regi\u00F3
 languageAndRegionForm=Opcions d'idioma i regi\u00F3
+languageSlashRegion=Idioma/Regi\u00F3
+date=Data
+time=Hora
+decimalFormat=Format decimal
+workWeek=Semana laboral
+languageAndRegionsInfoPopup=Tingueu en compte que aquestes opcions s'apliquen a un lloc SAP Build Work Zone i a les aplicacions basades en SAPUI5 integrades que s'executen a SAP BTP.
+timeZoneTooltip=Les opcions del navegador determinen el fus horari.
 dateFormatFld=Format de data
 timeFormatFld=Format d'hora
 numberFormatFld=Format decimal
 timeZoneFld=Fus horari
+fld12h=12 h
+fld24h=24 h
 btn12h=12 h
 btn24h=24 h
 SettingsCuaWarning=Alguns camps estan desactivats i nom\u00E9s es poden modificar al sistema d'administraci\u00F3 d'usuari central.

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

@@ -273,10 +273,19 @@ toggleSelectionModeBtn=Aktiviraj ili deaktiviraj na\u010Din odabira
 languageRegionFld=Jezik
 languageAndRegionTit=Jezik i regija
 languageAndRegionForm=Pode\u0161avanja jezika i regije
+languageSlashRegion=Jezik/regija
+date=Datum
+time=Vrijeme
+decimalFormat=Decimalni format
+workWeek=Radna nedjelja
+languageAndRegionsInfoPopup=Imajte na umu da se ova pode\u0161avanja primjenjuju na lokaciju SAP Build Work Zone i integrisane aplikacije zasnovane na skupu alata SAPUI5 koje se izvode na platformi SAP BTP.
+timeZoneTooltip=Vremensku zonu odre\u0111uju pode\u0161avanja va\u0161eg pretra\u017Eiva\u010Da
 dateFormatFld=Format datuma
 timeFormatFld=Format vremena
 numberFormatFld=Decimalni format
 timeZoneFld=Vremenska zona
+fld12h=12 h
+fld24h=24 h
 btn12h=12 h
 btn24h=24 h
 SettingsCuaWarning=Neka polja su deaktivirana i mogu se promijeniti samo u sistemu za centralnu administraciju korisnika.

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

@@ -272,11 +272,20 @@ previewFld=N\u00E1hled
 toggleSelectionModeBtn=Aktivace/deaktivace re\u017Eimu v\u00FDb\u011Bru
 languageRegionFld=Jazyk
 languageAndRegionTit=Jazyk a region
-languageAndRegionForm=Jazyk a region
+languageAndRegionForm=Nastaven\u00ED jazyka a regionu
+languageSlashRegion=Jazyk/region
+date=Datum
+time=\u010Cas
+decimalFormat=Des\u00EDtkov\u00E9 zobrazen\u00ED
+workWeek=Pracovn\u00ED t\u00FDden
+languageAndRegionsInfoPopup=M\u011Bjte na z\u0159eteli, \u017Ee tato nastaven\u00ED se pou\u017Eij\u00ED jen pro web SAP Build Work Zone a integrovan\u00E9 aplikace na b\u00E1zi SAPUI5 b\u011B\u017E\u00EDc\u00ED na SAP BTP.
+timeZoneTooltip=\u010Casov\u00E9 p\u00E1smo se ur\u010D\u00ED podle nastaven\u00ED va\u0161eho prohl\u00ED\u017Ee\u010De
 dateFormatFld=Form\u00E1t data
 timeFormatFld=Form\u00E1t \u010Dasu
 numberFormatFld=Des\u00EDtkov\u00E9 zobrazen\u00ED
 timeZoneFld=\u010Casov\u00E9 p\u00E1smo
+fld12h=12 h
+fld24h=24 h
 btn12h=12 h
 btn24h=24 h
 SettingsCuaWarning=N\u011Bkter\u00E1 pole jsou deaktivovan\u00E1 a lze je zm\u011Bnit jen v syst\u00E9mu centr\u00E1ln\u00ED spr\u00E1vy u\u017Eivatel\u016F.