Merge branch 'Shortcuts' into ShortcutDialog

wise0704 · wise0704 · commit 38375eabd5f2 · 2015-12-09T15:54:18.000+13:00
diff --git a/FlashDevelop/Dialogs/ShortcutDialog.cs b/FlashDevelop/Dialogs/ShortcutDialog.cs
diff --git a/FlashDevelop/MainForm.cs b/FlashDevelop/MainForm.cs
@@ -2016,7 +2016,7 @@ public void ApplyAllSettings()
         {
             if (this.InvokeRequired)
             {
-                this.BeginInvoke((MethodInvoker)delegate { this.ApplyAllSettings(); });
+                this.BeginInvoke((MethodInvoker) this.ApplyAllSettings);
                 return;
             }
             ShortcutManager.ApplyAllShortcuts();
diff --git a/PluginCore/PluginCore/Resources/de_DE.resX b/PluginCore/PluginCore/Resources/de_DE.resX
@@ -5964,4 +5964,8 @@ Eigene Sprachumgebungen müssen eine Erweiterung der Standard-Sprachumgebung sei
     <value>Highlight word:</value>
     <comment>Added after 5.0.2</comment>
   </data>
+  <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
+    <value>There are one or more conflicts present.</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
 </root>
diff --git a/PluginCore/PluginCore/Resources/en_US.resX b/PluginCore/PluginCore/Resources/en_US.resX
@@ -5980,4 +5980,7 @@ Custom locales must be an extension of a default locale, e.g. en-US.</value>
     <value>Highlight word:</value>
     <comment>Added after 5.0.2</comment>
   </data>
+  <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
+    <value>There are one or more conflicts present.</value>
+  </data>
 </root>
diff --git a/PluginCore/PluginCore/Resources/eu_ES.resX b/PluginCore/PluginCore/Resources/eu_ES.resX
@@ -5961,4 +5961,8 @@ Lokalizazio pertsonalizatuek lehenetsiaren luzapen bat izan behar dute, adb. en-
     <value>Highlight word:</value>
     <comment>Added after 5.0.2</comment>
   </data>
+  <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
+    <value>There are one or more conflicts present.</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
 </root>
diff --git a/PluginCore/PluginCore/Resources/ja_JP.resX b/PluginCore/PluginCore/Resources/ja_JP.resX
@@ -6022,4 +6022,8 @@ UseData:"</value>
     <value>Highlight word:</value>
     <comment>Added after 5.0.2</comment>
   </data>
+  <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
+    <value>There are one or more conflicts present.</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
 </root>
diff --git a/PluginCore/PluginCore/Resources/zh_CN.resx b/PluginCore/PluginCore/Resources/zh_CN.resx
@@ -5974,4 +5974,8 @@
     <value>Highlight word:</value>
     <comment>Added after 5.0.2</comment>
   </data>
+  <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
+    <value>There are one or more conflicts present.</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -2016,7 +2016,7 @@ public void ApplyAllSettings()`
`2016`	`2016`	`{`
`2017`	`2017`	`if (this.InvokeRequired)`
`2018`	`2018`	`{`
`2019`		`- this.BeginInvoke((MethodInvoker)delegate { this.ApplyAllSettings(); });`
	`2019`	`+ this.BeginInvoke((MethodInvoker) this.ApplyAllSettings);`
`2020`	`2020`	`return;`
`2021`	`2021`	`}`
`2022`	`2022`	`ShortcutManager.ApplyAllShortcuts();`