proofreading lessons, bundled properties and README
authorSergey Karashevich <sergey.karashevich@jetbrains.com>
Wed, 22 Nov 2017 19:22:05 +0000 (22:22 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Thu, 14 Nov 2019 22:34:47 +0000 (22:34 +0000)
GitOrigin-RevId: a780e59ea0d30cc654bd4f97e2d7833881f97d6b

37 files changed:
ide-features-trainer/README.md
ide-features-trainer/res/data/modules/go/EditorBasics.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/go/EditorBasics/02.Comment.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/CodeAssistance.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/CodeAssistance/01.Folding.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/CodeAssistance/02.CodeFormat.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/CodeAssistance/03.ParameterInfo.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/CodeAssistance/04.QuickPopups.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/CodeAssistance/05.EditorCodingAssistance.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Completions.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Completions/01.Basic Completion.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Completions/02.Smart Type Completion.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Completions/03.Postfix Completion.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Completions/04.StatementCompletion.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Completions/05.CompletionWithTab.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/01.Select.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/02.Comment.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/03.Delete.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/04.Duplicate.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/05.Move.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/06.Collapse.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/07.MultipleSelections.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/EditorBasics/Python/01.Select.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Loops.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Loops/01.For.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Navigation.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Navigation/01.JumpToSource.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Navigation/02.Declaration.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Navigation/03.FileStructure.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Navigation/04.Occurrences.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Refactorings.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Refactorings/01.Rename.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Refactorings/02.Extract Variable.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Refactorings/03.Extract Method.xml [changed mode: 0644->0755]
ide-features-trainer/res/data/modules/java/Refactorings/04.RefactoringBasics.xml [changed mode: 0644->0755]
ide-features-trainer/res/training/learn/LearnBundle.properties [changed mode: 0644->0755]

index 8b5a60aec4ea2f35a0db9f0755a0983f837d1dc6..c9a0c0f54490749e37c05e9f04e46910281d8103 100644 (file)
@@ -1,8 +1,8 @@
 # IDE Features Trainer
-_Learn basic editing features of IntelliJ IDEA_
+_Learn the basic editing features of IntelliJ IDEA_
 
-**System requirements**: IntelliJ IDEA 2016.2 
+**System requirements**: IntelliJ IDEA 2017.3
 
-**Prerequisites**: Add the plugin from IntelliJ IDEA plugin repository automatically or download from web https://plugins.jetbrains.com/idea/plugin/8554-ide-features-trainer and install it manually.
+**Prerequisites**: Add the plugin from the IntelliJ IDEA plugin repository automatically, or download it from the web at https://plugins.jetbrains.com/idea/plugin/8554-ide-features-trainer and then install it manually.
 
-**Run**: Run IDEA with this plugin than click *Learn* button at window border.
+**Run**: Run IntelliJ IDEA with this plugin, and then click the *Learn* tool window button on the left-hand side near the window border.
old mode 100644 (file)
new mode 100755 (executable)
index 50a823e..4fbd363
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module name="Editor Basics" lessonsPath="EditorBasics/" version="0.3" id="basics" fileType="SCRATCH"  description="Learn how to select, comment, delete, duplicate and move lines. And also how to move and collapse blocks of code">
+<module name="Editor Basics" lessonsPath="EditorBasics/" version="0.3" id="basics" fileType="SCRATCH"  description="Learn how to select, comment, delete, duplicate, and move lines. Learn how to move and collapse blocks of code.">
   <lesson filename="02.Comment.xml" lang="GO"/>
   <!--<lesson filename="ObjC/01.Select.xml" lang="OCLanguage"/> -->
 </module>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 8b2a292..88b6d99
@@ -10,7 +10,7 @@ func main() {
     </MouseBlock>
     <MoveCaret position="3:1"/>
     <Try action="CommentByLineComment" trigger="CommentByLineComment">Comment out any line with <action>CommentByLineComment</action></Try>
-    <Try check="training.check.CheckCountGoCommentedLine" action="CommentByLineComment" trigger="CommentByLineComment">Uncomment the commented line with the same shortcut <action>CommentByLineComment</action></Try>
-    <Try check="training.check.CheckCountGoCommentedLines" action="CommentByLineComment" triggers="EditorDownWithSelection;CommentByLineComment">Select several lines with <action>EditorDownWithSelection</action> and comment with <action>CommentByLineComment</action></Try>
+    <Try check="training.check.CheckCountGoCommentedLine" action="CommentByLineComment" trigger="CommentByLineComment">Uncomment the commented line with the same shortcut, <action>CommentByLineComment</action></Try>
+    <Try check="training.check.CheckCountGoCommentedLines" action="CommentByLineComment" triggers="EditorDownWithSelection;CommentByLineComment">Select several lines with <action>EditorDownWithSelection</action> and comment them with <action>CommentByLineComment</action></Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index add0d58..109ec4b
@@ -25,13 +25,13 @@ class FoldingDemo {
 }]]></CopyText>
     <CaretBlock>
         <MoveCaret position="12:27" />
-        <Try trigger="CollapseRegion">We start learning the folding basics in <link>Collapse</link> lesson. Let's look to other folding options. Select any part of code and run folding by pressing <action>CollapseRegion</action></Try>
+        <Try trigger="CollapseRegion">We first learned the basics of folding in the <link>Collapse</link> lesson. Now let's look at some other folding options. Select any part of code and fold it by pressing <action>CollapseRegion</action>.</Try>
     </CaretBlock>
 </MouseBlock>
