diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
tree | bca7d49005d81d10c70bc3f547df041c636b4300 /resources-en | |
parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'resources-en')
24 files changed, 48 insertions, 2 deletions
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index c9802d35cb44..ac623acc1fbe 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -438,4 +438,4 @@ action.kill.process.text=Kill Process action.kill.process.description=Forcibly terminate debugged application evaluation.error.unknown.method.return.type=Cannot resolve method return type: {0} rule.name.group.by.class=Group by class -rule.name.group.by.package=Group by package +rule.name.group.by.package=Group by package
\ No newline at end of file diff --git a/resources-en/src/postfixTemplates/AssertStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/AssertStatementPostfixTemplate/description.html index 2a472356ab71..68f6b1e8a47c 100644 --- a/resources-en/src/postfixTemplates/AssertStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/AssertStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Creates assertion from boolean expression. -</body> +</font> +<body> </html> diff --git a/resources-en/src/postfixTemplates/CastExpressionPostfixTemplate/description.html b/resources-en/src/postfixTemplates/CastExpressionPostfixTemplate/description.html index 7d20d583eb16..5ec1847e6545 100644 --- a/resources-en/src/postfixTemplates/CastExpressionPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/CastExpressionPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Surrounds expression with cast. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ElseStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ElseStatementPostfixTemplate/description.html index 862ad3ab3c55..ca9bc6cd72bf 100644 --- a/resources-en/src/postfixTemplates/ElseStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ElseStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Checks boolean expression to be 'false'. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ForAscendingPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ForAscendingPostfixTemplate/description.html index 6b6212f51fbd..c68655d964c6 100644 --- a/resources-en/src/postfixTemplates/ForAscendingPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ForAscendingPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Iterates with index over collection. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ForDescendingPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ForDescendingPostfixTemplate/description.html index 22f6cbccd39d..9663c6c93ec2 100644 --- a/resources-en/src/postfixTemplates/ForDescendingPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ForDescendingPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Iterates with index in reverse order. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ForeachPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ForeachPostfixTemplate/description.html index fc31a3ae8341..c911d040d419 100644 --- a/resources-en/src/postfixTemplates/ForeachPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ForeachPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Iterates over enumerable collection. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/FormatPostfixTemplate/description.html b/resources-en/src/postfixTemplates/FormatPostfixTemplate/description.html index c62959a48280..2d76496c51be 100644 --- a/resources-en/src/postfixTemplates/FormatPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/FormatPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Creates String.format call. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/IfStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/IfStatementPostfixTemplate/description.html index 28234e198291..e7d1cf104833 100644 --- a/resources-en/src/postfixTemplates/IfStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/IfStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Checks boolean expression to be 'true'. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/InstanceofExpressionPostfixTemplate/description.html b/resources-en/src/postfixTemplates/InstanceofExpressionPostfixTemplate/description.html index 249f7daac259..f682f5be8eaf 100644 --- a/resources-en/src/postfixTemplates/InstanceofExpressionPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/InstanceofExpressionPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Surrounds expression with instanceof. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/IntroduceFieldPostfixTemplate/description.html b/resources-en/src/postfixTemplates/IntroduceFieldPostfixTemplate/description.html index 4f20d5109618..f659ac01784c 100644 --- a/resources-en/src/postfixTemplates/IntroduceFieldPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/IntroduceFieldPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Introduces field for expression. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/IntroduceVariablePostfixTemplate/description.html b/resources-en/src/postfixTemplates/IntroduceVariablePostfixTemplate/description.html index 2024a122609d..d780db76efe1 100644 --- a/resources-en/src/postfixTemplates/IntroduceVariablePostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/IntroduceVariablePostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Introduces variable for expression. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/IsNullCheckPostfixTemplate/description.html b/resources-en/src/postfixTemplates/IsNullCheckPostfixTemplate/description.html index eb854ae563ad..9b485cefdfa9 100644 --- a/resources-en/src/postfixTemplates/IsNullCheckPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/IsNullCheckPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Checks expression to be null. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/NotExpressionPostfixTemplate/description.html b/resources-en/src/postfixTemplates/NotExpressionPostfixTemplate/description.html index 533a7601fe8f..6e7c6ebaa6d0 100644 --- a/resources-en/src/postfixTemplates/NotExpressionPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/NotExpressionPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Negates boolean expression. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/NotNullCheckPostfixTemplate/description.html b/resources-en/src/postfixTemplates/NotNullCheckPostfixTemplate/description.html index 65a10f3669bd..55b6f9a6df20 100644 --- a/resources-en/src/postfixTemplates/NotNullCheckPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/NotNullCheckPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Checks expression to be not-null. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ParenthesizedExpressionPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ParenthesizedExpressionPostfixTemplate/description.html index f3effd96dd97..20f92fed4bb8 100644 --- a/resources-en/src/postfixTemplates/ParenthesizedExpressionPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ParenthesizedExpressionPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Parenthesizes expression. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ReturnStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ReturnStatementPostfixTemplate/description.html index 4efea2894c04..7cb0f59688b9 100644 --- a/resources-en/src/postfixTemplates/ReturnStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ReturnStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Returns value from containing method. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/SoutPostfixTemplate/description.html b/resources-en/src/postfixTemplates/SoutPostfixTemplate/description.html index 02dacc2cb7a9..4890d4bdff38 100644 --- a/resources-en/src/postfixTemplates/SoutPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/SoutPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Creates System.out.println call. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/SwitchStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/SwitchStatementPostfixTemplate/description.html index e1e63da8325c..f7fa1a6989a7 100644 --- a/resources-en/src/postfixTemplates/SwitchStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/SwitchStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Produces switch over integral/enum/string values. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/SynchronizedStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/SynchronizedStatementPostfixTemplate/description.html index 1589a80dcd4d..df16c96f9e54 100644 --- a/resources-en/src/postfixTemplates/SynchronizedStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/SynchronizedStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Produces synchronization statement. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/ThrowExceptionPostfixTemplate/description.html b/resources-en/src/postfixTemplates/ThrowExceptionPostfixTemplate/description.html index d81b2d78ae7d..a714eecd3bb1 100644 --- a/resources-en/src/postfixTemplates/ThrowExceptionPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/ThrowExceptionPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Throws expression of 'Throwable' type. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/TryStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/TryStatementPostfixTemplate/description.html index 582e5dd9681f..38df0e522cae 100644 --- a/resources-en/src/postfixTemplates/TryStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/TryStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Insert statement in try-catch block. +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/TryWithResourcesPostfixTemplate/description.html b/resources-en/src/postfixTemplates/TryWithResourcesPostfixTemplate/description.html index 77c0e6368ef2..0786540252b5 100644 --- a/resources-en/src/postfixTemplates/TryWithResourcesPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/TryWithResourcesPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Insert statement in try-with-resources block (java 7 or higher requires). +</font> </body> </html> diff --git a/resources-en/src/postfixTemplates/WhileStatementPostfixTemplate/description.html b/resources-en/src/postfixTemplates/WhileStatementPostfixTemplate/description.html index daf90248cd28..5c1699e18f70 100644 --- a/resources-en/src/postfixTemplates/WhileStatementPostfixTemplate/description.html +++ b/resources-en/src/postfixTemplates/WhileStatementPostfixTemplate/description.html @@ -1,5 +1,7 @@ <html> <body> +<font face="verdana" size="-1"> Iterating while boolean statement is 'true'. +</font> </body> </html> |