AI-Arctic Fox | 2020.3.1 Patch 2 <debuggerx@debuggerx Merge branch 'master'

Conflicts:
	yiiguxing.translation.xml

pluginAdvertiser.xml

@@ -540,9 +540,8 @@
         <entry key="*.ignore">
           <value>
             <plugin>
-              <option name="myPluginId" value="com.intellij" />
-              <option name="myPluginName" value="IDEA CORE" />
-              <option name="myBundled" value="true" />
+              <option name="myPluginId" value="mobi.hsz.idea.gitignore" />
+              <option name="myPluginName" value=".ignore" />
             </plugin>
           </value>
         </entry>

yiiguxing.translation.xml

@@ -5,8 +5,13 @@
     <option name="newTranslationDialogX" value="948" />
     <option name="newTranslationDialogY" value="618" />
     <histories>
-      <item value="中等" />
-      <item value="Panel" />
+      <item value="ascending" />
+      <item value="copyable" />
+      <item value="Primary ScrollViews obtain their ScrollController via inheritance from a PrimaryScrollController widget. You cannot both set primary to true and pass an explicit controller." />
+      <item value="Metrics" />
+      <item value="_hovering" />
+      <item value="Ink Ripple" />
+      <item value="Interactive Ink Feature Factory" />
       <item value="drawer" />
       <item value="gender" />
       <item value="调色板" />
@@ -50,22 +55,28 @@
       <item value="squeeze" />
       <item value="A default selection overlay for [CupertinoPicker]s. It draws a gray rounded rectangle to match the picker visuals introduced in iOS 14. This widget is typically only used in [CupertinoPicker.selectionOverlay]. In an iOS 14 multi-column picker, the selection overlay is a single rounded rectangle that spans the entire multi-column picker. To achieve the same effect using [CupertinoPickerDefaultSelectionOverlay], the additional margin and corner radii on the left or the right side can be disabled by turning off [capLeftEdge] and [capRightEdge], so this selection overlay visually connects with selection overlays of adjoining [CupertinoPicker]s (i.e., other &quot;column&quot;s). See also: [CupertinoPicker], which uses this widget as its default [CupertinoPicker.selectionOverlay]." />
       <item value="Creates an iOS 14 style selection overlay that highlights the magnified area (or the currently selected item, depending on how you described it elsewhere) of a [CupertinoPicker]. The [background] argument default value is [CupertinoColors.tertiarySystemFill]. It must be non-null. The [capLeftEdge] and [capRightEdge] arguments decide whether to add a default margin and use rounded corners on the left and right side of the rectangular overlay. Default to true and must not be null." />
-      <item value="Cupertino Picker Default Selection Overlay" />
-      <item value="_k Over And Under Center Opacity" />
-      <item value="Evaluates a JavaScript expression in the context of the current page. On Android returns the evaluation result as a JSON formatted string. On iOS depending on the value type the return value would be one of: - For primitive JavaScript types: the value string formatted (e.g JavaScript 100 returns '100'). - For JavaScript arrays of supported types: a string formatted NSArray(e.g '(1,2,3), note that the string for NSArray is formatted and might contain newlines and extra spaces.'). - Other non-primitive types are not supported on iOS and will complete the Future with an error. The Future completes with an error if a JavaScript error occurred, or on iOS, if the type of the evaluated expression is not supported as described above. When evaluating Javascript in a [WebView], it is best practice to wait for the [WebView.onPageFinished] callback. This guarantees all the Javascript embedded in the main frame HTML has been loaded." />
-      <item value="The center slice for a nine-patch image. The region of the image inside the center slice will be stretched both horizontally and vertically to fit the image into its destination. The region of the image above and below the center slice will be stretched only horizontally and the region of the image to the left and right of the center slice will be stretched only vertically. The stretching will be applied in order to make the image fit into the box specified by [fit]. When [centerSlice] is not null, [fit] defaults to [BoxFit.fill], which distorts the destination image size relative to the image's original aspect ratio. Values of [BoxFit] which do not distort the destination image size will result in [centerSlice] having no effect (since the nine regions of the image will be rendered with the same scaling, as if it wasn't specified)." />
-      <item value="covariant" />
     </histories>
     <option name="languageScores">
       <map>
-        <entry key="CHINESE" value="108" />
-        <entry key="ENGLISH" value="108" />
+        <entry key="CHINESE" value="106" />
+        <entry key="ENGLISH" value="107" />
         <entry key="DUTCH" value="1" />
         <entry key="SWEDISH" value="1" />
       </map>
     </option>
   </component>
   <component name="Cache">
-    <option name="lastTrimTime" value="1633109676382" />
+    <option name="lastTrimTime" value="1633663127363" />
+  </component>
+  <component name="Settings">
+    <option name="googleTranslateSettings">
+      <google-translate>
+        <option name="useTranslateGoogleCom" value="true" />
+      </google-translate>
+    </option>
+    <option name="overrideFont" value="true" />
+    <option name="phoneticFontFamily" value="Noto Sans Mono" />
+    <option name="primaryFontFamily" value="WenQuanYi Micro Hei Mono" />
+    <option name="translateDocumentation" value="true" />
   </component>
 </application>