-        <Try trigger="ExpandRegion">Fine! <ide /> collapses <code>new Runnable()</code> to a lambda function. To expand this structure use <action>ExpandRegion</action></Try>
+        <Try trigger="ExpandRegion">Excellent! <ide /> collapses <code>new Runnable()</code> to a lambda function. Use <action>ExpandRegion</action> to expand this structure.</Try>
         <SetSelection start-position="7:9" end-position="8:24" />
         <MoveCaret position="8:24" />
-        <Try trigger="CollapseSelection"><ide /> allows you to fold any sequence of statements or declarations. Try to fold selected region with <action>CollapseSelection</action></Try>
-        <Try trigger="ExpandRegion">And <action>ExpandRegion</action> in a back way.</Try>
+        <Try trigger="CollapseSelection"><ide /> allows you to fold any sequence of statements or declarations. Try folding the selected region with <action>CollapseSelection</action>.</Try>
+        <Try trigger="ExpandRegion">Now hit <action>ExpandRegion</action> to go the other way.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 3bf1df8..b7b7251
@@ -15,7 +15,7 @@ final static int some_const = 124136; public static int process(int a, int b){ r
 
 }]]></CopyText>
     <SetSelection start-position="7:1" end-position="7:65" />
-    <Try triggers="ReformatCode"><ide/> helps to correct code formatting with one action. Try to reformat selected code with <action>ReformatCode</action></Try>
-    <Try triggers="ReformatCode">To reformat a whole source file use <action>ReformatCode</action> when no lines are selected.</Try>
+    <Try triggers="ReformatCode"><ide/> can help you correct code formatting with just one action. Try reformatting the selected code with <action>ReformatCode</action>.</Try>
+    <Try triggers="ReformatCode">To reformat the whole source file, use <action>ReformatCode</action> when no lines are selected.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index db6ed94..0b2745e
@@ -13,7 +13,7 @@ class FrameDemo {
 }]]></CopyText>
 </MouseBlock>
         <MoveCaret position="7:23" />
-        <Try trigger="ParameterInfo">Press <action>ParameterInfo</action> to see method signature.</Try>
-        <Try check="training.check.CheckParameterInfo">Use <strong>175</strong> as width and <strong>100</strong> as height.</Try>
+        <Try trigger="ParameterInfo">Press <action>ParameterInfo</action> to see the method signature.</Try>
+        <Try check="training.check.CheckParameterInfo">Use a width of <strong>175</strong> and a height of <strong>100</strong>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index db49cb5..17b40c4
@@ -20,7 +20,7 @@ class DecimalFormatDemo {
 }]]></CopyText>
 </MouseBlock>
         <MoveCaret position="5:9" />
-        <Try trigger="QuickJavaDoc">Press <action>QuickJavaDoc</action> to see documentation for the symbol at at caret.</Try>
+        <Try trigger="QuickJavaDoc">Press <action>QuickJavaDoc</action> to see documentation for the symbol at the caret.</Try>
         <Try check="training.check.CheckQuickPopupsQuickDoc">Press <action>EditorEscape</action> to close the popup.</Try>
         <Try trigger="QuickImplementations">Press <action>QuickImplementations</action> to see the definition of the symbol at the caret.</Try>
     <Win/>
