Merge branch 'development' into debugtree_copy

Author: Neverbirth

External/Plugins/ProjectManager/Projects/ProjectPaths.cs

@@ -13,8 +13,20 @@ public static string GetRelativePath(string baseDirectory, string path)
                 throw new ArgumentException("The path is already relative.");
 
             char slash = Path.DirectorySeparatorChar;
-            string[] a = baseDirectory.Trim(slash).Split(slash);
-            string[] b = path.Trim(slash).Split(slash);
+            path = path.TrimEnd(slash);
+            baseDirectory = baseDirectory.TrimEnd(slash);
+
+            // trivial cases
+            if (path == baseDirectory) 
+                return "";
+            if (path[1] == ':' && path[0] != baseDirectory[0]) // drive
+                return path; 
+            if (path.Length > baseDirectory.Length && path.StartsWith(baseDirectory + slash))
+                return path.Substring(baseDirectory.Length + 1);
+
+            // resolve relative path
+            string[] a = baseDirectory.Split(slash);
+            string[] b = path.Split(slash);
 
             ArrayList relPath = new ArrayList();
             int i = 0;
@@ -26,6 +38,10 @@ public static string GetRelativePath(string baseDirectory, string path)
                     break;
             }
 
+            // only common drive letter, consider not relative
+            if (i <= 1)
+                return path; 
+
             // at this point, i is the index of the first diverging element of the two paths
             int backtracks = a.Length - i;
             for (int j = 0; j < backtracks; j++)

FlashDevelop/Bin/Debug/FirstRun.fdb

@@ -5900,7 +5900,7 @@ Eigene Sprachumgebungen müssen eine Erweiterung der Standard-Sprachumgebung sei
     <value>Disables the move refactoring of files and folders.</value>
     <comment>Added after 4.7.2</comment>
   </data>
-  <data name="HighlightMatchingWordsDelay" xml:space="preserve">
+  <data name="FlashDevelop.Description.HighlightMatchingWordsDelay" xml:space="preserve">
     <value>The delay in milliseconds after the word match highlight should be shown.</value>
     <comment>Added after 4.7.2</comment>
   </data>

PluginCore/PluginCore/Resources/de_DE.resX

@@ -5913,7 +5913,7 @@ Custom locales must be an extension of a default locale, e.g. en-US.</value>
     <value>Disables the move refactoring of files and folders.</value>
     <comment>Added after 4.7.2</comment>
   </data>
-  <data name="HighlightMatchingWordsDelay" xml:space="preserve">
+  <data name="FlashDevelop.Description.HighlightMatchingWordsDelay" xml:space="preserve">
     <value>The delay in milliseconds after the word match highlight should be shown.</value>
     <comment>Added after 4.7.2</comment>
   </data>

PluginCore/PluginCore/Resources/en_US.resX

@@ -5897,7 +5897,7 @@ Lokalizazio pertsonalizatuek lehenetsiaren luzapen bat izan behar dute, adb. en-
     <value>Disables the move refactoring of files and folders.</value>
     <comment>Added after 4.7.2</comment>
   </data>
-  <data name="HighlightMatchingWordsDelay" xml:space="preserve">
+  <data name="FlashDevelop.Description.HighlightMatchingWordsDelay" xml:space="preserve">
     <value>The delay in milliseconds after the word match highlight should be shown.</value>
     <comment>Added after 4.7.2</comment>
   </data>

PluginCore/PluginCore/Resources/eu_ES.resX

@@ -5962,7 +5962,7 @@ UseData:"</value>
     <value>Disables the move refactoring of files and folders.</value>
     <comment>Added after 4.7.2</comment>
   </data>
-  <data name="HighlightMatchingWordsDelay" xml:space="preserve">
+  <data name="FlashDevelop.Description.HighlightMatchingWordsDelay" xml:space="preserve">
     <value>The delay in milliseconds after the word match highlight should be shown.</value>
     <comment>Added after 4.7.2</comment>
   </data>

PluginCore/PluginCore/Resources/ja_JP.resX

@@ -5910,7 +5910,7 @@
     <value>Disables the move refactoring of files and folders.</value>
     <comment>Added after 4.7.2</comment>
   </data>
-  <data name="HighlightMatchingWordsDelay" xml:space="preserve">
+  <data name="FlashDevelop.Description.HighlightMatchingWordsDelay" xml:space="preserve">
     <value>The delay in milliseconds after the word match highlight should be shown.</value>
     <comment>Added after 4.7.2</comment>
   </data>