diff --git a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
index 8cad05468417..ff04edd0437a 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -387,15 +387,15 @@ anonymous.class.parameter.hides.containing.method.variable.problem.descriptor=An
 anonymous.class.field.hides.containing.method.variable.problem.descriptor=Anonymous class field <code>#ref</code> hides variable in containing method #loc
 anonymous.class.variable.hides.containing.method.variable.problem.descriptor=Anonymous class local variable <code>#ref</code> hides variable in containing method #loc
 channel.opened.not.closed.display.name=Channel opened but not safely closed
-channel.opened.not.closed.problem.descriptor=''{0}'' should be opened in front of a try block and closed in the corresponding finally block #loc
+channel.opened.not.closed.problem.descriptor=''{0}'' should be opened in front of a ''try'' block and closed in the corresponding ''finally'' block #loc
 drivermanager.call.display.name=Use of DriverManager to get JDBC connection
 drivermanager.call.problem.descriptor=Call to <code>DriverManager.#ref()</code> #loc
 hibernate.resource.opened.not.closed.display.name=Hibernate resource opened but not safely closed
-hibernate.resource.opened.not.closed.problem.descriptor=''{0}'' should be opened in front of a try block and closed in the corresponding finally block #loc
+hibernate.resource.opened.not.closed.problem.descriptor=''{0}'' should be opened in front of a ''try'' block and closed in the corresponding ''finally'' block #loc
 i.o.resource.opened.not.closed.display.name=I/O resource opened but not safely closed
-resource.opened.not.closed.problem.descriptor=''{0}'' should be opened in front of a try block and closed in the corresponding finally block #loc
+resource.opened.not.closed.problem.descriptor=''{0}'' should be opened in front of a ''try'' block and closed in the corresponding ''finally'' block #loc
 jdbc.resource.opened.not.closed.display.name=JDBC resource opened but not safely closed
-jdbc.resource.opened.not.closed.problem.descriptor=JDBC ''{0}'' should be opened in front of a try block and closed in the corresponding finally block #loc
+jdbc.resource.opened.not.closed.problem.descriptor=JDBC ''{0}'' should be opened in front of a ''try'' block and closed in the corresponding ''finally'' block #loc
 jndi.resource.opened.not.closed.display.name=JNDI resource opened but not safely closed
 socket.opened.not.closed.display.name=Socket opened but not safely closed
 annotation.class.display.name=Annotation class
@@ -674,7 +674,7 @@ c.style.array.declaration.display.name=C-style array declaration
 final.method.in.final.class.display.name='final' method in 'final' class
 extends.annotation.display.name=Class extends annotation interface
 naked.notify.display.name='notify()' or 'notifyAll()' without corresponding state change
-constant.if.statement.display.name=Constant if statement
+constant.if.statement.display.name=Constant 'if' statement
 switch.statement.density.display.name='switch' statement with too low of a branch density
 switch.statement.with.too.few.branches.display.name='switch' statement with too few branches
 upper.case.field.name.not.constant.display.name=Non-constant field with upper-case name
@@ -691,7 +691,7 @@ system.set.security.manager.problem.descriptor=Call to <code>System.#ref()</code
 control.flow.statement.without.braces.display.name=Control flow statement without braces
 trivial.if.display.name=Redundant 'if' statement
 thread.with.default.run.method.display.name=Instantiating a Thread with default 'run()' method
-while.loop.spins.on.field.display.name=While loop spins on field
+while.loop.spins.on.field.display.name='while' loop spins on field
 object.equals.null.display.name=Object.equals(null)
 test.method.is.public.void.no.arg.display.name=Test method with incorrect signature
 if.statement.with.identical.branches.display.name='if' statement with identical branches
@@ -744,7 +744,7 @@ unnecessary.this.display.name=Unnecessary 'this' qualifier
 runtime.exec.with.non.constant.string.display.name=Call to 'Runtime.exec()' with non-constant string
 system.properties.display.name=Access of system properties
 chained.method.call.display.name=Chained method calls