old mode 100644 (file)
new mode 100755 (executable)
index 4edc4a3..cfd08f2
@@ -28,7 +28,7 @@ class CodeAssistance {
         <Try trigger="ShowErrorDescription">Press <action>ShowErrorDescription</action> to see the error description.</Try>
         <Try trigger="ShowIntentionActions" check="training.check.CheckException">Press <action>ShowIntentionActions</action> and select <strong>Add exception to method signature</strong>.</Try>
         <SetSelection start-string="BufferedReader reader" end-string="System.out.println(s);"/>
-        <Try trigger="SurroundWith" check="training.check.CheckTryFinally">Press <action>SurroundWith</action> and select <code>try/finally</code> to surround it with selection.</Try>
+        <Try trigger="SurroundWith" check="training.check.CheckTryFinally">Press <action>SurroundWith</action> and select <code>try/finally</code> to surround it with the selection.</Try>
         <Try check="training.check.CheckReaderClose">Close the reader in the <code>finally</code> block by writing <code>fileReader.close()</code></Try>
         <MoveCaret string="lines"/>
         <Try trigger="HighlightUsagesInFile">Press <action>HighlightUsagesInFile</action> to highlight all usages of the symbol at the caret within the file.</Try>
old mode 100644 (file)
new mode 100755 (executable)
index 8360da8..d75c60b
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module name="Completions" lessonsPath="Completions/" version="0.3" id="completions" fileType="SCRATCH" sdkType="JAVA" description="Basic, statement, smart type and other completions">
+<module name="Code Completion" lessonsPath="Completions/" version="0.3" id="completions" fileType="SCRATCH" sdkType="JAVA" description="Basic, statement, smart type and other completion types">
   <lesson filename="01.Basic Completion.xml" solution="training.training.solutions.Completions.BasicCompletionSolution"/>
   <lesson filename="02.Smart Type Completion.xml" solution="training.training.solutions.Completions.SmartTypeCompletionSolution"/>
   <!--<lesson filename="03.Postfix Completion.xml" solution="training.training.solutions.Completions.PostfixCompletionSolution" />-->
old mode 100644 (file)
new mode 100755 (executable)
index ed0ab4e..0831e86
@@ -24,12 +24,12 @@ class BasicCompletionDemo implements Runnable{
     <MoveCaret position="14:29"/>
     <CaretBlock>
         <TypeText> </TypeText>
-        <Try trigger="EditorChooseLookupItem">By default IDEA completes your code instantly. Start typing <code>Ran</code> right where the caret is, and you will see Lookup Menu of completions. You can choose the first item from Lookup menu by pressing <action>EditorEnter</action></Try>
-        <Try trigger="CodeCompletion">To activate Basic Completion action press <action>CodeCompletion</action> and you will see lookup menu again.</Try>
-        <Try trigger="EditorChooseLookupItem">Press <action>EditorEnter</action> to choose top item from lookup menu.</Try>
+        <Try trigger="EditorChooseLookupItem">By default, IntelliJ IDEA completes your code instantly. Start typing <code>Ran</code> right where the caret is, and you will see the Lookup Menu with matching suggestions. You can choose the first item from the Lookup menu by pressing <action>EditorEnter</action>.</Try>
+        <Try trigger="CodeCompletion">To activate Basic Completion, press <action>CodeCompletion</action> and you will see lookup menu again.</Try>
+        <Try trigger="EditorChooseLookupItem">Press <action>EditorEnter</action> to choose the top item in the lookup menu.</Try>
         <Try trigger="EditorCompleteStatement">Press <action>EditorCompleteStatement</action> to complete this statement.</Try>
         <MoveCaret position="18:27"/>
-        <Try triggers="CodeCompletion;CodeCompletion">Sometimes you need to find completions for static constants or methods. Press <action>CodeCompletion</action> twice to increase search level of Code Completion.</Try>
+        <Try triggers="CodeCompletion;CodeCompletion">Sometimes you need to see suggestions for static constants or methods. Press <action>CodeCompletion</action> twice to access a deeper level of Code Completion.</Try>
     </CaretBlock>
     </MouseBlock>
     <Win/>
old mode 100644 (file)
new mode 100755 (executable)
index 8709ba8..6d9948f
@@ -26,10 +26,10 @@ class SmartCompletionDemo{
 <CaretBlock>
     <MoveCaret position="13:19"/>
     <TypeText> </TypeText>
-    <Try triggers="SmartTypeCompletion;EditorChooseLookupItem">Smart Type Code Completion filters the suggestion list and includes only those types that are applicable to the current context. Press <action>SmartTypeCompletion</action> to see the list of suitable ways to complete. Choose the first one by pressing <action>EditorEnter</action></Try>
+    <Try triggers="SmartTypeCompletion;EditorChooseLookupItem">Smart Type Completion filters the list of suggestion to include only those types that are applicable in the current context. Press <action>SmartTypeCompletion</action> to see the list of matching suggestions. Choose the first one by pressing <action>EditorEnter</action>.</Try>
     <MoveCaret position="20:16"/>
     <TypeText> </TypeText>
-    <Try triggers="SmartTypeCompletion;SmartTypeCompletion;EditorChooseLookupItem">Smart Type Code Completion can also suggest a code for return. Press <action>SmartTypeCompletion</action> twice to see Lookup menu for return. Choose the first one by pressing <action>EditorEnter</action></Try>
+    <Try triggers="SmartTypeCompletion;SmartTypeCompletion;EditorChooseLookupItem">Smart Type Completion can also suggest code for a return statement. Press <action>SmartTypeCompletion</action> twice to see the Lookup menu for a return. Choose the first one by pressing <action>EditorEnter</action>.</Try>
     <Win/>
 </CaretBlock>
 </MouseBlock>
old mode 100644 (file)
new mode 100755 (executable)
index 210f126..3e08529
@@ -8,7 +8,7 @@
 }]]></CopyText>
 <CaretBlock>
     <MoveCaret position="4:27" />
-    <Try trigger="EditorChooseLookupItem">Postfix code completion helps reduce backward caret jumps as you write code. It lets you transform an already typed expression to another one based on the postfix you added, the type of expression and its context. Put the <code>.</code> after parenthesis and you will see the list of postfix completions. Select <code>if</code> from the list or type it in editor. And press <action>EditorEnter</action> to complete statement.</Try>
+    <Try trigger="EditorChooseLookupItem">Postfix Completion helps reduce backward caret jumps as you write code. It lets you transform an already typed expression into another one based on the postfix you add, the type of expression, and its context. Type <code>.</code> after the parenthesis to see the list of postfix completion suggestions. Select <code>if</code> from the list, or type it in editor, and then press <action>EditorEnter</action> to complete the statement.</Try>
     <Win/>
 </CaretBlock>
 </MouseBlock>
old mode 100644 (file)
new mode 100755 (executable)
index 2d85e99..bb06d81
@@ -17,8 +17,8 @@
 </MouseBlock>
         <MoveCaret position="8:40" />
         <Try trigger="EditorCompleteStatement">Press <action>EditorCompleteStatement</action> to complete the <code>for</code> statement.</Try>
