mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-05 01:50:56 +07:00
Proofread VCS lesson in the feature trainer
GitOrigin-RevId: c1d8eaf086a44e7992810772e8401097893744c6
This commit is contained in:
Dmitry Matveev
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
8a3fe0cfcf
commit
c5b0fccfc9
@@ -42,9 +42,9 @@ git.project.history.lesson.name=Project history
|
||||
git.project.history.open.git.window=Press {0} or click {1} stripe button to open the {2} tool window \
|
||||
and preview all performed commits in a visual timeline.
|
||||
git.project.history.commits.tree.explanation=The tree of commits is located in the center of the tool window. \
|
||||
You can see that your last commit of your active branch got highlighted. \
|
||||
You can see that the last commit of your active branch got highlighted. \
|
||||
Note that all commits below the highlighted one are also from this branch, and they are colored differently. \
|
||||
The rest of the commits are in the other branches.
|
||||
The rest of the commits are in other branches.
|
||||
git.project.history.commits.tree.got.it=This is the last commit of your active branch
|
||||
git.project.history.apply.branch.filter=All branches of your repository are listed in the left pane of the tool window. \
|
||||
{0,choice,0#Click|1#Double-click} the <strong>HEAD</strong> branch to show commits only from the active branch.
|
||||
@@ -53,10 +53,10 @@ git.project.history.apply.user.filter=You can use many filters that help you dis
|
||||
For example, you can preview the commits of a specific author. Click the highlighted filter to open the list of users.
|
||||
git.project.history.click.filter.tooltip=Click to open the list of users
|
||||
git.project.history.select.me=Select {0} from the list to show only your commits.
|
||||
git.project.history.apply.message.filter=The highlighted search field can help you find a commit by a message or hash. \
|
||||
Suppose you want to find a commit by part of the message. For example, type {0} in the highlighted field and press {1}.
|
||||
git.project.history.apply.message.filter=The highlighted search field can help you find commits by their message or hash. \
|
||||
Suppose you want to find a commit by a part of its message. For example, type {0} in the highlighted field and press {1}.
|
||||
git.project.history.select.commit=Select the highlighted commit to obtain information about it.
|
||||
git.project.history.commit.details.explanation=Right pane of the tool window shows information about the selected commit: \
|
||||
git.project.history.commit.details.explanation=The right pane of the tool window shows information about the selected commit: \
|
||||
some metadata and the branches that contain this commit.
|
||||
git.project.history.commit.details.got.it=The detailed commit metadata and branches that contain this commit are displayed here
|
||||
git.project.history.click.changed.file=There is also a tree with all files changed in this commit. \
|
||||
@@ -66,15 +66,15 @@ git.project.history.close.diff=Close the diff window after reviewing the changes
|
||||
git.project.history.invitation.to.commit.lesson=Great! Let's discover how to create commits in the next lesson.
|
||||
|
||||
git.commit.lesson.name=Commit
|
||||
git.commit.open.commit.window=Suppose you modified some files in the project and want to commit them to the current branch.
|
||||
git.commit.choose.files=The {0} tool window provides wide customization for your commits. \
|
||||
git.commit.open.commit.window=Suppose you've modified some files in the project and want to commit them to the current branch.
|
||||
git.commit.choose.files=The {0} tool window helps customize your commits in different ways. \
|
||||
Let''s say, you want {1} to be a part of the commit. Click the checkbox to include it.
|
||||
git.commit.choose.files.balloon=Select the highlighted file to include it to the commit
|
||||
git.commit.open.before.commit.options=Now edit the commit options. Press {0} to open the Git Options popup.
|
||||
git.commit.open.options.tooltip=Click to open the {0} options
|
||||
git.commit.analyze.code.explanation=Use {0} to get notified of warnings and errors found in the files to be committed. \
|
||||
In this lesson, you can keep this option intact.
|
||||
git.commit.enable.reformat.code=Select {0} to automatically edit files according to the code style.
|
||||
git.commit.enable.reformat.code=Select {0} to automatically fix formatting before applying the commit.
|
||||
git.commit.close.commit.options=When required options are selected, close the commit options popup. Press {0}.
|
||||
git.commit.perform.commit=Now edit the commit message or leave it as proposed. Then click the {0} button to perform a commit.
|
||||
git.commit.open.git.window=Great! Press {0} or click {1} stripe button to open the {2} tool window and discover your commit in the tree.
|
||||
@@ -99,9 +99,9 @@ git.commit.help.link=Commit and push changes to Git repository
|
||||
git.feature.branch.lesson.name=Feature branch workflow
|
||||
git.feature.branch.introduction.1=Suppose you have finished the work on your {0} branch and pushed the changes to the remote \
|
||||
to merge it with the {1} branch later. Press {2} to open the {3} tool window and preview the project history.
|
||||
git.feature.branch.introduction.2=But while you are working on your feature, some of your colleagues may also push their changes to the {0} \
|
||||
git.feature.branch.introduction.2=But while you were working on your feature, some of your colleagues might also push their changes to the {0} \
|
||||
branch.
|
||||
git.feature.branch.introduction.check=Let\u2019s check that possible changes in {0} do not conflict with your changes.
|
||||
git.feature.branch.introduction.check=Let''s check that possible changes in {0} do not conflict with your changes.
|
||||
git.feature.branch.introduction.got.it=These are the new commits of your {0} branch.
|
||||
git.feature.branch.open.branches.popup.1=First, check out the {0} branch. Press {1} or click in the highlighted area to open the {2}.
|
||||
git.feature.branch.checkout.branch=Choose the {0} branch and select {1} from the menu.
|
||||
@@ -117,7 +117,7 @@ git.feature.branch.open.push.dialog=When the {0} branch becomes updated, you sho
|
||||
Press {1} to open the {2} dialog.
|
||||
git.feature.branch.choose.force.push=You cannot just push the changes, because the remote {0} branch conflicts with the updated local branch. \
|
||||
Use {1}. Press the highlighted arrow near the {2} button to open the list and select {1}.
|
||||
git.feature.branch.confirm.force.push=Press {0} again to confirm the action.
|
||||
git.feature.branch.confirm.force.push=Click {0} again to confirm the action.
|
||||
git.feature.branch.force.push.tip=<strong>Tip</strong>: do not use {0} if you are not the only user of the branch. \
|
||||
It can cause the loss of your colleagues'' commits.
|
||||
# Link name to the IDE help
|
||||
@@ -158,12 +158,12 @@ git.changelists.shelf.create.changelist=Name the new changelist {0}. Press {1} o
|
||||
git.changelists.shelf.open.commit.window=Now let's inspect the created changelist.
|
||||
git.changelists.shelf.explanation=In addition, you can use the {0} feature to save these changes in a file on your computer. \
|
||||
Changes stored in the {0} can be applied later to any branch. It helps you avoid losing these changes.
|
||||
git.changelists.shelf.open.context.menu=Let's shelve the changes! Right-click the highlighted changelist to open the context menu.
|
||||
git.changelists.shelf.open.context.menu=Let's shelve the changes. Right-click the highlighted changelist to open its context menu.
|
||||
git.changelists.shelf.click.changelist.tooltip=Right-click the {0} changelist
|
||||
git.changelists.shelf.open.shelf.dialog=Select {0} to open {1} dialog.
|
||||
git.changelists.shelf.open.shelf.dialog=Select {0} to open the {1} dialog.
|
||||
git.changelists.shelf.shelve.changelist=Now you can edit the message or leave it intact. \
|
||||
Click {0} to store the changes in {1}.
|
||||
git.changelists.shelf.remove.changelist=You don''t need this changelist anymore, so click the {0} button.
|
||||
git.changelists.shelf.remove.changelist=You don''t need this changelist anymore: click {0} to discard it.
|
||||
git.changelists.shelf.performed.explanation=You can notice that the changelist is successfully saved to {0} \
|
||||
and the comment has disappeared.
|
||||
git.changelists.shelf.performed.got.it=You can notice that the changelist is successfully saved to {0}
|
||||
@@ -189,10 +189,10 @@ git.annotate.click.annotation.tooltip=Right-click the annotation
|
||||
git.annotate.choose.show.diff=Select the {0} option to show what is changed in this commit.
|
||||
git.annotate.go.deeper=You can notice that the value of {0} appeared before this commit. So let''s go deeper in history!
|
||||
git.annotate.invoke.shortcut.2=Move the caret to the left editor and press {0} again.
|
||||
git.annotate.invoke.manually=Right-click the highlighted area and select the {0} option from the opened menu.
|
||||
git.annotate.show.diff=Right click the highlighted annotation to open the context menu and choose {0}.
|
||||
git.annotate.found.needed.commit=Great! We found the place where {0} value has been changed. \
|
||||
So let''s annotate it for the last time to investigate the reason for this change.
|
||||
git.annotate.invoke.manually=Right-click the highlighted area and select {0} from the menu.
|
||||
git.annotate.show.diff=Right-click the highlighted annotation to open the context menu and choose {0}.
|
||||
git.annotate.found.needed.commit=Great! We''ve found the place where the {0} value had been changed. \
|
||||
So let''s annotate it for the last time to investigate the reason for that change.
|
||||
git.annotate.invoke.shortcut.3=Move the caret to the right editor and press {0}.
|
||||
git.annotate.click.annotation=Click the highlighted annotation to preview information about this commit.
|
||||
git.annotate.close.changes=As far as we see the highlighted commit message, this strange value of {0} is not a mistake. \
|
||||
|
||||
@@ -203,7 +203,7 @@ local.history.remove.code=In this lesson, you will learn how to restore code usi
|
||||
local.history.file.modification.progress=Modifying file
|
||||
local.history.editor.hint=File modification is disabled for the current step.
|
||||
local.history.dialog.message=The IDE simulates the process of editing a file. Please wait until it completes.
|
||||
local.history.imagine.restore=Imagine you need to restore code that was deleted earlier. {0} won't work because there have been multiple changes since then and you don't want to lose those changes.
|
||||
local.history.imagine.restore=Imagine you need to restore code that was deleted earlier. {0} won''t work because there have been multiple changes since then and you don''t want to lose those changes.
|
||||
local.history.invoke.context.menu=Use {0} to restore the deleted code with just a few clicks. Right-click anywhere in the editor to open the context menu.
|
||||
local.history.show.history=Choose {0} \u2192 {1}.
|
||||
local.history.select.revision=The left pane of the {0} dialog displays a list of saved revisions of the current file. The project state is automatically saved in {1} every time you edit code, run tests, or perform other actions. Let's select the revision that is highlighted.
|
||||
|
||||
Reference in New Issue
Block a user