-notify.not.in.synchronized.context.display.name='notify()' or 'notifyAll()' while not synced
+notify.not.in.synchronized.context.display.name='notify()' or 'notifyAll()' while not synchronized
 safe.lock.display.name=Lock acquired but not safely unlocked
 system.run.finalizers.on.exit.display.name=Call to 'System.runFinalizersOnExit()'
 for.can.be.foreach.display.name='for' loop replaceable with 'for each'
@@ -770,9 +770,9 @@ wait.while.holding.two.locks.display.name='wait()' while holding two locks
 empty.class.display.name=Empty class
 trivial.string.concatenation.display.name=Concatenation with empty string
 empty.synchronized.statement.display.name=Empty 'synchronized' statement
-unnecessary.default.display.name=Unnecessary 'default' for enum switch statement
+unnecessary.default.display.name=Unnecessary 'default' for enum 'switch' statement
 simplifiable.conditional.expression.display.name=Conditional that can be simplified to \\&\\& or ||
-simplifiable.if.statement.display.name=If statement may be replaced with \\&\\& or || expression
+simplifiable.if.statement.display.name='if' statement may be replaced with \\&\\& or || expression
 unnecessary.super.constructor.display.name=Unnecessary call to 'super()'
 unnecessarily.qualified.static.usage.display.name=Unnecessarily qualified static access
 bad.exception.caught.display.name=Prohibited exception caught
@@ -798,7 +798,7 @@ field.may.be.static.display.name=Field may be 'static'
 class.may.be.interface.display.name=Class may be interface
 abstract.class.without.abstract.methods.display.name=Abstract class without abstract methods
 divide.by.zero.display.name=Division by zero
-default.not.last.case.in.switch.display.name='default' not last case in 'switch'
+default.not.last.case.in.switch.display.name='default' not last case in 'switch' statement
 nested.synchronized.statement.display.name=Nested 'synchronized' statement
 constant.conditional.expression.display.name=Constant conditional expression
 unused.catch.parameter.display.name=Unused 'catch' parameter
@@ -863,7 +863,7 @@ constant.math.call.problem.descriptor=Constant call to <code>#ref()</code> can b
 floating.point.equality.problem.descriptor=<code>#ref</code>: floating point values compared for exact equality #loc
 fallthru.in.switch.statement.problem.descriptor=<code>#ref</code> fallthrough in 'switch' statement #loc
 switch.statements.without.default.problem.descriptor=<code>#ref</code> statement without 'default' branch #loc
-default.not.last.case.in.switch.problem.descriptor=<code>#ref</code> branch not last case in 'switch' #loc
+default.not.last.case.in.switch.problem.descriptor=<code>#ref</code> branch not last case in 'switch' statement #loc
 loop.statements.that.dont.loop.problem.descriptor=<code>#ref</code> statement does not loop #loc
 conditional.expression.with.identical.branches.problem.descriptor=Conditional expression <code>#ref</code> with identical branches #loc
 if.statement.with.identical.branches.problem.descriptor=<code>#ref</code> statement with identical branches #loc
@@ -890,7 +890,7 @@ implicit.call.to.super.problem.descriptor=Implicit call to super() <code>#ref</c
 negated.if.else.problem.descriptor=<code>#ref</code> statement with negated condition #loc
 negated.conditional.problem.descriptor=Conditional expression with negated condition #loc
 confusing.else.problem.descriptor=<code>#ref</code> branch may be unwrapped, as the if branch never completes #loc
-switch.statement.with.confusing.declaration.problem.descriptor=Local variable <code>#ref</code> declared in one switch branch and used in another #loc
+switch.statement.with.confusing.declaration.problem.descriptor=Local variable <code>#ref</code> declared in one 'switch' branch and used in another #loc
 raw.use.of.parameterized.type.problem.descriptor=Raw use of parameterized class <code>#ref</code> #loc
 final.class.problem.descriptor=Class declared <code>#ref</code> #loc
 empty.class.problem.descriptor=Class <code>#ref</code> is empty #loc
@@ -932,10 +932,10 @@ interface.never.implemented.problem.descriptor=Interface <code>#ref</code> has n
 missing.deprecated.annotation.problem.descriptor=Missing '@Deprecated' annotation on <code>#ref()</code> #loc
 missing.override.annotation.problem.descriptor=Missing '@Override' annotation on <code>#ref()</code> #loc
 non.thread.safe.lazy.initialization.problem.descriptor=Lazy initialization of static field <code>#ref</code> is not thread-safe #loc
