From 02b521bd42d32dc2b90024096095e5277b9750c9 Mon Sep 17 00:00:00 2001 From: Jimmy Tanagra Date: Fri, 7 Apr 2023 23:11:28 +1000 Subject: [PATCH] resolving merge conflict Signed-off-by: Jimmy Tanagra --- .../main/resources/OH-INF/i18n/scriptprofile.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.core.automation.module.script/src/main/resources/OH-INF/i18n/scriptprofile.properties b/bundles/org.openhab.core.automation.module.script/src/main/resources/OH-INF/i18n/scriptprofile.properties index 08f3173cd1a..8c0323b52b6 100644 --- a/bundles/org.openhab.core.automation.module.script/src/main/resources/OH-INF/i18n/scriptprofile.properties +++ b/bundles/org.openhab.core.automation.module.script/src/main/resources/OH-INF/i18n/scriptprofile.properties @@ -1,4 +1,4 @@ -profile.system.script.toItemScript.label = To Item Script -profile.system.script.toItemScript.description = The Script for transforming states and commands from handler to item. -profile.system.script.toHandlerScript.label = To Handler Script -profile.system.script.toHandlerScript.description = The Script for transforming states and commands from item to handler. +profile.system.script.toItemScript.label = Thing To Item Transformation +profile.system.script.toItemScript.description = The Script for transforming state updates and commands from the Thing handler to the item. The script may return null to discard the updates/commands and not pass them through. +profile.system.script.toHandlerScript.label = Item To Thing Transformation +profile.system.script.toHandlerScript.description = The Script for transforming commands from the item to the Thing handler. The script may return null to discard the commands and not pass them through.