Revert previous merge

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/shortcuts@4415 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs

@@ -276,7 +276,7 @@ namespace PythonBinding.Tests
 		[Test]
 		public void PythonRunMenuItemShortcut()
 		{
-			Assert.AreEqual("Ctrl+Shift+R", pythonRunMenuItemCodon["shortcut"]);
+			Assert.AreEqual("Control|Shift|R", pythonRunMenuItemCodon["shortcut"]);
 		}
 		
 		[Test]
@@ -741,7 +741,7 @@ namespace PythonBinding.Tests
 		[Test]
 		public void PythonRunWithoutDebuggerMenuItemShortcut()
 		{
-			Assert.AreEqual("Ctrl+Shift+W", pythonWithoutDebuggerRunMenuItemCodon["shortcut"]);
+			Assert.AreEqual("Control|Shift|W", pythonWithoutDebuggerRunMenuItemCodon["shortcut"]);
 		}
 		
 		[Test]

src/Main/ICSharpCode.Core.Presentation/Test/InputGestureTests.cs

@@ -125,6 +125,7 @@ namespace ICSharpCode.Core.Presentation.Tests
 			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+");
 			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
 			Assert.IsTrue(template1.IsTemplateFor(original1, GestureCompareMode.StartsWith));
+			Assert.IsTrue(original1.IsTemplateFor(template1, GestureCompareMode.StartsWith));
 			
 			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
 			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");