-catch.generic.class.problem.descriptor=catch of generic <code>#ref</code> class should be replaced with more precise exception #loc
+catch.generic.class.problem.descriptor='catch' of generic <code>#ref</code> class should be replaced with more precise exception #loc
 empty.catch.block.problem.descriptor=Empty <code>#ref</code> block #loc
-unused.catch.parameter.problem.descriptor=Unused catch parameter <code>#ref</code> #loc
-used.catch.parameter.named.ignore.problem.descriptor=Catch parameter named <code>#ref</code> is used #loc
+unused.catch.parameter.problem.descriptor=Unused 'catch' parameter <code>#ref</code> #loc
+used.catch.parameter.named.ignore.problem.descriptor='catch' parameter named <code>#ref</code> is used #loc
 empty.finally.block.problem.descriptor=Empty <code>#ref</code> block #loc
 finally.block.cannot.complete.normally.problem.descriptor=<code>#ref</code> block can not complete normally #loc
 empty.try.block.problem.descriptor=Empty <code>#ref</code> block #loc
@@ -1142,7 +1142,7 @@ local.variable.naming.convention.problem.descriptor.short=Local variable name <c
 local.variable.naming.convention.problem.descriptor.long=Local variable name <code>#ref</code> is too long #loc
 local.variable.naming.convention.problem.descriptor.regex.mismatch=Local variable name <code>#ref</code> doesn''t match regex ''{0}'' #loc
 local.variable.naming.convention.ignore.option=Ignore for-loop parameters
-local.variable.naming.convention.ignore.catch.option=Ignore catch block parameters
+local.variable.naming.convention.ignore.catch.option=Ignore 'catch' block parameters
 method.names.differ.only.by.case.problem.descriptor=Method names <code>#ref</code> and ''{0}'' differ only by case #loc
 parameter.name.differs.from.overridden.parameter.ignore.character.option=Ignore if overridden parameter contains only one character
 parameter.name.differs.from.overridden.parameter.ignore.library.option=Ignore if overridden parameter is from a library
@@ -1204,7 +1204,7 @@ transient.field.in.non.serializable.class.problem.descriptor=Field ''{0}'' is ma
 transient.field.in.non.serializable.class.remove.quickfix=Remove 'transient'
 condition.signal.replace.quickfix=Replace with 'signalAll()'
 object.notify.replace.quickfix=Replace with 'notifyAll()'
-safe.lock.problem.descriptor=''{0}'' should be locked in front of a try block and unlocked in the corresponding finally block #loc
+safe.lock.problem.descriptor=''{0}'' should be locked in front of a ''try'' block and unlocked in the corresponding ''finally'' block #loc
 synchronized.method.problem.descriptor=Method ''{0}()'' declared <code>#ref</code> #loc
 synchronized.method.include.option=Include native methods
 synchronized.method.move.quickfix=Move synchronization into method
@@ -1213,12 +1213,12 @@ volatile.field.problem.descriptor=Volatile field <code>#ref</code> of type ''{0}
 exception.class.column.name=Exception class
 bad.exception.thrown.problem.descriptor=Prohibited exception ''{0}'' thrown #loc
 empty.catch.block.comments.option=Comments count as content
