diff --git a/python/python-psi-impl/resources/messages/PyPsiBundle.properties b/python/python-psi-impl/resources/messages/PyPsiBundle.properties
index 1436e5d86dcf..993eced399bf 100644
--- a/python/python-psi-impl/resources/messages/PyPsiBundle.properties
+++ b/python/python-psi-impl/resources/messages/PyPsiBundle.properties
@@ -833,6 +833,9 @@ INSP.unresolved.refs.class.object.has.no.attribute=''{0}'' object has no attribu
 INSP.unresolved.refs.import.resolves.to.its.containing.file=Import resolves to its containing file
 INSP.unresolved.refs.class.does.not.define.operator=Class ''{0}'' does not define ''{1}'', so the ''{2}'' operator cannot be used on its instances
 INSP.unresolved.refs.column.name.ignore.references=Ignore References
+unresolved.docstring.param.reference=Function ''{0}'' does not have a parameter ''{1}''
+unresolved.import.reference=No module named ''{0}''
+
 python.stub=Python stub
 
 # PyRedundantParenthesesInspection
diff --git a/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java b/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java
index c02e25e8690d..1edff205704b 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/documentation/docstrings/DocStringParameterReference.java
@@ -11,6 +11,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.IncorrectOperationException;
 import com.jetbrains.python.PyNames;
+import com.jetbrains.python.PyPsiBundle;
 import com.jetbrains.python.psi.*;
 import com.jetbrains.python.psi.impl.ParamHelper;
 import com.jetbrains.python.psi.types.TypeEvalContext;
@@ -166,7 +167,7 @@ public class DocStringParameterReference extends PsiReferenceBase<PyStringLitera
     PyDocStringOwner owner = PsiTreeUtil.getParentOfType(getElement(), PyDocStringOwner.class);
     if (owner instanceof PyFunction) {
       PyFunction function = (PyFunction)owner;
-      return "Function '" + function.getName() + "' does not have a parameter '" + getCanonicalText() + "'";
+      return PyPsiBundle.message("unresolved.docstring.param.reference", function.getName(), getCanonicalText());
     }
     return null;
   }
diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java
index 1aa11076feca..b7f3b1814325 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/references/PyImportReference.java
@@ -18,6 +18,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.python.PyNames;
+import com.jetbrains.python.PyPsiBundle;
 import com.jetbrains.python.PyTokenTypes;
 import com.jetbrains.python.psi.*;
 import com.jetbrains.python.psi.impl.PyPsiUtils;
@@ -61,7 +62,7 @@ public class PyImportReference extends PyReferenceImpl {
   public String getUnresolvedDescription() {
     final PyImportStatement importStatement = PsiTreeUtil.getParentOfType(myElement, PyImportStatement.class);
     if (importStatement != null) {
-      return "No module named " + myElement.getReferencedName();
+      return PyPsiBundle.message("unresolved.import.reference", myElement.getReferencedName());
     }
     return super.getUnresolvedDescription();
   }
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py
index 28fc53833c30..736383e5c5a5 100644
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py
@@ -1,5 +1,5 @@
-import <error descr="No module named un1">un1</error>
-import os.<error descr="No module named un2">un2</error>
+import <error descr="No module named 'un1'">un1</error>
+import os.<error descr="No module named 'un2'">un2</error>
 from os import <error descr="Cannot find reference 'un3' in 'os.py'">un3</error>
 from <error descr="Unresolved reference 'un4'">un4</error>.un5 import <error descr="Unresolved reference 'un6'">un6</error>
 from os.<error descr="Cannot find reference 'un7' in 'os.py'">un7</error> import <error descr="Unresolved reference 'un8'">un8</error>
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/importFunction.py b/python/testData/inspections/PyUnresolvedReferencesInspection/importFunction.py
index 8a3e4654fbf2..fe13bd910372 100644
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/importFunction.py
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/importFunction.py
@@ -1,3 +1,3 @@
-import collections.<error descr="No module named OrderedDict">OrderedDict</error>
+import collections.<error descr="No module named 'OrderedDict'">OrderedDict</error>
 
 collections.OrderedDict()
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImport.py b/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImport.py
index 91aae4269564..309c608b82a7 100644
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImport.py
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImport.py
@@ -1,3 +1,3 @@
-import <error descr="No module named wurm">wurm</error>
+import <error descr="No module named 'wurm'">wurm</error>
 
 wurm()
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImportedModule.py b/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImportedModule.py
index 27169d02142f..302a46bc557b 100644
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImportedModule.py
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/unresolvedImportedModule.py
@@ -1,2 +1,2 @@
-import <error descr="No module named deliverance">deliverance</error>.proxycommand
+import <error descr="No module named 'deliverance'">deliverance</error>.proxycommand
 deliverance.proxycommand.main()
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py b/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py
index 2b6ab14e30c8..a4002671f3c5 100644
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py
@@ -1 +1 @@
-<warning descr="Unused import statement 'import spam'">import <error descr="No module named spam">spam</error></warning>
+<warning descr="Unused import statement 'import spam'">import <error descr="No module named 'spam'">spam</error></warning>
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedPackageImported.py b/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedPackageImported.py
index 4226a1c18983..9e6557a8750c 100644
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedPackageImported.py
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedPackageImported.py
@@ -1 +1 @@
-<warning descr="Unused import statement 'import spam.eggs'">import <error descr="No module named spam">spam</error>.eggs</warning>
\ No newline at end of file
+<warning descr="Unused import statement 'import spam.eggs'">import <error descr="No module named 'spam'">spam</error>.eggs</warning>
\ No newline at end of file