Report warnings and non-fatal errors for shadowing declaration and usage.

editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/RefactoringCoreMessages.properties

Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/RefactoringCoreMessages.properties
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/RefactoringCoreMessages.properties b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/RefactoringCoreMessages.properties
index ecae80bdb7d4186e3398e8a71df10eb2ab4ea0e8..becf91cc14b7d82876b501c84c0a55acc4410ba9 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/RefactoringCoreMessages.properties
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/RefactoringCoreMessages.properties
@@ -406,11 +406,21 @@ RenameRefactoring_shadow_topLevel=File ''{0}'' in library ''{1}'' declares top-l
 RenameRefactoring_elementTypeName={0,choice,8#type|10#field|11#method|14#function|15#function type alias|17#variable}
 RenameFieldProcessor_descriptor_description=Rename field ''{0}'' in ''{1}'' to ''{2}''
 
+
 RenameTopRefactoring_shadow_topLevel=File ''{0}'' in library ''{1}'' already declares top-level {2} ''{3}''
-RenameTopRefactoring_shadow_typeMember=Type ''{0}'' in ''{1}'' declares {2} ''{3}'' which will shadow renamed {4}
-RenameTopRefactoring_shadow_typeMember_shadowedInSubType=Usage of {0} ''{1}.{2}'' declared in ''{3}'' will be shadowed by renamed {4}
-RenameTopRefactoring_shadow_variable_inMethod=Method ''{0}.{1}()'' in ''{2}'' declares {3} ''{4}'' which will shadow renamed {5}
-RenameTopRefactoring_shadow_variable_inFunction=Function ''{0}()'' in ''{1}'' declares {2} ''{3}'' which will shadow renamed {4}
+RenameTopRefactoring_elementDecl_shadowedBy_typeMember=Declaration of renamed {0} will be shadowed by {1} ''{2}.{3}'' in ''{4}''
+RenameTopRefactoring_elementUsage_shadowedBy_typeMember=Usage of renamed {0} will be shadowed by {1} ''{2}.{3}'' in ''{4}''
+RenameTopRefactoring_elementDecl_shadowedBy_variable_inMethod=Declaration of renamed {0} will be shadowed by variable in method ''{1}.{2}()'' in file ''{3}''
+RenameTopRefactoring_elementUsage_shadowedBy_variable_inMethod=Usage of renamed {0} will be shadowed by variable in method ''{1}.{2}()'' in file ''{3}''
+RenameTopRefactoring_elementDecl_shadowedBy_variable_inFunction=Declaration of renamed {0} will be shadowed by variable in function ''{1}()'' in file ''{2}''
+RenameTopRefactoring_elementUsage_shadowedBy_variable_inFunction=Usage of renamed {0} will be shadowed by variable in function ''{1}()'' in file ''{2}''
+
+RenameProcessor_typeMemberDecl_shadowedBy_element=Declaration of {0} ''{1}.{2}'' in ''{3}'' will be shadowed by renamed {4}
+RenameProcessor_typeMemberUsage_shadowedBy_element=Usage of {0} ''{1}.{2}'' declared in ''{3}'' will be shadowed by renamed {4}
+RenameProcessor_topLevelDecl_shadowedBy_element=Declaration of {0} ''{1}'' in file ''{2}'' in library ''{3}'' will be shadowed by renamed {4}
+RenameProcessor_topLevelUsage_shadowedBy_element=Usage of {0} ''{1}'' in file ''{2}'' in library ''{3}'' will be shadowed by renamed {4}
+RenameProcessor_typeMemberUsage_shadowedBy_topLevel=Usage of {0} ''{1}.{2}'' will be shadowed by top-level {3} ''{4}'' from ''{5}'' in library ''{6}''
+
 
 RenameTypeParameterRefactoring_deleted=The selected type variable has been deleted from ''{0}''
 RenameTypeParameterProcessor_name=Rename Type Variable
@@ -472,7 +482,6 @@ RenameLocalVariableProcessor_descriptor_description=Rename local variable ''{0}'
 RenameLocalVariableProcessor_descriptor_description_short=Rename local variable ''{0}''
 RenameLocalVariableProcessor_shadow_variable=Duplicate local variable ''{0}''
 RenameLocalVariableProcessor_shadow_superType_member=Type ''{0}'' in ''{1}'' declares {2} ''{3}'' which will be shadowed by renamed variable
-RenameLocalVariableProcessor_shadow_topLevel=File ''{0}'' in library ''{1}'' declares top-level {2} ''{3}'' which will be shadowed by renamed variable
 
 RenameFunctionRefactoring_name=Rename Function