-        <Try check="training.check.CheckStatementCompletionIf">Write <code>if</code> and press <action>EditorCompleteStatement</action> to generate statement.</Try>
-        <Try trigger="EditorCompleteStatement">Add condition inside () <code>i % j == 0</code> and press <action>EditorCompleteStatement</action> to jump inside <code>if</code> statement.</Try>
-        <Try trigger="EditorCompleteStatement">Write in one line <code>isPrime = false; break</code> and press <action>EditorCompleteStatement</action> to complete the entered statement and apply formatting.</Try>
+        <Try check="training.check.CheckStatementCompletionIf">Write <code>if</code> and press <action>EditorCompleteStatement</action> to generate the statement.</Try>
+        <Try trigger="EditorCompleteStatement">Add a condition inside () <code>i % j == 0</code> and press <action>EditorCompleteStatement</action> to jump inside the <code>if</code> statement.</Try>
+        <Try trigger="EditorCompleteStatement">Write on one line: <code>isPrime = false; break</code> and then press <action>EditorCompleteStatement</action> to complete the entered statement and apply formatting.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 4ecbf77..8f4c7f1
@@ -14,6 +14,6 @@ class FrameDemo {
 </MouseBlock>
         <MoveCaret position="9:56" />
         <Try trigger="CodeCompletion">Press <action>CodeCompletion</action> to show completion options.</Try>
-        <Try trigger="EditorChooseLookupItemReplace">Choose <code>DO_NOTHING_ON_CLOSE</code> for example and press <action>EditorTab</action>. It overwrites the word at caret rather than just inserts.</Try>
+        <Try trigger="EditorChooseLookupItemReplace">Choose <code>DO_NOTHING_ON_CLOSE</code>, for example, and press <action>EditorTab</action>. This overwrites the word at the caret rather than simply inserting it.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 2aaabfa..716b345
 }]]></CopyText>
     </MouseBlock>
     <MoveCaret position="9:9"/>
-    <Try action="EditorNextWordWithSelection" trigger="EditorNextWordWithSelection">Put the caret before any word. Press <action>EditorNextWordWithSelection</action> to move caret to the next word with selection.</Try>
-    <Try action="EditorSelectWord" trigger="EditorSelectWord">Press <action>EditorSelectWord</action> to extend selection to the next code block.</Try>
-    <Try trigger="EditorSelectWord">Try increase your selection with <action>EditorSelectWord</action> until your file will be selected.</Try>
-    <Try action="EditorUnSelectWord" trigger="EditorUnSelectWord"><action>EditorUnSelectWord</action> shrinks selection. Try to press it.</Try>
-    <Try action="$SelectAll" trigger="$SelectAll">Select the whole file with <action>$SelectAll</action></Try>
-    <Text action="learn.next.lesson">Awesome, press button to start next lesson or use <action>learn.next.lesson</action>.</Text>
+    <Try action="EditorNextWordWithSelection" trigger="EditorNextWordWithSelection">Place the caret before any word. Press <action>EditorNextWordWithSelection</action> to move the caret to the next word and select everything in between.</Try>
+    <Try action="EditorSelectWord" trigger="EditorSelectWord">Press <action>EditorSelectWord</action> to extend the selection to the next code block.</Try>
+    <Try trigger="EditorSelectWord">Try increasing your selection with <action>EditorSelectWord</action> until your whole file is selected.</Try>
+    <Try action="EditorUnSelectWord" trigger="EditorUnSelectWord"><action>EditorUnSelectWord</action> shrinks selection. Try pressing it.</Try>
+    <Try action="$SelectAll" trigger="$SelectAll">Now select the whole file instantly with <action>$SelectAll</action>.</Try>
+    <Text action="learn.next.lesson">Awesome! Click the button below to start the next lesson, or use <action>learn.next.lesson</action>.</Text>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index eb4c462..d7097f2
@@ -10,16 +10,16 @@ class CommentDemo {
         float brightness = 10;
 
         int rgb = Color.HSBtoRGB(hue, saturation, brightness);
-        int red = (rgb >> 16) &0xFF;
-        int green = (rgb >> 8) &0xFF;
-        int blue = rgb &0xFF;
+        int red = (rgb >> 16) &amp; 0xFF;
+        int green = (rgb >> 8) &amp; 0xFF;
+        int blue = rgb &amp; 0xFF;
 
     }
 }]]></CopyText>
     </MouseBlock>
     <MoveCaret position="3:1"/>
-    <Try action="CommentByLineComment" trigger="CommentByLineComment">Comment out any line with <action>CommentByLineComment</action></Try>
-    <Try check="training.check.CheckCountCommentedLine" action="CommentByLineComment" trigger="CommentByLineComment">Uncomment the commented line with the same shortcut <action>CommentByLineComment</action></Try>
-    <Try check="training.check.CheckCountCommentedLines" action="CommentByLineComment" triggers="EditorDownWithSelection;CommentByLineComment">Select several lines with <action>EditorDownWithSelection</action> and comment with <action>CommentByLineComment</action></Try>
+    <Try action="CommentByLineComment" trigger="CommentByLineComment">Comment out any line with <action>CommentByLineComment</action>.</Try>
+    <Try check="training.check.CheckCountCommentedLine" action="CommentByLineComment" trigger="CommentByLineComment">Uncomment the commented line with the same shortcut, <action>CommentByLineComment</action>.</Try>
+    <Try check="training.check.CheckCountCommentedLines" action="CommentByLineComment" triggers="EditorDownWithSelection;CommentByLineComment">Select several lines with <action>EditorDownWithSelection</action> and then comment them with <action>CommentByLineComment</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 392faf3..ffdc3fc
@@ -23,7 +23,7 @@
     }
 }]]></CopyText>
     </MouseBlock>
