Merge pull request #4777 from modelica/DagBruck-patch-1

Unit present verbatim in text annotation, fixes issue  3630.

Author: DagBruck

Modelica/Blocks/Interfaces.mo

@@ -1375,7 +1375,7 @@ converts from one unit into another one.
                 {48,13},{56,13},{56,-53},{66,-53}}),
           Text(
             extent={{-150,-110},{150,-150}},
-            textString="%samplePeriod s"),
+            textString="%{samplePeriod}"),
           Line(visible=not enableNoise,
             points={{-76,48},{72,48}}),
           Text(visible=not enableNoise,

Modelica/Blocks/MathBoolean.mo

@@ -411,7 +411,7 @@ The usage is demonstrated, e.g., in example
         annotation (Icon(graphics={
             Text(
               extent={{-250,-120},{250,-150}},
-              textString="%delayTime s"),
+              textString="%{delayTime}"),
             Line(points={{-80,-66},{-60,-66},{-60,-22},{38,-22},{38,-66},{66,-66}}),
             Line(points={{-80,32},{-4,32},{-4,76},{38,76},{38,32},{66,32}},
                 color={255,0,255})}),