AI-223.8836.35.2231.9848316 <debuggerx@debuggerx-e5 Merge branch 'master'

Conflicts:
	yiiguxing.translation.xml

yiiguxing.translation.xml

@@ -4,8 +4,13 @@
   </component>
   <component name="Translation.States">
     <histories>
-      <item value="Get the bytes from the image. You can use this to access the color channels directly, or to pass it to something like an Html canvas context. Specifying the [format] will convert the image data to the specified format. Images are stored internally in Format.rgba format; any other format will require a conversion. For example, given an Html Canvas, you could draw this image into the canvas: Html.ImageData d = context2D.createImageData(image.width, image.height); d.data.setRange(0, image.length, image.getBytes(format: Format.rgba)); context2D.putImageData(data, 0, 0);" />
-      <item value="Malformed" />
+      <item value="Targets that defer to their children receive events within their bounds only if one of their children is hit by the hit test." />
+      <item value="Translucent targets both receive events within their bounds and permit targets visually behind them to also receive events." />
+      <item value="Opaque targets can be hit by hit tests, causing them to both receive events within their bounds and prevent targets visually behind them from also receiving events." />
+      <item value="Controls how tall the selection highlight boxes are computed to be. See [ui.BoxHeightStyle] for details on available styles." />
+      <item value="Unmanaged Restoration Scope" />
+      <item value="basic Style" />
+      <item value="decorated Style" />
       <item value="The argument [timeout] is used to specify the maximum allowed time to wait for a connection to be established. If [timeout] is longer than the system level timeout duration, a timeout may occur sooner than specified in [timeout]. On timeout, a [SocketException] is thrown and all ongoing connection attempts to [host] are cancelled." />
       <item value="The [sourcePort] defines the local port to bind to. If [sourcePort] is not specified or zero, a port will be chosen." />
       <item value="The argument [sourceAddress] can be used to specify the local address to bind when making the connection. The [sourceAddress] can either be a [String] or an [InternetAddress]. If a [String] is passed it must hold a numeric IP address." />
@@ -27,8 +32,8 @@
     </histories>
     <option name="languageScores">
       <map>
-        <entry key="CHINESE" value="17" />
-        <entry key="ENGLISH" value="18" />
+        <entry key="CHINESE" value="24" />
+        <entry key="ENGLISH" value="25" />
       </map>
     </option>
   </component>