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

Conflicts:
	editor.xml
	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>