MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

localize "Preferences | Version Control | Confirmation" configurable

Browse Source 
GitOrigin-RevId: 51d0d8567ac3c91978e284d666360c3674c9a78a
This commit is contained in:
Dmitry.Krasilschikov
2020-01-16 08:11:51 +00:00
committed by intellij-monorepo-bot
parent 71e2ade0aa
commit dc8b9bfa24
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/VcsBundle.properties
+9 -1
View File
@@ -689,4 +689,12 @@ inspection.CommitMessageSpellCheckingInspection.display.name=Spelling
inspection.SubjectLimitInspection.display.name=Limit subject line
settings.commit.without.dialog=Commit from Local Changes without showing the Commit dialog
settings.commit.without.dialog.applies.to.git.mercurial=Applies to projects under Git and Mercurial
settings.filter.configure.link=Configure
settings.filter.configure.link=Configure
radio.inactive.show.options.before.removing=Show options before removing
radio.remove.silently=Remove silently
radio.do.not.remove=Do not remove
radio.restore.workspace.on.branch.switching=Restore workspace on &branch switching
settings.when.files.are.deleted=When files are deleted
checkbox.including.external.files=Including &external files
settings.border.when.files.are.created=When files are created
settings.border.when.empty.changelist.becomes.inactive=When empty changelist becomes inactive
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
+8 -8
View File
@@ -22,7 +22,7 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
</clientProperties>
<border type="etched" title="When files are created"/>
<border type="etched" title-resource-bundle="messages/VcsBundle" title-key="settings.border.when.files.are.created"/>
<children>
<component id="61373" class="javax.swing.JRadioButton" binding="myShowDialogOnAddingFile">
<constraints>
@@ -54,7 +54,7 @@
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Including &amp;external files"/>
<text resource-bundle="messages/VcsBundle" key="checkbox.including.external.files"/>
</properties>
</component>
</children>
@@ -68,7 +68,7 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
</clientProperties>
<border type="etched" title="When empty changelist becomes inactive"/>
<border type="etched" title-resource-bundle="messages/VcsBundle" title-key="settings.border.when.empty.changelist.becomes.inactive"/>
<children>
<component id="7b546" class="javax.swing.JRadioButton">
<constraints>
@@ -76,7 +76,7 @@
</constraints>
<properties>
<margin top="2" left="2" bottom="2" right="2"/>
<text value="Show options before removing"/>
<text resource-bundle="messages/VcsBundle" key="radio.inactive.show.options.before.removing"/>
</properties>
</component>
<component id="59f74" class="javax.swing.JRadioButton">
@@ -84,7 +84,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Remove silently"/>
<text resource-bundle="messages/VcsBundle" key="radio.remove.silently"/>
</properties>
</component>
<component id="49213" class="javax.swing.JRadioButton">
@@ -92,7 +92,7 @@
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Do not remove"/>
<text resource-bundle="messages/VcsBundle" key="radio.do.not.remove"/>
</properties>
</component>
</children>
@@ -106,7 +106,7 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
</clientProperties>
<border type="etched" title="When files are deleted"/>
<border type="etched" title-resource-bundle="messages/VcsBundle" title-key="settings.when.files.are.deleted"/>
<children>
<component id="1256b" class="javax.swing.JRadioButton" binding="myShowDialogOnRemovingFile">
<constraints>
@@ -203,7 +203,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Restore workspace on &amp;branch switching"/>
<text resource-bundle="messages/VcsBundle" key="radio.restore.workspace.on.branch.switching"/>
</properties>
</component>
</children>