-    <Try action="EditorDeleteLine" trigger="EditorDeleteLine">Delete current line with <action>EditorDeleteLine</action></Try>
-    <Try action="$Undo" trigger="$Undo">To restore deleted line just press <action>$Undo</action></Try>
+    <Try action="EditorDeleteLine" trigger="EditorDeleteLine">Delete the current line with <action>EditorDeleteLine</action>.</Try>
+    <Try action="$Undo" trigger="$Undo">To restore the deleted line, press <action>$Undo</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 73eb5d8..18d080b
@@ -8,7 +8,7 @@
 
 }]]></CopyText>
     </MouseBlock>
-    <Try action="EditorDuplicate" trigger="EditorDuplicate">Duplicate any line with <action>EditorDuplicate</action></Try>
-    <Try action="EditorDuplicate" trigger="EditorDuplicate" check="training.check.CheckSelectedLines">You can do the same thing with a bunch of lines. Just select two or more lines and duplicate with <action>EditorDuplicate</action></Try>
+    <Try action="EditorDuplicate" trigger="EditorDuplicate">Duplicate any line with <action>EditorDuplicate</action>.</Try>
+    <Try action="EditorDuplicate" trigger="EditorDuplicate" check="training.check.CheckSelectedLines">You can do the same thing with multiple lines, too. Simply select two or more lines and duplicate them with <action>EditorDuplicate</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 63eb64c..30e53a2
     <ShowLineNumber/>
     <CaretBlock>
         <MoveCaret position="6:9"/>
-        <Try trigger="MoveLineDown">You can rearrange lines sequence with one shortcut instead of 3 actions: copy, delete and paste. Pull down the line where cursor stands with <action>MoveLineDown</action></Try>
-        <Try trigger="MoveLineUp">It works in a opposite way also <action>MoveLineUp</action></Try>
+        <Try trigger="MoveLineDown">Rearranging lines usually takes two actions: cut and paste. In this IDE, you can do it with just one: pressing <action>MoveLineDown</action> will pull down the current line.</Try>
+        <Try trigger="MoveLineUp">Similarly, to pull a line up, use <action>MoveLineUp</action>.</Try>
         <MoveCaret position="10:5"/>
-        <Try trigger="MoveStatementUp">Now try to move the whole statement up with <action>MoveStatementUp</action></Try>
+        <Try trigger="MoveStatementUp">Now try moving the whole statement up with <action>MoveStatementUp</action>.</Try>
     </CaretBlock>
     </MouseBlock>
     <Win/>
old mode 100644 (file)
new mode 100755 (executable)
index dac136c..2913b93
@@ -48,10 +48,10 @@ class CollapseDemo{
 
 }]]></CopyText>
     <MoveCaret position="13:9"/>
-        <Try trigger="CollapseRegion">Sometimes you need to collapse some code for better readability. Try to collapse code, with <action>CollapseRegion</action></Try>
-        <Try trigger="ExpandRegion">To expand code region, try <action>ExpandRegion</action></Try>
-        <Try trigger="CollapseAllRegions">If you want to collapse all regions in code, use <action>CollapseAllRegions</action></Try>
-        <Try trigger="ExpandAllRegions">And <action>ExpandAllRegions</action> in reverse order.</Try>
+        <Try trigger="CollapseRegion">Sometimes you need to collapse a piece of code for better readability. Try collapsing code with <action>CollapseRegion</action>.</Try>
+        <Try trigger="ExpandRegion">To expand a code region, hit <action>ExpandRegion</action></Try>
+        <Try trigger="CollapseAllRegions">If you want to collapse all regions in the file, use <action>CollapseAllRegions</action>.</Try>
+        <Try trigger="ExpandAllRegions">Similarly, press <action>ExpandAllRegions</action> to expand all available regions.</Try>
     <Win/>
 </CaretBlock>
 </MouseBlock>
old mode 100644 (file)
new mode 100755 (executable)
index db1c970..194b0eb
@@ -24,9 +24,9 @@
 </MouseBlock>
         <MoveCaret position="10:18" />
         <Try trigger="SelectNextOccurrence">Press <action>SelectNextOccurrence</action> to select the symbol at the caret.</Try>
-        <Try trigger="SelectNextOccurrence">Again press <action>SelectNextOccurrence</action> to select the next occurrence.</Try>
-        <Try trigger="UnselectPreviousOccurrence">Press <action>UnselectPreviousOccurrence</action> to unselect the last occurrence.</Try>
+        <Try trigger="SelectNextOccurrence">Press <action>SelectNextOccurrence</action> again to select the next occurrence of this symbol.</Try>
+        <Try trigger="UnselectPreviousOccurrence">Press <action>UnselectPreviousOccurrence</action> to deselect the last occurrence.</Try>
         <Try trigger="SelectAllOccurrences">Press <action>SelectAllOccurrences</action> to select all occurrences in the file.</Try>
-        <Try check="training.check.CheckMultipleSelections">Replace <code>th</code> with <code>td</code></Try>
+        <Try check="training.check.CheckMultipleSelections">Type <code>td</code> to replace all occurrences of <code>th</code> with <code>td</code></Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 422f85a..bc3efca
     return a]]></CopyText>
     </MouseBlock>
     <MoveCaret position="9:9"/>
