MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert: IDEA-161043 Rename "Version Control" toolwindow to "VCS"

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-09-15 21:42:14 +02:00
parent 307897dbad
commit 9054f58d63
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/platform-resources-en/src/messages/UIBundle.properties
View File

@@ -54,7 +54,7 @@ tool.window.name.hierarchy=Hierarchy
tool.window.name.inspection=Inspection Results
tool.window.name.todo=TODO
tool.window.name.dependency.viewer=Dependency Viewer
tool.window.name.version.control=VCS
tool.window.name.version.control=Version Control
tool.window.name.module.dependencies=Module Dependencies
tool.window.name.tasks=Time Tracking
tool.window.name.database=Database

2
platform/platform-resources-en/src/tips/ChangesView.html
View File

@@ -3,7 +3,7 @@
<link rel="stylesheet" type="text/css" href="css/tips.css">
</head>
<body>
<p>The <span class="control">VCS</span> tool window shows all deleted, modified, and unversioned files in a
<p>The <span class="control">Version Control</span> tool window shows all deleted, modified, and unversioned files in a
single view. Use <span class="shortcut">&shortcut:ActivateChangesToolWindow;</span> keyboard shortcut to show or
hide this tool window.</p>
<p>From the <span class="control">Changes</span> tool window you can perform all the necessary version control

2
platform/platform-resources-en/src/tips/moveFileToChangelist.html
View File

@@ -7,7 +7,7 @@
<p>
You can move any file to a changelist of your choice. To do that, just choose
<span class="control">Move to Another Changelist</span> on the file context menu in the VCS tool window:
<span class="control">Move to Another Changelist</span> on the file context menu in the Version Control tool window:
</p>
<p class="image"><img width="406" height="78" src="images/move_to_changelist.png"></p>

2
platform/platform-resources/src/idea/Keymap_Default.xml
View File

@@ -864,7 +864,7 @@
<action id="ActivateHierarchyToolWindow">
<keyboard-shortcut first-keystroke="alt 8"/>
</action>
<action id="ActivateVCSToolWindow">
<action id="ActivateVersionControlToolWindow">
<keyboard-shortcut first-keystroke="alt 9"/>
<keyboard-shortcut first-keystroke="alt shift 9"/>
</action>

2
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistorySessionPartner.java
View File

@@ -133,7 +133,7 @@ public class FileHistorySessionPartner implements VcsAppendableHistorySessionPar
@NotNull
private static ToolWindow getToolWindow(@NotNull Project project) {
ToolWindow toolWindow = ToolWindowManager.getInstance(project).getToolWindow(ToolWindowId.VCS);
assert toolWindow != null : "VCS ToolWindow should be available at this point.";
assert toolWindow != null : "Version Control ToolWindow should be available at this point.";
return toolWindow;
}

2
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
View File

@@ -92,7 +92,7 @@ public class CvsTabbedWindow implements Disposable {
@NotNull
private ToolWindow getToolWindow() {
final ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(ToolWindowId.VCS);
assert toolWindow != null : "VCS ToolWindow should be available at this point.";
assert toolWindow != null : "Version Control ToolWindow should be available at this point.";
return toolWindow;
}

4
python/educational-python/resources/tips/ChangesView.html
View File

@@ -3,9 +3,9 @@
<link rel="stylesheet" type="text/css" href="css/tips.css">
</head>
<body>
<p>The <span class="control">Local Changes</span> tab of the <span class="control">VCS</span> tool window shows all deleted, modified, and unversioned files in a single view.
<p>The <span class="control">Local Changes</span> tab of the <span class="control">Version Control</span> tool window shows all deleted, modified, and unversioned files in a single view.
Use <span class="shortcut">&shortcut:ActivateVersionControlToolWindow;</span> keyboard shortcut to show or hide this tool window.</p>
<p>From the <span class="control">VCS</span> tool window you can perform all the necessary version control actions: commit changes, manage changelists, put resources under version control, examine differences and more.</p>
<p>From the <span class="control">Version Control</span> tool window you can perform all the necessary version control actions: commit changes, manage changelists, put resources under version control, examine differences and more.</p>

2
python/educational-python/resources/tips/moveFileToChangelist.html
View File

@@ -8,7 +8,7 @@
<p>
You can move any file to a changelist of your choice. To do that, just choose
<span class="control">Move to Changelist</span> on the file context menu in the
Local Changes tab of the VCS tool window:
Local Changes tab of the Version Control tool window:
</p>
<p class="image"><img src="images/move_to_changelist.png"></p>

4
python/python-community-ide-resources/resources/tips/ChangesView.html
View File

@@ -3,9 +3,9 @@
<link rel="stylesheet" type="text/css" href="css/tips.css">
</head>
<body>
<p>The <span class="control">Local Changes</span> tab of the <span class="control">VCS</span> tool window shows all deleted, modified, and unversioned files in a single view.
<p>The <span class="control">Local Changes</span> tab of the <span class="control">Version Control</span> tool window shows all deleted, modified, and unversioned files in a single view.
Use <span class="shortcut">&shortcut:ActivateVersionControlToolWindow;</span> keyboard shortcut to show or hide this tool window.</p>
<p>From the <span class="control">VCS</span> tool window you can perform all the necessary version control actions: commit changes, manage changelists, put resources under version control, examine differences and more.</p>
<p>From the <span class="control">Version Control</span> tool window you can perform all the necessary version control actions: commit changes, manage changelists, put resources under version control, examine differences and more.</p>

2
python/python-community-ide-resources/resources/tips/moveFileToChangelist.html
View File

@@ -8,7 +8,7 @@
<p>
You can move any file to a changelist of your choice. To do that, just choose
<span class="control">Move to Changelist</span> on the file context menu in the
Local Changes tab of the VCS tool window:
Local Changes tab of the Version Control tool window:
</p>
<p class="image"><img src="images/move_to_changelist.png"></p>