-empty.catch.block.ignore.option=Ignore empty catch blocks in tests
-empty.catch.block.ignore.ignore.option=Ignore for catch parameters named 'ignore' or 'ignored'
-too.broad.catch.problem.descriptor=Catch of <code>#ref</code> is too broad, masking exception ''{0}'' #loc
-too.broad.catch.problem.descriptor1=Catch of <code>#ref</code> is too broad, masking exceptions ''{0}'' and ''{1}'' #loc
-unused.catch.parameter.ignore.catch.option=Ignore for catch blocks containing comments
-unused.catch.parameter.ignore.empty.option=Ignore unused catch parameters in tests
+empty.catch.block.ignore.option=Ignore empty 'catch' blocks in tests
+empty.catch.block.ignore.ignore.option=Ignore for 'catch' parameters named 'ignore' or 'ignored'
+too.broad.catch.problem.descriptor=''catch'' of <code>#ref</code> is too broad, masking exception ''{0}'' #loc
+too.broad.catch.problem.descriptor1=''catch'' of <code>#ref</code> is too broad, masking exceptions ''{0}'' and ''{1}'' #loc
+unused.catch.parameter.ignore.catch.option=Ignore for 'catch' blocks containing comments
+unused.catch.parameter.ignore.empty.option=Ignore unused 'catch' parameters in tests
 add.serialversionuidfield.quickfix=Add 'serialVersionUID' field
 delete.import.quickfix=Delete unnecessary import
 encapsulate.variable.quickfix=Encapsulate variable
@@ -1382,7 +1382,7 @@ create.documentation.couldnt.cast.class=Couldn''t cast {0}
 create.documentation.inspections.enabled.by.default.message=Inspections enabled by default:
 create.documentation.couldnt.find.documentation.file.error.message=Couldn''t find documentation file: {0}
 create.documentation.unused.documentation.file.error.message=Unused documentation file: {0}
-assignment.to.catch.block.parameter.problem.descriptor=Assignment to catch block parameter <code>#ref</code> #loc
+assignment.to.catch.block.parameter.problem.descriptor=Assignment to 'catch' block parameter <code>#ref</code> #loc
 assignment.to.method.parameter.problem.descriptor=Assignment to method parameter <code>#ref</code> #loc
 value.of.post.increment.problem.descriptor=Value of post-increment expression <code>#ref</code> is used #loc
 value.of.post.decrement.problem.descriptor=Value of post-decrement expression <code>#ref</code> is used #loc
@@ -1647,14 +1647,14 @@ ignore.guard.clauses=Ignore &guard clauses
 ignore.for.equals.methods=Ignore for &equals() methods
 caught.exception.immediately.rethrown.display.name=Caught exception is immediately rethrown
 caught.exception.immediately.rethrown.problem.descriptor=Caught exception <code>#ref</code> is immediately rethrown #loc
-delete.catch.section.quickfix=Delete catch section
-remove.try.catch.quickfix=Remove try-catch statement
+delete.catch.section.quickfix=Delete 'catch' section
+remove.try.catch.quickfix=Remove 'try catch' statement
 loop.with.implicit.termination.condition.display.name=Loop with implicit termination condition
 loop.with.implicit.termination.condition.dowhile.problem.descriptor=<code>#ref-while</code> loop with implicit termination condition #loc
 loop.with.implicit.termination.condition.problem.descriptor=<code>#ref</code> loop with implicit termination condition #loc
 loop.with.implicit.termination.condition.quickfix=Make condition explicit
 ignore.iterator.loop.variables=Ignore java.util.Iterator loop variables
-rename.catch.parameter.to.ignored=Rename catch parameter to 'ignored'
+rename.catch.parameter.to.ignored=Rename 'catch' parameter to 'ignored'
 unnecessary.super.qualifier.display.name=Unnecessary 'super' qualifier
 unnecessary.super.qualifier.problem.descriptor=Qualifier <code>#ref</code> is unnecessary in this context #loc
 unnecessary.super.qualifier.quickfix=Remove unnecessary 'super.'
@@ -1664,7 +1664,7 @@ collections.field.access.replaceable.by.method.call.quickfix=Replace with ''{0}'
 synchronization.on.local.variable.or.method.parameter.display.name=Synchronization on local variable or method parameter
 synchronization.on.local.variable.problem.descriptor=Synchronization on local variable <code>#ref</code> #loc
 synchronization.on.method.parameter.problem.descriptor=Synchronization on method parameter <code>#ref</code> #loc
-too.broad.catch.quickfix=Add catch clause for ''{0}''
+too.broad.catch.quickfix=Add ''catch'' clause for ''{0}''
 too.broad.catch.option=<html>&Only warn on RuntimeException, Exception, Error or Throwable<html>
 unnecessary.call.to.string.valueof.display.name=Unnecessary call to 'String.valueOf()'
 unnecessary.call.to.string.valueof.problem.descriptor=<code>#ref</code> can be simplified to ''{0}'' #loc