-    <Try action="EditorNextWordWithSelection" trigger="EditorNextWordWithSelection">Put the caret before any word. Press <action>EditorNextWordWithSelection</action> to move caret to the next word with selection.</Try>
-    <Try action="EditorSelectWord" trigger="EditorSelectWord">Press <action>EditorSelectWord</action> to extend selection to the next code block.</Try>
-    <Try trigger="EditorSelectWord">Try increase your selection with <action>EditorSelectWord</action> until your file will be selected.</Try>
-    <Try action="EditorUnSelectWord" trigger="EditorUnSelectWord"><action>EditorUnSelectWord</action> shrinks selection. Try to press it.</Try>
-    <Try action="$SelectAll" trigger="$SelectAll">Select the whole file with <action>$SelectAll</action></Try>
-    <Text action="learn.next.lesson">Awesome, press button to start next lesson or use <action>learn.next.lesson</action></Text>
+    <Try action="EditorNextWordWithSelection" trigger="EditorNextWordWithSelection">Place the caret before any word. Press <action>EditorNextWordWithSelection</action> to move the caret to the next word and select everything in between.</Try>
+    <Try action="EditorSelectWord" trigger="EditorSelectWord">Press <action>EditorSelectWord</action> to extend the selection to the next code block.</Try>
+    <Try trigger="EditorSelectWord">Try increasing your selection with <action>EditorSelectWord</action> until your whole file is selected.</Try>
+    <Try action="EditorUnSelectWord" trigger="EditorUnSelectWord"><action>EditorUnSelectWord</action> is used to shrink a selection. Try pressing it.</Try>
+    <Try action="$SelectAll" trigger="$SelectAll">Now select the whole file instantly with <action>$SelectAll</action>.</Try>
+    <Text action="learn.next.lesson">Awesome! Click the button below to start the next lesson, or use <action>learn.next.lesson</action>.</Text>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 5810aa0..9d82cf8
@@ -23,13 +23,13 @@ class FoldingDemo {
 }]]></CopyText>
     <CaretBlock>
       <MoveCaret position="12:27"/>
-      <Text>We start learning the folding basics in <link>Collapse</link> lesson. Let's look to other folding options.</Text>
+      <Text>Previously we learned the basics of folding in the <link>Collapse</link> lesson. Now let's look at some other folding options.</Text>
       <Try trigger="CollapseRegion">Select any part of code and run folding by pressing <action>CollapseRegion</action></Try>
     </CaretBlock>
   </MouseBlock>
-  <Text>Fine! <ide/> collapses <code>new Runnable()</code> to a lambda function.</Text>
-  <Try trigger="ExpandRegion">To expand this structure use <action>ExpandRegion</action></Try>
-  <Try trigger="CollapseSelection"><ide/> allows you to fold any region. Select some part of code and use <action>CollapseSelection</action></Try>
-  <Try trigger="ExpandRegion">And <action>ExpandRegion</action>in a back way</Try>
+  <Text>Great! <ide/> collapses <code>new Runnable()</code> to a lambda function.</Text>
+  <Try trigger="ExpandRegion">To expand this structure, use <action>ExpandRegion</action>.</Try>
+  <Try trigger="CollapseSelection"><ide/> allows you to fold any region. Select a piece of code and use <action>CollapseSelection</action>.</Try>
+  <Try trigger="ExpandRegion">Similarly, <action>ExpandRegion</action> expands the selection.</Try>
   <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 5f1b1a5..a8dc267
@@ -36,10 +36,10 @@ class JumpToSourceDemo {
 }]]></CopyText>
         <CaretBlock>
         <MoveCaret position="6:59" />
-            <Text><ide/> has imposing list of navigation features.</Text>
-            <Try trigger="EditSource">Basically lets start from one very frequently used feature - Jump to Source. Try calling this action by <action>EditSource</action> to look up the source of <code>Params</code>.</Try>
+            <Text><ide/> offers a wide array of navigation features.</Text>
+            <Try trigger="EditSource">Let's start with one of the most frequently used features, Jump to Source. Press <action>EditSource</action> to look up the source of <code>Params</code>.</Try>
     </CaretBlock>
 </MouseBlock>
-        <Try check="training.check.CheckJumpFromString" trigger="EditSource">You may also Jump to Source of classes implemented in JDK. Press <action>EditSource</action> when the caret is on <code>String</code>.</Try>
+        <Try check="training.check.CheckJumpFromString" trigger="EditSource">You may also Jump to Source of classes implemented in the JDK. Place the caret on <code>String</code> and press <action>EditSource</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 9b29c7f..318e99e
@@ -29,8 +29,8 @@ class DeclarationDemo {
     }
 }]]></CopyText>
     <MoveCaret position="8:16"/>
-    <Try triggers="com.intellij.codeInsight.navigation.actions.GotoDeclarationAction">Use <action>GotoDeclaration</action> to jump to declaration of a class/interface.</Try>
+    <Try triggers="com.intellij.codeInsight.navigation.actions.GotoDeclarationAction">Use <action>GotoDeclaration</action> to jump to the declaration of a class or interface.</Try>
     <MoveCaret position="26:17"/>
-    <Try triggers="GotoImplementation">To see implementations of a class/interface use <action>GotoImplementation</action>.</Try>
+    <Try triggers="GotoImplementation">To see implementations of a class/interface, use <action>GotoImplementation</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 95fcded..bff4f00
@@ -23,9 +23,9 @@ class Rename{
         void touchByStylus(int x, int y, float strength);
     }
 }]]></CopyText>
