@openui5/sap.ui.rta 1.113.0 → 1.114.1

package/src/sap/ui/rta/command/ControlVariantSetTitle.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.50

package/src/sap/ui/rta/command/ControlVariantSwitch.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.50

package/src/sap/ui/rta/command/CreateContainer.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/CustomAdd.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.62

package/src/sap/ui/rta/command/FlexCommand.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/LREPSerializer.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.42
@@ -152,7 +152,8 @@ sap.ui.define([
 	 * @param {boolean} mPropertyBag.saveAsDraft - save the changes as a draft
 	 * @param {string} [mPropertyBag.layer] - Layer for which the changes should be saved
 	 * @param {boolean} [mPropertyBag.removeOtherLayerChanges=false] - Whether to remove changes on other layers before saving
-	 * @param {string} [mPropertyBag.version] - Layer for which the changes should be saved
+	 * @param {string} [mPropertyBag.version] - Version to load into Flex State after saving (e.g. undefined when exiting RTA)
+	 * @param {string} [mPropertyBag.adaptationId] - Adaptation to load into Flex State after saving (e.g. undefined when exiting RTA)
 	 * @returns {Promise} return empty promise
 	 * @public
 	 */
@@ -172,6 +173,7 @@ sap.ui.define([
 				layer: mPropertyBag.layer,
 				removeOtherLayerChanges: !!mPropertyBag.removeOtherLayerChanges,
 				version: mPropertyBag.version,
+				adaptationId: mPropertyBag.adaptationId,
 				condenseAnyLayer: mPropertyBag.condenseAnyLayer
 			});
 		}.bind(this))

package/src/sap/ui/rta/command/LocalReset.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.90

package/src/sap/ui/rta/command/Move.js

