resolving merge conflict

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
openhab · Apr 7, 2023 · 02b521b · 02b521b
1 parent 3592c8e
commit 02b521b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...hab.core.automation.module.script/src/main/resources/OH-INF/i18n/scriptprofile.properties b/...hab.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.