-        <Try trigger="RenameElement">To rename anything put the caret at some occurence and use Rename refactoring. Put the caret to the field <code>deviceName</code> in any place of code and start renaming by pressing <action>RenameElement</action></Try>
-        <Try trigger="NextTemplateVariable">Write another name for this field instead selected. For example type <code>tabletName</code> and save the result by taping <action>EditorEnter</action></Try>
-        <Try trigger="RenameElement"><ide/> automatically recognizes getter for renaming fields and also recommends to refactor it. Put the caret to the field <code>stylus</code> and activate renaming with <action>RenameElement</action></Try>
-        <Try trigger="NextTemplateVariable">Replace <code>stylus</code> with <code>pencil</code>, for example, and complete refactoring with <action>EditorEnter</action></Try>
+        <Try trigger="RenameElement">You can rename anything by placing the caret on a symbol and using the Rename refactoring. Place the caret on the <code>deviceName</code> field anywhere in the code, and then press <action>RenameElement</action>.</Try>
+        <Try trigger="NextTemplateVariable">Enter a new name for this field. For example, type <code>tabletName</code>, and then save the result by pressing <action>EditorEnter</action>.</Try>
+        <Try trigger="RenameElement"><ide/> automatically detects the matching getter method when you rename a field and recommends refactoring it. Place the caret on the <code>stylus</code> field and start renaming it with <action>RenameElement</action>.</Try>
+        <Try trigger="NextTemplateVariable">Replace <code>stylus</code> with <code>pencil</code>, for example, and then complete the refactoring by pressing <action>EditorEnter</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 82929d9..c3f40fc
@@ -25,7 +25,7 @@
 <CaretBlock>
     <SetSelection start-position="9:9" end-position="9:52" />
     <MoveCaret position="9:44" />
-    <Try triggers="IntroduceVariable;NextTemplateVariable">Press <action>IntroduceVariable</action> to extract variable or field.</Try>
+    <Try triggers="IntroduceVariable;NextTemplateVariable">Press <action>IntroduceVariable</action> to extract variable or field.</Try>
     <Win/>
 </CaretBlock>
 </MouseBlock>
old mode 100644 (file)
new mode 100755 (executable)
index 2af0ad0..1d1d344
@@ -30,6 +30,6 @@ class Test{
     }
 }]]></CopyText>
     <SetSelection start-position="12:9" end-position="21:32"/>
