Merge remote-tracking branch 'origin/master' into master

Author: Hexer10

UI/Components/EditorElement.xaml.cs

@@ -237,6 +237,7 @@ private async void TextArea_MouseDown(object sender, MouseButtonEventArgs e)
                 //TODO: Match definition for all the sm directories
                 var config = Program.Configs[Program.SelectedConfig].SMDirectories.First();
                 var file = Path.GetFullPath(Path.Combine(config, "include", sm.File)) + ".inc";
+                await Task.Delay(50);
                 var result = Program.MainWindow.TryLoadSourceFile(file,
                     true, false, true);
                 if (!result)
@@ -249,12 +250,9 @@ private async void TextArea_MouseDown(object sender, MouseButtonEventArgs e)
                 Debug.Assert(newEditor != null);
                 newEditor.editor.TextArea.Caret.Offset = sm.Index;
                 newEditor.editor.TextArea.Caret.BringCaretToView();
-                await Task.Delay(100);
                 newEditor.editor.TextArea.Selection =
                     Selection.Create(newEditor.editor.TextArea, sm.Index, sm.Index + sm.Length);
             }
-            
-
         }
 
         private SMBaseDefinition MatchDefinition(SMDefinition smDef, string word, MouseButtonEventArgs e, bool currentFile = false)

UI/Windows/AboutWindow.xaml

@@ -68,6 +68,7 @@
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- JOMENVEST (Swedish translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Grey83 (Russian translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Ghost Rideaux (Portuguese translation)" />
+                        <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- ratawar (Spanish translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Trostal (Korean translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Johnny2525 (Korean translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Mithat Güner (Turkish translation)" />