diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java
index 3183a619b1ff..78c5ba756923 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/IgnoreWhiteSpacesAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.diff.actions;
 
+import com.intellij.CommonBundle;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -40,16 +41,15 @@ public class IgnoreWhiteSpacesAction extends ComboBoxAction implements DumbAware
     ComparisonPolicy.IGNORE_SPACE};
 
   public IgnoreWhiteSpacesAction() {
-    myActions.put(ComparisonPolicy.DEFAULT, new IgnoringPolicyAction(DiffBundle.message("diff.acton.ignore.qhitespace.policy.do.not.ignore"), ComparisonPolicy.DEFAULT));
-    myActions.put(ComparisonPolicy.TRIM_SPACE, new IgnoringPolicyAction(
-      DiffBundle.message("diff.acton.ignore.qhitespace.policy.leading.and.trailing"), ComparisonPolicy.TRIM_SPACE));
-    myActions.put(ComparisonPolicy.IGNORE_SPACE, new IgnoringPolicyAction(DiffBundle.message("diff.acton.ignore.qhitespace.policy.all"), ComparisonPolicy.IGNORE_SPACE));
+    myActions.put(ComparisonPolicy.DEFAULT, new IgnoringPolicyAction(DiffBundle.message("diff.acton.ignore.whitespace.policy.do.not.ignore"), ComparisonPolicy.DEFAULT));
+    myActions.put(ComparisonPolicy.TRIM_SPACE, new IgnoringPolicyAction(DiffBundle.message("diff.acton.ignore.whitespace.policy.leading.and.trailing"), ComparisonPolicy.TRIM_SPACE));
+    myActions.put(ComparisonPolicy.IGNORE_SPACE, new IgnoringPolicyAction(DiffBundle.message("diff.acton.ignore.whitespace.policy.all"), ComparisonPolicy.IGNORE_SPACE));
   }
 
   @Override
   public JComponent createCustomComponent(final Presentation presentation) {
     JPanel panel = new JPanel(new BorderLayout());
-    final JLabel label = new JLabel(DiffBundle.message("comparison.ignore.whitespace.acton.name"));
+    final JLabel label = new JLabel(CommonBundle.message("comparison.ignore.whitespace.acton.name"));
     label.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
     panel.add(label, BorderLayout.WEST);
     panel.add(super.createCustomComponent(presentation), BorderLayout.CENTER);
@@ -77,7 +77,7 @@ public class IgnoreWhiteSpacesAction extends ComboBoxAction implements DumbAware
       presentation.setEnabled(true);
     } else {
       presentation.setIcon(null);
-      presentation.setText(DiffBundle.message("ignore.whitespace.action.not.avaliable.action.name"));
+      presentation.setText(DiffBundle.message("ignore.whitespace.action.not.available.action.name"));
       presentation.setEnabled(false);
     }
   }
diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties
index b852cdd8f097..a8a3af2a3c47 100644
--- a/platform/platform-resources-en/src/messages/DiffBundle.properties
+++ b/platform/platform-resources-en/src/messages/DiffBundle.properties
@@ -23,10 +23,10 @@ diff.compare.element.type.with.editor.action.name=Compare File with Editor
 diff.element.qualified.name.vs.editor.dialog.title={0} vs Editor
 diff.element.qualified.name.vs.file.dialog.title={0} vs {1}
 diff.element.qualified.name.vs.element.qualified.name.dialog.title={0} vs {1}
-diff.acton.ignore.qhitespace.policy.do.not.ignore=Do not ignore
-diff.acton.ignore.qhitespace.policy.leading.and.trailing=Leading and trailing
-diff.acton.ignore.qhitespace.policy.all=All
-ignore.whitespace.action.not.avaliable.action.name=<Not available>
+diff.acton.ignore.whitespace.policy.do.not.ignore=Do not ignore
+diff.acton.ignore.whitespace.policy.leading.and.trailing=Leading and trailing
+diff.acton.ignore.whitespace.policy.all=All
+ignore.whitespace.action.not.available.action.name=<Not available>
 diff.dialog.select.change.action.name=Select Change
 diff.dialog.select.change.action.description=Select changed text in this version and corresponding in other
 merge.files.dialog.title=Merge
@@ -34,10 +34,6 @@ merge.dialog.cannot.load.file.error.message=Cannot load file: {0}
 merge.editor.replace.operation.name=Replace
 merge.editor.insert.operation.name=Insert
 merge.editor.remove.operation.name=Remove
-comparison.policy.default.name=Default
-comparison.policy.trim.space.name=Trim space
-comparison.policy.ignore.spaces.name=Ignore spaces
-comparison.ignore.whitespace.acton.name=Ignore whitespace:
 diff.count.differences.status.text={0, choice, 0#no differences|1#1 difference|2#{0, number} differences}
 cant.launch.diff.tool.error.message=Can''t Launch Diff Tool
 binary.files.are.identical.message=Binary files are identical