-  <Try trigger="ExtractMethod">Extract method action allows to encapsulate selected code into a new method with given parameters and returning type. Let's extract some lines of code into a new method <code>init(Dimension myDimension)</code> by pressing <action>ExtractMethod</action></Try>
+  <Try trigger="ExtractMethod">Extract Method allows you to encapsulate a code selection into a new method with customizable parameters and return type. Let's extract some lines of code into a new method called <code>init(Dimension myDimension)</code>. Press <action>ExtractMethod</action>.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index e5920a4..b166e7e
@@ -24,13 +24,13 @@ class Refactorings {
 </MouseBlock>
         <MoveCaret position="9:74" />
         <SetSelection start-position="9:74" end-position="9:77" />
-        <Try check="training.check.CheckExtractConstant" trigger="IntroduceConstant">Press <action>IntroduceConstant</action> to extract the selected expression to a constant</Try>
+        <Try check="training.check.CheckExtractConstant" trigger="IntroduceConstant">Press <action>IntroduceConstant</action> to extract the selected expression into a constant.</Try>
         <SetSelection start-string="BufferedReader reader" end-string="lines.size()]);" />
-        <Try trigger="ExtractMethod">Press <action>ExtractMethod</action> to extract the selected code block into a method</Try>
+        <Try trigger="ExtractMethod">Press <action>ExtractMethod</action> to extract the selected code block into a method.</Try>
         <SetSelection start-string="new FileReader" end-string="new FileReader"/>
         <Action action="EditorSelectWord"/>
-        <Try check="training.check.CheckRefactoringBasics" trigger="IntroduceParameter">Press <action>IntroduceParameter</action>to extract the selected expression to a parameter</Try>
+        <Try check="training.check.CheckRefactoringBasics" trigger="IntroduceParameter">Press <action>IntroduceParameter</action> to extract the selected expression into a parameter.</Try>
         <MoveCaret string="new FileReader("/>
-        <Try triggers="IntroduceVariable;NextTemplateVariable">Press <action>IntroduceVariable</action> and select <code>new BufferedReader(...)</code> from the suggested list to extract it to a variable</Try>
+        <Try triggers="IntroduceVariable;NextTemplateVariable">Press <action>IntroduceVariable</action> and select <code>new FileReader(...)</code> from the list of suggestions to extract it into a variable.</Try>
     <Win/>
 </xml>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 825824a..d172b7b
@@ -4,29 +4,29 @@ dialog.invalidSdk.message=Invalid SDK for Project SDK. {0}
 dialog.invalidSdk.checkbox=Open Project SDK preferences
 
 dialog.emptyModule.title=Empty Module Problem
-dialog.emptyModule.message=Unable to open lesson in project with empty module(s)
+dialog.emptyModule.message=Unable to open a lesson in a project with empty module(s)
 dialog.emptyModule.checkbox=Open Project SDK preferences
 
 
 dialog.noSdk.title=Project SDK Problem
-dialog.noSdk.message=Cannot start learning: the SDK is not specified for current project.\nSpecify the SDK for {0} at Project Structure dialog.
+dialog.noSdk.message=Cannot start learning: no SDK is specified for the current project.\nPlease specify the SDK for {0} in the Project Structure dialog.
 dialog.noSdk.checkbox=Open Project SDK preferences
 
 dialog.learnProjectWarning.title=Learning Project Warning
-dialog.learnProjectWarning.message=For this module IDEA will open a new Project. Do you want to continue learning?
+dialog.learnProjectWarning.message=For this module, IntelliJ IDEA will open a new project. Do you want to continue learning?
 
 dialog.lessonDialog.title=Lesson Notification
 
 
 ### Status bar info ###
-status.demoMode.tooltipText=IntelliJ IDEA is under DEMO MODE
+status.demoMode.tooltipText=IntelliJ IDEA is in DEMO MODE
 
 ### Demo Widget first shown
-demoWidget.info.title=IntelliJ IDEA is under DEMO MODE
-demoWidget.info.message=IntelliJ IDEA is demonstrating itself. All user actions will be silenced.
+demoWidget.info.title=IntelliJ IDEA is in DEMO MODE
+demoWidget.info.message=IntelliJ IDEA is now self-demonstrating. All user actions will be silenced.
 
 ### Disable lessons message ###
-action.IndexingWarningDummyAction.description=IntelliJ IDEA is indexing project, please wait
+action.IndexingWarningDummyAction.description=Please wait while IntelliJ IDEA indexes the project.
 
 
 learn.ui.alltopics=All Topics
@@ -34,54 +34,54 @@ learn.ui.button.skip=Skip Lesson
 learn.ui.button.next.lesson=Next Lesson
 learn.ui.button.next.module=Next Topic:
 learn.ui.button.skip.module=Skip to Module:
-learn.ui.balloon.blockCaret.message=Caret is blocked in this lesson
+learn.ui.balloon.blockCaret.message=The caret is blocked in this lesson
 
 ### Congratulations panel ###
 learn.ui.course.completed.caption=Course completed
-learn.ui.course.completed.description=Congratulations! The course is completed. We are working on new lessons to make your IDE usage more productive.
+learn.ui.course.completed.description=Congratulations, you've completed the course! We are working to create new lessons to help you be more productive with the IDE.\nWe want to know more about your experience. Please share your feedback with us!
 learn.ui.button.submit.feedback=Submit Feedback
 
 learn.tool.window.quick.access.title=Start Learning Here
-learn.tool.window.quick.access.message=Learn tool window button is always located at window border\nClick the button to see available lessons
+learn.tool.window.quick.access.message=The Learn tool window button is located on the left-hand side near the window border\nClick the button to see the list of available lessons
 
 learn.ui.mainpanel.submit.feedback=Send Feedback
 
 
-learn.activity.title=Learn more?
-learn.activity.message=You have {0} not passed lesson{1}. Would you like to improve your IDE skills?
+learn.activity.title=Want to keep learning?
+learn.activity.message=You have {0} lesson{1} to go through. Want to improve your IDE skills now?
 learn.activity.message.lessons=s
 learn.activity.learn=Learn now
 learn.activity.later=Remind me later
-learn.activity.never=Don't show me it
+learn.activity.never=Don't show me this
 
 learn.WelcomeScreen.StartLearn.text=Learn {0}
-learn.WelcomeScreen.StartLearn.description=Learn shortcuts, actions and UI of IDE
+learn.WelcomeScreen.StartLearn.description=Learn the shortcuts, actions and user interface of the IDE
 
 ### Choose language panel ###
-learn.choose.language.caption=Choose study language
-learn.choose.language.description=We found more than one language suitable for learning. Select one to continue training.
+learn.choose.language.caption=Choose a language to study
+learn.choose.language.description=We've found more than one language suitable for learning. Please select one to continue.
 learn.choose.language.button=Start Learning
 learn.choose.language.dialog.title = Choose Study Language
 
 ### Feedback Form Panel ###
 learn.feedback.caption=Feedback
-learn.feedback.description=Thank you for using the IDE Features Trainer plugin. Please share how was your experience. Your feedback will help us to make the training plugin better.
+learn.feedback.description=Thank you for using the IDE Features Trainer plugin. Would you like to tell us about your experience? Your feedback will help us make the training plugin better.
 
 learn.feedback.rate.question.1=1. How was your training experience?
 learn.feedback.rate.question.1.low=Awful
-learn.feedback.rate.question.1.high=Love it
+learn.feedback.rate.question.1.high=Loved it
 
 learn.feedback.rate.question.2=2. How much have you learned?
-learn.feedback.rate.question.2.low=None
-learn.feedback.rate.question.2.high=A lot
+learn.feedback.rate.question.2.low=Nothing
+learn.feedback.rate.question.2.high=A whole lot
 
-learn.feedback.rate.question.3=3. How likely is it that you would recommend the training plugin to a friend or colleague?
-learn.feedback.rate.question.3.low=Never
-learn.feedback.rate.question.3.high=Sure
+learn.feedback.rate.question.3=3. How likely would you be recommend the training plugin to a friend or colleague?
+learn.feedback.rate.question.3.low=Highly unlikely
+learn.feedback.rate.question.3.high=Very likely
 
 learn.feedback.detailed.feedback=Please share your thoughts about the plugin:
 learn.feedback.back.to.modules=Back to lessons
 learn.feedback.submit.button=Submit
 
-learn.feedback.submit.success=Feedback submitted. Thank you!
-learn.feedback.submit.notsuccess=Transport error. Try again later.
+learn.feedback.submit.success=Feedback submitted successfully. Thank you!
+learn.feedback.submit.notsuccess=Failed to submit feedback. Please try again later.