@@ -17,7 +17,7 @@ function(
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Property.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Remove.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.42

package/src/sap/ui/rta/command/Rename.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/Resize.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.101

package/src/sap/ui/rta/command/Reveal.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/command/Settings.js

@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/command/Split.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/command/Stack.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/command/appDescriptor/AddLibrary.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.AppDescriptorCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/compVariant/CompVariantContent.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.102

package/src/sap/ui/rta/command/compVariant/CompVariantSaveAs.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantSwitch.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantUpdate.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/enablement/elementActionTest.js

@@ -8,8 +8,10 @@
 sap.ui.define([
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Core",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/rta/command/CommandFactory",
+	"sap/ui/rta/util/changeVisualization/ChangeCategories",
 	"sap/ui/rta/util/changeVisualization/ChangeVisualization",
 	"sap/ui/dt/DesignTime",
 	"sap/ui/dt/DesignTimeStatus",
@@ -25,8 +27,10 @@ sap.ui.define([
 ], function(
 	UIComponent,
 	ComponentContainer,
+	Core,
 	XMLView,
 	CommandFactory,
+	ChangeCategories,
 	ChangeVisualization,
 	DesignTime,
 	DesignTimeStatus,
@@ -53,7 +57,7 @@ sap.ui.define([
 	 * E.g. <code>elementActionTest.only("Remove");</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @static
 	 * @since 1.42
@@ -66,10 +70,12 @@ sap.ui.define([
 	 * @param {sap.ui.model.Model} [mOptions.model] - Any model to be assigned on the view
 	 * @param {string} [mOptions.placeAt="qunit-fixture"] - Id of tag to place view at runtime
 	 * @param {boolean} [mOptions.jsOnly] - Set to true, if change handler cannot work on xml view
+	 * @param {string} [mOptions.label] - Check the result of "getLabel" function from the control designtime metadata
 	 * @param {object} mOptions.action - Action to operate on <code>mOptions.xmlView</code>
 	 * @param {string} mOptions.action.name - Name of the action - e.g. 'remove', 'move', 'rename'
 	 * @param {string} [mOptions.action.controlId] - Id of the control the action is executed with - may be the parent of the control being 'touched'
 	 * @param {function():sap.ui.core.Control} [mOptions.action.control] - Function returning the control instance on which the change is being applied
+	 * @param {string} [mOptions.action.label] - Check the result of "getLabel" function from the action in the control designtime metadata
 	 * @param {function} mOptions.action.parameter - Function(oView) returning the parameter object of the action to be executed
 	 * @param {function} [mOptions.before] - Function(assert) hook before test execution is started
 	 * @param {function} [mOptions.after] - Function(assert) hook after test execution is finished
@@ -167,7 +173,7 @@ sap.ui.define([
 					this.oView.setModel(mOptions.model);
 				}
 
-				sap.ui.getCore().applyChanges();
+				Core.applyChanges();
 
 				return mOptions.model && mOptions.model.getMetaModel() && mOptions.model.getMetaModel().loaded();
 			}.bind(this));
@@ -195,83 +201,94 @@ sap.ui.define([
 		}
 
 		function buildCommand(assert, oAction) {
-			return Promise.resolve().then(function() {
-				var oControl;
-				var mParameter;
-				var oElementDesignTimeMetadata;
+			var oControl;
+			var mParameter;
+			var oElementDesignTimeMetadata;
+			var sCommandName = oAction.name;
+			return Promise.resolve()
+			.then(function() {
 				if (typeof oAction.control === "function") {
-					oControl = oAction.control(this.oView);
-				} else {
-					oControl = this.oView.byId(oAction.controlId);
+					return oAction.control(this.oView);
 				}
-				var sCommandName = oAction.name;
-				return oControl.getMetadata().loadDesignTime(oControl).then(function() {
-					if (oAction.parameter) {
-						if (typeof oAction.parameter === "function") {
-							mParameter = oAction.parameter(this.oView);
-						} else {
-							mParameter = oAction.parameter;
-						}
+				return this.oView.byId(oAction.controlId);
+			}.bind(this))
+			.then(function(oRetrievedControl) {
+				oControl = oRetrievedControl;
+				return oControl.getMetadata().loadDesignTime(oControl);
+			})
+			.then(function() {
+				if (oAction.parameter) {
+					if (typeof oAction.parameter === "function") {
+						mParameter = oAction.parameter(this.oView);
 					} else {
-						mParameter = {};
+						mParameter = oAction.parameter;
 					}
+				} else {
+					mParameter = {};
+				}
 
-					sap.ui.getCore().applyChanges();
-					this.oDesignTime = new DesignTime({
-						rootElements: [
-							this.oView
-						]
-					});
-					return new Promise(function(resolve) {
-						this.oDesignTime.attachEventOnce("synced", function() {
-							var oControlOverlay = OverlayRegistry.getOverlay(oControl);
-							oElementDesignTimeMetadata = oControlOverlay.getDesignTimeMetadata();
-							var oResponsibleElement = oElementDesignTimeMetadata.getAction("getResponsibleElement", oControl);
-							var oAggregationOverlay;
-
-							if (oAction.name === "move") {
-								var oElementOverlay = OverlayRegistry.getOverlay(mParameter.movedElements[0].element || mParameter.movedElements[0].id);
-								var oRelevantContainer = oElementOverlay.getRelevantContainer();
-								oControl = oRelevantContainer;
-								oElementDesignTimeMetadata = oElementOverlay.getParentAggregationOverlay().getDesignTimeMetadata();
-							} else if (oAction.name === "addODataProperty") {
-								assert.ok(false, "addODataProperty action is deprecated. Use addViaDelegate action instead.");
-							} else if (Array.isArray(oAction.name)) {
-								var aAddActions = oElementDesignTimeMetadata.getActionDataFromAggregations(oAction.name[0], oControl, undefined, oAction.name[1]);
-								assert.equal(aAddActions.length, 1, "there should be only one aggregation with the possibility to do an add " + oAction.name[1] + " action");
-								oAggregationOverlay = oControlOverlay.getAggregationOverlay(aAddActions[0].aggregation);
-								oElementDesignTimeMetadata = oAggregationOverlay.getDesignTimeMetadata();
-								sCommandName = "addDelegateProperty";
-							} else if (oResponsibleElement) {
-								if (oAction.name === "reveal") {
-									oControl = oAction.revealedElement(this.oView);
-									oControlOverlay = OverlayRegistry.getOverlay(oAction.revealedElement(this.oView));
-									oElementDesignTimeMetadata = oControlOverlay.getDesignTimeMetadata();
-								} else {
-									oControl = oResponsibleElement;
-									oControlOverlay = OverlayRegistry.getOverlay(oControl);
-									oElementDesignTimeMetadata = oControlOverlay.getDesignTimeMetadata();
-									resolve(oControl.getMetadata().loadDesignTime(oControl));
+				Core.applyChanges();
+				this.oDesignTime = new DesignTime({
+					rootElements: [
+						this.oView
+					]
+				});
+				return new Promise(function(resolve) {
+					this.oDesignTime.attachEventOnce("synced", function() {
+						// The "settings" action doesn't require an overlay
+						if (oAction.name === "settings") {
+							return resolve();
+						}
+						var oControlOverlay = OverlayRegistry.getOverlay(oControl);
+						oElementDesignTimeMetadata = oControlOverlay.getDesignTimeMetadata();
+						var oResponsibleElement = oElementDesignTimeMetadata.getAction("getResponsibleElement", oControl);
+						var oAggregationOverlay;
+						if (mOptions.label) {
+							assert.strictEqual(oElementDesignTimeMetadata.getLabel(oControl), mOptions.label, "then the control label is correct");
+						}
+						if (oAction.name === "move") {
+							var oElementOverlay = OverlayRegistry.getOverlay(mParameter.movedElements[0].element || mParameter.movedElements[0].id);
+							var oRelevantContainer = oElementOverlay.getRelevantContainer();
+							oControl = oRelevantContainer;
+							oElementDesignTimeMetadata = oElementOverlay.getParentAggregationOverlay().getDesignTimeMetadata();
+						} else if (Array.isArray(oAction.name)) {
+							var aAddActions = oElementDesignTimeMetadata.getActionDataFromAggregations(oAction.name[0], oControl, undefined, oAction.name[1]);
+							assert.equal(aAddActions.length, 1, "there should be only one aggregation with the possibility to do an add " + oAction.name[1] + " action");
+							oAggregationOverlay = oControlOverlay.getAggregationOverlay(aAddActions[0].aggregation);
+							oElementDesignTimeMetadata = oAggregationOverlay.getDesignTimeMetadata();
+							sCommandName = "addDelegateProperty";
+						} else if (oResponsibleElement) {
+							if (oAction.name === "reveal") {
+								oControl = oAction.revealedElement(this.oView);
+								oControlOverlay = OverlayRegistry.getOverlay(oAction.revealedElement(this.oView));
+								oElementDesignTimeMetadata = oControlOverlay.getDesignTimeMetadata();
+								if (oAction.label) {
+									var oRevealAction = oElementDesignTimeMetadata.getAction("reveal");
+									assert.strictEqual(oRevealAction.getLabel(oControl), oAction.label, "then the control label is correct");
 								}
+							} else {
+								oControl = oResponsibleElement;
+								oControlOverlay = OverlayRegistry.getOverlay(oControl);
+								oElementDesignTimeMetadata = oControlOverlay.getDesignTimeMetadata();
+								resolve(oControl.getMetadata().loadDesignTime(oControl));
 							}
-							resolve();
-						}.bind(this));
-					}.bind(this));
-				}.bind(this))
-				.then(function() {
-					var oCommandFactory = new CommandFactory({
-						flexSettings: {
-							layer: mOptions.layer || Layer.CUSTOMER
 						}
-					});
-					return oCommandFactory.getCommandFor(oControl, sCommandName, mParameter, oElementDesignTimeMetadata);
-				})
-				.then(function(oCommand) {
-					assert.ok(oCommand, "then the registration for action to change type, the registration for change and control type to change handler is available and " + mOptions.action.name + " is a valid action");
-					return oCommand;
-				});
+						resolve();
+					}.bind(this));
+				}.bind(this));
 			}.bind(this))
-
+			.then(function() {
+				var oCommandFactory = new CommandFactory({
+					flexSettings: {
+						layer: mOptions.layer || Layer.CUSTOMER
+					}
+				});
+				return oCommandFactory.getCommandFor(oControl, sCommandName, mParameter, oElementDesignTimeMetadata);
+			})
+			.then(function(oCommand) {
+				assert.ok(oCommand, "then the registration for action to change type, the registration for change and control type to change handler is available and " + mOptions.action.name + " is a valid action");
+				return oCommand;
+			})
 			.catch(function(oMessage) {
 				throw new Error(oMessage);
 			});
@@ -358,7 +375,7 @@ sap.ui.define([
 			return oChangeVisualization._updateChangeRegistry()
 
 			.then(function() {
-				return oChangeVisualization._selectChangeCategory("all");
+				return oChangeVisualization._selectChangeCategory(ChangeCategories.ALL);
 			})
 
 			.then(function() {
@@ -496,7 +513,7 @@ sap.ui.define([
 					}.bind(this))
 
 					.then(function() {
-						sap.ui.getCore().applyChanges();
+						Core.applyChanges();
 						mOptions.afterUndo(this.oUiComponent, this.oView, assert);
 					}.bind(this));
 				});
@@ -525,7 +542,7 @@ sap.ui.define([
 					}.bind(this))
 
 					.then(function() {
-						sap.ui.getCore().applyChanges();
+						Core.applyChanges();
 						mOptions.afterRedo(this.oUiComponent, this.oView, assert);
 					}.bind(this));
 				});
@@ -576,7 +593,7 @@ sap.ui.define([
 				}.bind(this))
 
 				.then(function() {
-					sap.ui.getCore().applyChanges();
+					Core.applyChanges();
 					return mOptions.afterAction(this.oUiComponent, this.oView, assert);
 				}.bind(this));
 			});
@@ -589,7 +606,7 @@ sap.ui.define([
 				.then(cleanUpAfterUndo.bind(null, this.aCommands))
 
 				.then(function() {
-					sap.ui.getCore().applyChanges();
+					Core.applyChanges();
 					return mOptions.afterUndo(this.oUiComponent, this.oView, assert);
 				}.bind(this));
 			});
@@ -614,7 +631,7 @@ sap.ui.define([
 				}.bind(this))
 
 				.then(function() {
-					sap.ui.getCore().applyChanges();
+					Core.applyChanges();
 					return mOptions.afterRedo(this.oUiComponent, this.oView, assert);
 				}.bind(this));
 			});

package/src/sap/ui/rta/library.js

@@ -23,14 +23,14 @@ function() {
 	 * @namespace
 	 * @alias sap.ui.rta
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @since 1.50
 	 * @private
 	 * @experimental This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name: "sap.ui.rta",
-		version: "1.113.0",
+		version: "1.114.1",
 		dependencies: ["sap.ui.core", "sap.m", "sap.ui.fl", "sap.ui.dt"],
 		types: [],
 		interfaces: [],

package/src/sap/ui/rta/messagebundle.properties

@@ -95,6 +95,12 @@ BTN_MENU=More Actions
 BTN_RESTORE=Reset
 #XBUT: Button 'UI Adaptation' of the Toolbar
 BTN_ADAPTATION=UI Adaptation
+#XBUT: Button 'Feedback' of the Toolbar
+BTN_FEEDBACK=Feedback
+#XBUT: Button 'Close' in Feedback Dialog
+BTN_CLOSE_FEEDBACK_DIALOG=Close
+#XTIT: Title for feedback dialog
+TIT_FEEDBACK=Give Feedback
 #XTIT: Title used for a button text, feed title and highlight text  to indicate the existence of a draft version in the current session
 TIT_DRAFT=Draft
 #XTIT: Title used for a button text, feed title and highlight text for the 'original app'
@@ -113,6 +119,10 @@ TIT_VERSION_HISTORY_UNPUBLISHED=Unpublished
 MSG_DRAFT_ACTIVATION_SUCCESS=New version activated
 #XMSG: message toast text when activated failed
 MSG_DRAFT_ACTIVATION_FAILED=Sorry, the draft cannot be activated at this time. Please try again later.
+#XMSG: message box text when version switch failed
+MSG_SWITCH_VERSION_FAILED=Failed to switch version. Please reload.
+#XMSG: message box text when adaptation switch failed
+MSG_SWITCH_ADAPTATION_FAILED=Failed to switch adaptation. Please reload.
 #TIT: Title of a published version
 TIT_VERSION_TITLE=Title
 #XTIT: Title for the dialog to state a title for a version the key user is about to activate
@@ -208,7 +218,7 @@ MSG_NO_FIELDS=No more content available
 #XHED: Dialog title for personalization exists
 HEADER_PERSONALIZATION_EXISTS=Information
 #XMSG: Dialog message for personalization exists
-MSG_PERSONALIZATION_OR_PUBLIC_VIEWS_EXISTS=You have personalized the app or there are public views. The app will now reload without these changes. Any recently made changes may remain active.
+MSG_PERSONALIZATION_OR_PUBLIC_VIEWS_EXISTS=You have personalized the app or there are public views. The app will now reload without these changes.
 #XMSG: MessageToast to warn users that changes made in navigation mode will be discarded after exit
 MSG_NAVIGATION_MODE_CHANGES_WARNING=Changes made to the UI in navigation mode will be discarded after you exit UI Adaptation.
 #XMSG: Dialog message for draft changes exists
@@ -245,6 +255,10 @@ MSG_RELOAD_WITH_VIEWS_PERSONALIZATION_AND_WITHOUT_DRAFT=The app will now reload
 MSG_RELOAD_WITH_PERSONALIZATION_AND_RESTRICTED_CONTEXT=The app will now reload with your personalization changes. Your public or role-specific views will be applied again.
 #XMSG: Dialog message for reload without restricted contexts
 MSG_RELOAD_WITHOUT_ALL_CONTEXT=The app will now reload with your public or role-specific views.
+#XMSG: Dialog message for reload without context-based adaptation and personalization changes
+MSG_RELOAD_WITH_PERSONALIZATION_AND_CONTEXT_BASED_ADAPTATION=The app will now reload with your personal changes and with the adaptation that has the highest priority matching your user roles.
+#XMSG: Dialog message for reload if key user adaptation is not the highest ranked context-based adaptation for end user
+MSG_RELOAD_OTHER_CONTEXT_BASED_ADAPTATION=The app will now reload with the adaptation that has the highest priority matching your user roles.
 #XMSG: Dialog message before a reload when personalization changes will be applied again
 MSG_RELOAD_WITH_ALL_CHANGES=The app will reload with all changes.
 #XMSG: Dialog message before a reload when changes need server-side processing and new cache tokens to be fetched (rare case for use to see this message)
@@ -540,10 +554,32 @@ MSG_NO_KEY_USER_RIGHTS_ERROR_MESSAGE=You do not have key user permissions. Pleas
 BTN_TOOLTIP_MOVE_UP=Move up
 #XBTN: Tooltip for button to move list item down
 BTN_TOOLTIP_MOVE_DOWN=Move down
+#XTIT: RTA toolbar menu button text if there is one context-based adaptation
+BTN_ADAPTING_FOR=Adapting for ''{0}''
+#XTIT: RTA toolbar menu button text  if there is no context-based adaptation
+BTN_ADAPTING_FOR_ALL_USERS=Adapting for 'All Users'
+#XTIT: Context-based Adaptation Sub Menu Button to switch to another context-based adaptation
+BTN_SWITCH_ADAPTATIONS=Switch Adaptations
 #XTIT: Context-Based Adaptation Edit Dialog title
 EAC_DIALOG_HEADER=Edit Adaptation
 #XTIT: Context-Based Adaptation Save Dialog title
 SAC_DIALOG_HEADER=Save as New Adaptation
+#XTIT: Context-Based Adaptation Delete Dialog title
+DAC_DIALOG_HEADER=Delete Adaptation
+#XTIT: Context-Based Adaptation Delete Dialog description
+DAC_DIALOG_DESCRIPTION=Do you really want to delete this adaptation?
+#XMSG: Context-Based Adaptation dialog to delete but unsaved changes exist description
+DAC_DATA_LOSS_DIALOG_DESCRIPTION=You have unsaved UI changes. Deleting this adaptation will also delete the UI changes. Do you really want to delete this adaptation?
+#XTIT: Context-Based Adaptation Migration Dialog title
+DAC_DIALOG_MIGRATION_HEADER=Migrate Views
+#XMSG: Context-Based Adaptation Migration Dialog description
+DAC_DIALOG_MIGRATION_DESCRIPTION=We noticed that you've already assigned roles to views in this application. If you want to create an adaptation, you need to migrate these views to adaptations.\n After the migration, every view that was assigned to a role will be included in an adaptation. 
+#XMSG: Context-Based Adaptation Migration Dialog description
+DAC_DIALOG_MIGRATION_DIRTY_DESCRIPTION=We noticed that you've already assigned roles to views in this application. If you want to create an adaptation, you need to migrate these views to adaptations.\n After the migration, every view that was assigned to a role will be included in an adaptation.\n\n You have unsaved UI changes. These will be discarded before the migration.
+#XMSG: Context-Based Adaptation Migration Successful Dialog description
+DAC_DIALOG_MIGRATION_SUCCESSFULL_DESCRIPTION=Views have been successfully migrated.\n You can now switch to the created adaptations and verify them.
+#XMSG: Context-Based Adaptation Migration Error Dialog description
+DAC_DIALOG_MIGRATION_ERROR_DESCRIPTION=An Error occurred during the migration. Please try again later or contact your administrator.
 #XTITT: Context-Based Adaptation Manage Dialog title
 MANAGE_ADAPTATIONS_DIALOG_HEADER=Manage Adaptations
 #XTIT: Text for Manage Adaptations Button in RTA toolbar
@@ -589,11 +625,13 @@ TXT_TABLE_CONTEXT_CELL_ROLE=role
 #XFLD: postfix for context table cell
 TXT_TABLE_CONTEXT_CELL_ROLES=roles
 #XTXT: title of adaptation without contexts
-TXT_DEFAULT_APP=Default App
+TXT_DEFAULT_APP=Context-free adaptation
 #XBUT: Context-Based Adaptation predefined text for Save button
 APP_CTX_DIALOG_SAVE=Save
 #XBUT: Context-Based Adaptation predefined text for Cancel button
 APP_CTX_DIALOG_CANCEL=Cancel
+#XBUT: Context-Based Adaptation predefined text for Confirm button
+APP_CTX_DIALOG_CONFIRM=Confirm
 TOOLTIP_APP_CTX_DIALOG_SAVE=Context-based adaptation has not been changed.
 #TXT: Context-Based Adaptation duplicate title error message
 TXT_CTX_ERROR_DUPLICATE_TITLE=The adaptation title already exists. Please enter a different title.