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

Conflicts:
	yiiguxing.translation.xml

colors/My Vim dark .icls

@@ -1,18 +1,17 @@
 <scheme name="My Vim dark " version="142" parent_scheme="Default">
-  <option name="FONT_SCALE" value="1.0" />
+  <option name="FONT_SCALE" value="1.5" />
   <option name="LINE_SPACING" value="1.0" />
   <font>
     <option name="EDITOR_FONT_NAME" value="Fira Code SemiBold" />
-    <option name="EDITOR_FONT_SIZE" value="14" />
+    <option name="EDITOR_FONT_SIZE" value="21" />
   </font>
   <font>
-    <option name="EDITOR_FONT_NAME" value="DejaVu Sans Mono" />
+    <option name="EDITOR_FONT_NAME" value="WenQuanYi Micro Hei" />
-    <option name="EDITOR_FONT_SIZE" value="14" />
+    <option name="EDITOR_FONT_SIZE" value="21" />
   </font>
   <option name="EDITOR_LIGATURES" value="true" />
   <option name="CONSOLE_FONT_NAME" value="DejaVu Sans Mono" />
-  <option name="CONSOLE_FONT_SIZE" value="12" />
+  <option name="CONSOLE_FONT_SIZE" value="18" />
-  <option name="EDITOR_QUICK_DOC_FONT_SIZE" value="MEDIUM" />
   <colors>
     <option name="ADDED_LINES_COLOR" value="295622" />
     <option name="BORDER_LINES_COLOR" value="cfe7ff" />

editor.xml

@@ -20,7 +20,11 @@
     <option name="collapseParts" value="false" />
   </component>
   <component name="DefaultFont">
+    <option name="FONT_SIZE" value="20" />
+    <option name="FONT_FAMILY" value="Fira Code" />
+    <option name="FONT_SCALE" value="1.5" />
     <option name="USE_LIGATURES" value="true" />
+    <option name="SECONDARY_FONT_FAMILY" value="WenQuanYi Micro Hei" />
   </component>
   <component name="EditorSettings">
     <option name="USE_SOFT_WRAPS" value="CONSOLE" />

pluginAdvertiser.xml

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

vcs.xml

@@ -142,6 +142,10 @@
           <option name="url" value="https://github.com/CaiJingLong/flutter_photo.git" />
           <option name="userName" value="" />
         </UrlAndUserName>
+        <UrlAndUserName>
+          <option name="url" value="http://home.debuggerx.com:3000/debuggerx/dde_gesture_manager.git" />
+          <option name="userName" value="" />
+        </UrlAndUserName>
       </list>
     </option>
     <option name="cloneParentDir" value="$USER_HOME$/AndroidStudioProjects" />

yiiguxing.translation.xml

@@ -5,9 +5,6 @@
     <option name="newTranslationDialogX" value="948" />
     <option name="newTranslationDialogY" value="618" />
     <histories>
-      <item value="make health friend add function can use pick qr code image from album." />
-      <item value="make add health friend function can use pick qr code image from album." />
-      <item value="periodic" />
       <item value="temporarily" />
       <item value="The network is temporarily good for the server connection network" />
       <item value="fix: fix wrong logic when no user info fetched caused by bad network." />
@@ -55,6 +52,9 @@
       <item value="Refactory" />
       <item value="ecg binary" />
       <item value="Converts the given JSON-string [input] to its corresponding object. Parsed JSON values are of the types [num], [String], [bool], [Null], [List]s of parsed JSON values or [Map]s from [String] to parsed JSON values. If `this` was initialized with a reviver, then the parsing operation invokes the reviver on every object or list property that has been parsed. The arguments are the property name ([String]) or list index ([int]), and the value is the parsed value. The return value of the reviver is used as the value of that property instead the parsed value. Throws [FormatException] if the input is not valid JSON text." />
+      <item value="portrait" />
+      <item value="signal Frequency" />
+      <item value="emergency" />
     </histories>
     <option name="languageScores">
       <map>
@@ -66,7 +66,7 @@
     </option>
   </component>
   <component name="Cache">
-    <option name="lastTrimTime" value="1631683033618" />
+    <option name="lastTrimTime" value="1631509501317" />
   </component>
   <component name="Settings">
     <option name="googleTranslateSettings">
@@ -75,7 +75,7 @@
       </google-translate>
     </option>
     <option name="overrideFont" value="true" />
-    <option name="phoneticFontFamily" value="Droid Sans Fallback" />
+    <option name="phoneticFontFamily" value="Noto Sans Mono" />
     <option name="primaryFontFamily" value="WenQuanYi Micro Hei Mono" />
     <option name="translateDocumentation" value="true" />
   </component>