Merge branch 'development' of https://github.com/fdorg/flashdevelop into Korean

wise0704 · wise0704 · commit a24105ea7ba0 · 2016-01-30T21:12:40.000+13:00
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ PluginCore/Bin
 /FlashDevelop/Bin/Debug/Exceptions.log
 /FlashDevelop/Bin/Debug/Tools/fdbuild/fdbuild.exe
 FlashDevelop/Bin/Debug/Settings/Themes/CURRENT
+packages/
diff --git a/FlashDevelop/Dialogs/ShortcutDialog.cs b/FlashDevelop/Dialogs/ShortcutDialog.cs
diff --git a/FlashDevelop/MainForm.cs b/FlashDevelop/MainForm.cs
@@ -2045,7 +2045,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,6 +5964,10 @@ 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. Ignore and continue?</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>
diff --git a/PluginCore/PluginCore/Resources/en_US.resX b/PluginCore/PluginCore/Resources/en_US.resX
@@ -5980,6 +5980,9 @@ 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. Ignore and continue?</value>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
   </data>
diff --git a/PluginCore/PluginCore/Resources/eu_ES.resX b/PluginCore/PluginCore/Resources/eu_ES.resX
@@ -5961,6 +5961,10 @@ 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. Ignore and continue?</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>
diff --git a/PluginCore/PluginCore/Resources/ja_JP.resX b/PluginCore/PluginCore/Resources/ja_JP.resX
@@ -6022,6 +6022,10 @@ 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. Ignore and continue?</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>
diff --git a/PluginCore/PluginCore/Resources/zh_CN.resx b/PluginCore/PluginCore/Resources/zh_CN.resx
@@ -5974,6 +5974,10 @@
     <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. Ignore and continue?</value>
+    <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>

Original file line number	Diff line number	Diff line change
`@@ -2045,7 +2045,7 @@ public void ApplyAllSettings()`
`2045`	`2045`	`{`
`2046`	`2046`	`if (this.InvokeRequired)`
`2047`	`2047`	`{`
`2048`		`- this.BeginInvoke((MethodInvoker)delegate { this.ApplyAllSettings(); });`
	`2048`	`+ this.BeginInvoke((MethodInvoker) this.ApplyAllSettings);`
`2049`	`2049`	`return;`
`2050`	`2050`	`}`
`2051`	`2051`	`ShortcutManager.ApplyAllShortcuts();`