@@ -1710,9 +1710,9 @@ unnecessary.parentheses.conditional.option=Ignore parentheses around the conditi
 field.may.be.final.display.name=Field may be final
 field.may.be.final.problem.descriptor=Field <code>#ref</code> may be 'final' #loc
 cast.that.loses.precision.option=Ignore casts from int to char
-variable.not.used.inside.if.display.name=Reference checked for null is not used inside if
+variable.not.used.inside.if.display.name=Reference checked for 'null' is not used inside 'if'
 variable.not.used.inside.if.problem.descriptor=<code>#ref</code> is not used inside if #loc
-if.may.be.conditional.display.name=If statement could be replaced with simple conditional expression
+if.may.be.conditional.display.name='if' statement could be replaced with simple conditional expression
 if.may.be.conditional.problem.descriptor=<code>#ref</code> could be replaced with simple conditional expression #loc
 if.may.be.conditional.quickfix=Replace with conditional expression
 redundant.string.format.call.display.name=Redundant call to 'String.format()'
@@ -1759,8 +1759,8 @@ unnecessary.javadoc.link.this.class.problem.descriptor=<code>#ref</code> pointin
 unnecessary.javadoc.link.quickfix=Remove unnecessary '{0}'
 thread.local.not.static.final.display.name=ThreadLocal field not declared static final
 thread.local.not.static.final.problem.descriptor=ThreadLocal <code>#ref</code> is not declared 'static final' #loc
-remove.try.finally.block.quickfix=Remove try-finally block
-remove.finally.block.quickfix=Remove finally block
+remove.try.finally.block.quickfix=Remove 'try-finally' block
+remove.finally.block.quickfix=Remove 'finally' block
 remove.leading.zero.to.make.decimal.quickfix=Remove leading zero to make decimal
 convert.octal.literal.to.decimal.literal.quickfix=Convert octal literal to decimal literal
 ignore.single.field.static.imports.option=Ignore single &field static imports
@@ -1772,7 +1772,7 @@ ignored.io.resource.types=Ignored I/O resource types
 choose.io.resource.type.to.ignore=Choose I/O resource type to ignore
 ignore.accesses.from.the.same.class=Ignore accesses from the same class
 ignore.accesses.from.equals.method=Ignore accesses from 'equals()' method
-ignore.branches.of.switch.statements=Ignore branches of switch statements
+ignore.branches.of.switch.statements=Ignore branches of 'switch' statements
 ignore.equals.hashcode.and.tostring=Ignore equals, hashCode and toString methods
 class.name=Class name
 method.name.pattern=Method name pattern
@@ -1811,14 +1811,14 @@ unnecessarily.qualified.statically.imported.element.problem.descriptor=Staticall
 unnecessarily.qualified.statically.imported.element.quickfix=Remove unnecessary qualifier
 ignore.instanceof.on.library.classes=Ignore instanceof on library classes
 assertequals.may.be.assertsame.quickfix=Replace with 'assertSame()'
-for.can.be.foreach.option=Report indexed java.util.List loops
+for.can.be.foreach.option=Report indexed 'java.util.List' loops
 cast.conflicts.with.instanceof.quickfix1=Replace cast to ''{0}'' with ''{1}''
 cast.conflicts.with.instanceof.quickfix2=Replace instanceof ''{0}'' with ''{1}''
 double.checked.locking.quickfix=Make ''{0}'' 'volatile'
 double.literal.may.be.float.literal.display.name='double' literal cast to 'float' could be 'float' literal
 double.literal.may.be.float.literal.problem.descriptor=<code>#ref</code> could be replaced with ''{0}'' #loc
 double.literal.may.be.float.literal.quickfix=Replace with ''{0}''
-multiple.declaration.option=Ignore for loop declarations
+multiple.declaration.option=Ignore 'for' loop declarations
 simplifiable.annotation.display.name=Simplifiable annotation
 simplifiable.annotation.problem.descriptor=Annotation <code>#ref</code> may be replaced with ''{0}''
 simplifiable.annotation.quickfix=Simplify annotation