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

svn 1.7 resources mainly

Browse Source
This commit is contained in:
irengrig
2011-11-17 18:57:14 +04:00
parent d3b7021c74
commit 6120a7e59a
20 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/META-INF/plugin.xml
+6 -2
View File
@@ -3,11 +3,15 @@
<id>Subversion 1.7</id>
<version>1.0</version>
<category>VCS Integration</category>
<description>This plugin provides only basic support for Subversion 1.7.
Many operations are not implemented.
Subversion 1.7 integration is not ready yet.
We do NOT guarantee data safety and consistency.
Also, we do NOT guarantee that plugin correctly works with Subversion 1.6 and lower working copies!</description>
<depends>com.intellij.modules.vcs</depends>
<vendor logo="/general/ijLogo.png">JetBrains</vendor>
<resource-bundle>org.jetbrains.idea.svn17.SvnBundle</resource-bundle>
<resource-bundle>org.jetbrains.idea.svn17.SvnBundle17</resource-bundle>
<project-components>
<component>
plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnBundle.java
+1 -1
View File
@@ -26,7 +26,7 @@ import java.util.ResourceBundle;
public class SvnBundle {
private static Reference<ResourceBundle> ourBundle;
@NonNls private static final String BUNDLE = "org.jetbrains.idea.svn17.SvnBundle";
@NonNls private static final String BUNDLE = "org.jetbrains.idea.svn17.SvnBundle17";
private SvnBundle() {
}
plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnBundle.properties → plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnBundle17.properties
+41 -41
View File
@@ -1,46 +1,46 @@
#Actions&Plugin info
group.SubversionFileGroup.text=SVN
action.Subversion.BrowseSVNRepository.text=Bro_wse Subversion Repository...
action.Subversion.BrowseSVNRepository.description=Browse a Subversion repository
group.SubversionFilePopupGroup.text=_Subversion
action.Subversion.Add.text=_Add
action.Subversion.Add.description=Add the file to Subversion
group.IgnoreChoicesGroup.text=Ignore
group.RevertIgnoreChoicesGroup.text=Remove from ignore list
action.Subversion.UndoIgnore.text=Selected file names
action.Subversion.UndoIgnore.description=Remove file name/mask from folder ignore list
action.Subversion.Ignore.ExactMatch.text=Selected file names
action.Subversion.Ignore.ExactMatch.description=Adds names of all selected files into folder ignore list
action.Subversion.Ignore.MatchExtension.text=Extension mask
action.Subversion.Ignore.MatchExtension.description=Adds {0} mask into folder ignore list
action.Subversion.SetProperty.text=Set Proper_ty...
action.Subversion.SetProperty.description=Set versioned property on file or directory
action.Subversion.Revert.text=_Revert...
action.Subversion.Revert.description=Revert file to pristine state
action.Subversion.Resolve.text=Re_solve Text Conflict...
action.Subversion.Resolve.description=Resolve text conflict on file
action.Subversion.MarkResolved.text=_Mark Resolved...
action.Subversion.MarkResolved.description=Mark text and properties conflicts as resolved
action.Subversion.Clenaup.text=Cl_eanup
action.Subversion.Clenaup.description=Unlock locked directories and run all remaining incompleted operations
action.Subversion.Copy.text=_Branch or Tag...
action.Subversion.Copy.description=Copy selected file or directory to the new repository location
action.Subversion.Lock.text=_Lock...
action.Subversion.Lock.description=Lock files
action.Subversion.Unlock.text=Unl_ock
action.Subversion.Unlock.description=Unlock files
action.SvnChangesBrowser.text=Bro_wse Changes...
group.SubversionFileGroup17.text=SVN
action.Subversion17.BrowseSVNRepository.text=Bro_wse Subversion Repository (1.7)...
action.Subversion17.BrowseSVNRepository.description=Browse a Subversion repository (1.7)
group.SubversionFilePopupGroup17.text=_Subversion 1.7 Experimental
action.Subversion17.Add.text=_Add
action.Subversion17.Add.description=Add the file to Subversion
group.IgnoreChoicesGroup17.text=Ignore
group.RevertIgnoreChoicesGroup17.text=Remove from ignore list
action.Subversion17.UndoIgnore.text=Selected file names
action.Subversion17.UndoIgnore.description=Remove file name/mask from folder ignore list
action.Subversion17.Ignore.ExactMatch.text=Selected file names
action.Subversion17.Ignore.ExactMatch.description=Adds names of all selected files into folder ignore list
action.Subversion17.Ignore.MatchExtension.text=Extension mask
action.Subversion17.Ignore.MatchExtension.description=Adds {0} mask into folder ignore list
action.Subversion17.SetProperty.text=Set Proper_ty...
action.Subversion17.SetProperty.description=Set versioned property on file or directory
action.Subversion17.Revert.text=_Revert...
action.Subversion17.Revert.description=Revert file to pristine state
action.Subversion17.Resolve.text=Re_solve Text Conflict...
action.Subversion17.Resolve.description=Resolve text conflict on file
action.Subversion17.MarkResolved.text=_Mark Resolved...
action.Subversion17.MarkResolved.description=Mark text and properties conflicts as resolved
action.Subversion17.Clenaup.text=Cl_eanup
action.Subversion17.Clenaup.description=Unlock locked directories and run all remaining incompleted operations
action.Subversion17.Copy.text=_Branch or Tag...
action.Subversion17.Copy.description=Copy selected file or directory to the new repository location
action.Subversion17.Lock.text=_Lock...
action.Subversion17.Lock.description=Lock files
action.Subversion17.Unlock.text=Unl_ock
action.Subversion17.Unlock.description=Unlock files
action.SvnChangesBrowser17.text=Bro_wse Changes...
plugin.Subversion.description=Provides integration with Subversion version control system
action.name.refresh=Refresh
action.Subversion.ImportToSVNRepository.text=I_mport into Subversion...
action.Subversion.Share.text=_Share Directory...
action.Subversion.ShowProperties.text=Edit _Properties
action.Subversion.ConfigureBranches.text=Configure Branches...
action.Subversion.CompareWithBranch.text=Compare with Branch...
action.Subversion.Relocate.text=Relocate...
action.Subversion.Relocate.description=Relocate working copy to a different URL
action.Subversion.CleanupProject.text=Cleanup Project
action.Subversion.CleanupProject.description=Perform cleanup for all working copy directories in the project
action.Subversion17.ImportToSVNRepository.text=I_mport into Subversion (1.7)...
action.Subversion17.Share.text=_Share Directory...
action.Subversion17.ShowProperties.text=Edit _Properties
action.Subversion17.ConfigureBranches.text=Configure Branches...
action.Subversion17.CompareWithBranch.text=Compare with Branch...
action.Subversion17.Relocate.text=Relocate...
action.Subversion17.Relocate.description=Relocate working copy to a different URL
action.Subversion17.CleanupProject.text=Cleanup Project
action.Subversion17.CleanupProject.description=Perform cleanup for all working copy directories in the project
#Copy dialog
dialog.title.branch=Create Branch or Tag
@@ -483,7 +483,7 @@ share.directory.info.message=To complete share operation commit ''{0}''.
share.directory.create.dir.progress.text=Creating remote folder {0}
share.directory.checkout.back.progress.text=Checking out {0}
share.or.import.add.progress.text=Scheduling {0} for addition
action.share.whole.project.text=Share Project (Subversion)...
action.share.whole.project.text=Share Project (Subversion 1.7)...
action.Subversion.integrate.changes.open.in.changelist.text=Open in changelist:
action.Subversion.integrate.changes.select.working.copy.text=Integrate into working copy:
action.Subversion.integrate.changes.dialog.title=Integrate To Branch
plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnConfigurable.form
+13 -13
View File
@@ -20,7 +20,7 @@
</grid>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.configuration.configuration.directory"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.configuration.configuration.directory"/>
</properties>
</component>
<component id="212b3" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myConfigurationDirectoryText">
@@ -40,7 +40,7 @@
</grid>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.configure.use.system.default.configuration.directory"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.configure.use.system.default.configuration.directory"/>
</properties>
</component>
<component id="1283d" class="javax.swing.JCheckBox" binding="myUseCommonProxy">
@@ -58,7 +58,7 @@
<grid row="13" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="button.text.edit.proxies"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="button.text.edit.proxies"/>
</properties>
</component>
<component id="decc5" class="javax.swing.JButton" binding="myClearAuthButton">
@@ -66,7 +66,7 @@
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="button.text.clear.authentication.cache"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="button.text.clear.authentication.cache"/>
</properties>
</component>
<component id="23675" class="javax.swing.JLabel" binding="myClearCacheLabel">
@@ -77,7 +77,7 @@
<enabled value="true"/>
<font/>
<foreground color="-10066330"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.text.delete.stored.credentials"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.text.delete.stored.credentials"/>
</properties>
</component>
<component id="a9606" class="javax.swing.JLabel" binding="myUseCommonProxyLabel">
@@ -87,7 +87,7 @@
<properties>
<enabled value="true"/>
<foreground color="-10066330"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="use.idea.proxy.as.default.label.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="use.idea.proxy.as.default.label.text"/>
</properties>
</component>
<component id="a353c" class="javax.swing.JLabel" binding="myEditProxyLabel">
@@ -97,7 +97,7 @@
<properties>
<enabled value="true"/>
<foreground color="-10066330"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.text.edit.proxies"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.text.edit.proxies"/>
</properties>
</component>
<component id="27350" class="com.intellij.ui.TitledSeparator">
@@ -123,8 +123,8 @@
<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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="action.Subversion.update.use.locks.on.demand.text.configurable"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="action.Subversion.update.use.locks.on.demand.description"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="action.Subversion.update.use.locks.on.demand.text.configurable"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="action.Subversion.update.use.locks.on.demand.description"/>
</properties>
</component>
<component id="c2f81" class="javax.swing.JCheckBox" binding="myDetectNestedWorkingCopiesCheckBox" default-binding="true">
@@ -132,7 +132,7 @@
<grid row="15" 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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="detect.nested.working.copies"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="detect.nested.working.copies"/>
</properties>
</component>
<component id="f2afc" class="javax.swing.JCheckBox" binding="myIgnoreWhitespaceDifferenciesInCheckBox" default-binding="true">
@@ -140,7 +140,7 @@
<grid row="19" 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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="svn.option.ignore.whitespace.in.annotate"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="svn.option.ignore.whitespace.in.annotate"/>
</properties>
</component>
<component id="cd5ae" class="javax.swing.JCheckBox" binding="myShowMergeSourceInAnnotate" default-binding="true">
@@ -148,7 +148,7 @@
<grid row="18" 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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="annotation.show.merge.sources.default.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="annotation.show.merge.sources.default.text"/>
</properties>
</component>
<grid id="fa93d" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -263,7 +263,7 @@
</constraints>
<properties>
<foreground color="-65536"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="svn17.plugin.not.ready"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="svn17.plugin.not.ready"/>
</properties>
</component>
<component id="f7ade" class="com.intellij.ui.HyperlinkLabel" binding="myLinkLabel">
plugins/svn4idea/src/org/jetbrains/idea/svn17/actions/SubversionGroup.java
+1 -1
View File
@@ -27,6 +27,6 @@ public class SubversionGroup extends StandardVcsGroup {
@Override
public String getVcsName(final Project project) {
return "svn";
return "svn17";
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn17/checkout/SvnCheckoutProvider.java
+1 -1
View File
@@ -273,7 +273,7 @@ public class SvnCheckoutProvider implements CheckoutProvider {
}
public String getVcsName() {
return "_Subversion";
return "_Subversion 1.7 Experimental";
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn17/config/ConfigureProxiesOptionsPanel.form
+16 -16
View File
@@ -19,7 +19,7 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldSmallWithIndent"/>
</clientProperties>
<border type="line" title-resource-bundle="org/jetbrains/idea/svn17/SvnBundle" title-key="dialog.edit.http.proxies.settings.panel.proxy.title"/>
<border type="line" title-resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" title-key="dialog.edit.http.proxies.settings.panel.proxy.title"/>
<children>
<component id="e6880" class="javax.swing.JLabel">
<constraints>
@@ -27,7 +27,7 @@
</constraints>
<properties>
<labelFor value="29d0b"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.patterns.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.patterns.text"/>
</properties>
</component>
<component id="1bd1" class="javax.swing.JLabel">
@@ -36,7 +36,7 @@
</constraints>
<properties>
<labelFor value="ffaac"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.exceptions.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.exceptions.text"/>
</properties>
</component>
<component id="bad8b" class="javax.swing.JLabel">
@@ -45,7 +45,7 @@
</constraints>
<properties>
<labelFor value="a392a"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.server.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.server.text"/>
</properties>
</component>
<component id="a392a" class="javax.swing.JTextField" binding="myServerField">
@@ -62,7 +62,7 @@
</constraints>
<properties>
<labelFor value="ca2e5"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.port.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.port.text"/>
</properties>
</component>
<component id="ca2e5" class="javax.swing.JTextField" binding="myPortField">
@@ -80,7 +80,7 @@
<properties>
<labelFor value="131ae"/>
<requestFocusEnabled value="false"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.password.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.password.text"/>
</properties>
</component>
<component id="131ae" class="javax.swing.JPasswordField" binding="myPasswordField">
@@ -97,7 +97,7 @@
</constraints>
<properties>
<labelFor value="4edaf"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.user.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.user.text"/>
</properties>
</component>
<component id="4edaf" class="javax.swing.JTextField" binding="myUserField">
@@ -114,7 +114,7 @@
</constraints>
<properties>
<labelFor value="13021"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.connection.timeout.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.connection.timeout.text"/>
</properties>
</component>
<component id="13021" class="javax.swing.JTextField" binding="myTimeoutField">
@@ -162,7 +162,7 @@
<grid row="4" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.seconds.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.seconds.text"/>
</properties>
</component>
</children>
@@ -181,7 +181,7 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldSmallWithIndent"/>
</clientProperties>
<border type="line" title-resource-bundle="org/jetbrains/idea/svn17/SvnBundle" title-key="dialog.edit.http.proxies.settings.panel.ssl.title"/>
<border type="line" title-resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" title-key="dialog.edit.http.proxies.settings.panel.ssl.title"/>
<children>
<component id="23c81" class="javax.swing.JLabel">
<constraints>
@@ -189,7 +189,7 @@
</constraints>
<properties>
<labelFor value="ee552"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.paths.to.authority.certificates.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.paths.to.authority.certificates.text"/>
</properties>
</component>
<component id="d2ab2" class="javax.swing.JLabel">
@@ -197,7 +197,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.ssl.client.certificate.file.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.ssl.client.certificate.file.text"/>
</properties>
</component>
<component id="c9225" class="javax.swing.JLabel">
@@ -206,7 +206,7 @@
</constraints>
<properties>
<labelFor value="82eaa"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.client.certificate.passphrase.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.client.certificate.passphrase.text"/>
</properties>
</component>
<component id="d6581" class="javax.swing.JLabel">
@@ -231,7 +231,7 @@
<grid row="2" column="2" 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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.trust.default.cas.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.trust.default.cas.text"/>
</properties>
</component>
<component id="61468" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myClientCertificatePathField">
@@ -266,7 +266,7 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldSmallWithoutIndent"/>
</clientProperties>
<border type="line" title-resource-bundle="org/jetbrains/idea/svn17/SvnBundle" title-key="dialog.edit.http.proxies.settings.panel.repositories.title"/>
<border type="line" title-resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" title-key="dialog.edit.http.proxies.settings.panel.repositories.title"/>
<children>
<component id="e003d" class="javax.swing.JButton" binding="myTestConnectionButton">
<constraints>
@@ -274,7 +274,7 @@
</constraints>
<properties>
<label value="Test connection"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="dialog.edit.http.proxies.settings.test.connection.button.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="dialog.edit.http.proxies.settings.test.connection.button.text"/>
</properties>
</component>
<scrollpane id="e8cb0" class="com.intellij.ui.components.JBScrollPane">
plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/BranchConfigurationDialog.form
+2 -2
View File
@@ -13,7 +13,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="configure.branches.trunk.location"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="configure.branches.trunk.location"/>
</properties>
</component>
<component id="c5128" class="javax.swing.JLabel">
@@ -21,7 +21,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="configure.branches.branch.locations"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="configure.branches.branch.locations"/>
</properties>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="31cc0">
plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/CopyDialog.form
+1 -1
View File
@@ -186,7 +186,7 @@
</constraints>
<properties>
<labelFor value="cdd55"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.copy.comment"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.copy.comment"/>
</properties>
</component>
</children>
plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/SetPropertyDialog.form
+4 -4
View File
@@ -14,7 +14,7 @@
</constraints>
<properties>
<labelFor value="490f7"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.set.property.property.name"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.set.property.property.name"/>
</properties>
</component>
<component id="490f7" class="javax.swing.JComboBox" binding="myPropertyNameBox">
@@ -34,7 +34,7 @@
</constraints>
<properties>
<selected value="true"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="radio.set.property.set.property.value"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="radio.set.property.set.property.value"/>
</properties>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="17a49">
@@ -61,7 +61,7 @@
<gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="radio.set.property.delete.property"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="radio.set.property.delete.property"/>
</properties>
</component>
<component id="fdc8d" class="javax.swing.JSeparator">
@@ -79,7 +79,7 @@
<gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.set.property.update.properties.recursively"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.set.property.update.properties.recursively"/>
</properties>
</component>
</children>
plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/browser/CheckoutOptionsDialog.form
+5 -5
View File
@@ -20,7 +20,7 @@
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkout.options.checkout.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkout.options.checkout.label"/>
</properties>
</component>
<component id="ce44e" class="javax.swing.JLabel" binding="myUrlLabel">
@@ -38,7 +38,7 @@
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkout.options.destination.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkout.options.destination.label"/>
</properties>
</component>
<component id="a1fdf" class="javax.swing.JCheckBox" binding="myExternalsCheckbox">
@@ -48,7 +48,7 @@
</constraints>
<properties>
<selected value="true"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkout.options.externals.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkout.options.externals.label"/>
</properties>
</component>
<component id="c374f" class="javax.swing.JSeparator">
@@ -77,8 +77,8 @@
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.depth.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.depth.description"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.depth.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.depth.description"/>
</properties>
</component>
<scrollpane id="cd7a3" class="com.intellij.ui.components.JBScrollPane">
plugins/svn4idea/src/org/jetbrains/idea/svn17/history/SvnVersionFilterComponent.form
+2 -2
View File
@@ -13,7 +13,7 @@
<grid row="0" 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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.changes.filter.filter.by.author"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.changes.filter.filter.by.author"/>
</properties>
</component>
<component id="ef757" class="javax.swing.JTextField" binding="myAuthorField">
@@ -39,7 +39,7 @@
</constraints>
<properties>
<selected value="true"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="browse.changes.settings.stop.on.copy"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="browse.changes.settings.stop.on.copy"/>
</properties>
</component>
</children>
plugins/svn4idea/src/org/jetbrains/idea/svn17/integrate/IntegratedSelectedOptionsDialog.form
+3 -3
View File
@@ -37,7 +37,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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.update.switch.configurable.try.merge.without.changes"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.update.switch.configurable.try.merge.without.changes"/>
</properties>
</component>
<component id="70f72" class="javax.swing.JCheckBox" binding="myIgnoreWhitespacesCheckBox" default-binding="true">
@@ -45,7 +45,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 resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.ignore.whitespace.when.merge.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.ignore.whitespace.when.merge.text"/>
</properties>
</component>
</children>
@@ -55,7 +55,7 @@
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="action.Subversion.integrate.changes.select.working.copy.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="action.Subversion.integrate.changes.select.working.copy.text"/>
</properties>
</component>
<component id="bf860" class="javax.swing.JComponent" binding="myToolbar" custom-create="true">
plugins/svn4idea/src/org/jetbrains/idea/svn17/update/SvnIntegratePanel.form
+4 -4
View File
@@ -13,7 +13,7 @@
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.update.switch.configurable.try.merge.without.changes"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.update.switch.configurable.try.merge.without.changes"/>
</properties>
</component>
<xy id="ef0c1" binding="myRootOptionsPanel" layout-manager="XYLayout" hgap="-1" vgap="-1">
@@ -30,7 +30,7 @@
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="action.Subversion.integrate.difference.option.use.ancestry.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="action.Subversion.integrate.difference.option.use.ancestry.text"/>
</properties>
</component>
<component id="31e75" class="org.jetbrains.idea.svn17.DepthCombo" binding="myDepthCombo" custom-create="true">
@@ -44,8 +44,8 @@
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.depth.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.depth.description"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.depth.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.depth.description"/>
</properties>
</component>
</children>
plugins/svn4idea/src/org/jetbrains/idea/svn17/update/SvnIntegrateRootOptionsPanel.form
+5 -5
View File
@@ -21,7 +21,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="integrate.configuration.description.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="integrate.configuration.description.label"/>
</properties>
</component>
<grid id="96f5e" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -37,7 +37,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="integrate.configuration.source1.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="integrate.configuration.source1.label"/>
</properties>
</component>
<component id="a6192" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myMergeText1">
@@ -53,7 +53,7 @@
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="integrate.configuration.revision1.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="integrate.configuration.revision1.label"/>
</properties>
</component>
<component id="ee183" class="org.jetbrains.idea.svn17.update.SvnRevisionPanel" binding="myRevision1">
@@ -77,7 +77,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="integrate.configuration.source2.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="integrate.configuration.source2.label"/>
</properties>
</component>
<component id="93f39" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myMergeText2">
@@ -93,7 +93,7 @@
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="integrate.configuration.revision2.label"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="integrate.configuration.revision2.label"/>
</properties>
</component>
<component id="bcee4" class="org.jetbrains.idea.svn17.update.SvnRevisionPanel" binding="myRevision2">
plugins/svn4idea/src/org/jetbrains/idea/svn17/update/SvnRevisionPanel.form
+2 -2
View File
@@ -13,7 +13,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="configure.revision.head.radio"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="configure.revision.head.radio"/>
</properties>
</component>
<component id="6005" class="javax.swing.JRadioButton" binding="mySpecified">
@@ -21,7 +21,7 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="configure.revision.specified.radio"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="configure.revision.specified.radio"/>
</properties>
</component>
<component id="c6cc7" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myRevisionField">
plugins/svn4idea/src/org/jetbrains/idea/svn17/update/SvnUpdatePanel.form
+4 -4
View File
@@ -33,8 +33,8 @@
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.depth.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="label.depth.description"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.depth.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="label.depth.description"/>
</properties>
</component>
<component id="1abb2" class="javax.swing.JCheckBox" binding="myForceBox">
@@ -50,8 +50,8 @@
<grid row="3" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="action.Subversion.update.use.locks.on.demand.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="action.Subversion.update.use.locks.on.demand.description"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="action.Subversion.update.use.locks.on.demand.text"/>
<toolTipText resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="action.Subversion.update.use.locks.on.demand.description"/>
</properties>
</component>
</children>
plugins/svn4idea/src/org/jetbrains/idea/svn17/update/SvnUpdateRootOptionsPanel.form
+3 -3
View File
@@ -33,7 +33,7 @@
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="checkbox.update.switch.configurable.to.specific.revision"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="checkbox.update.switch.configurable.to.specific.revision"/>
</properties>
</component>
<component id="9dc1a" class="javax.swing.JCheckBox" binding="myUpdateToSpecificUrl">
@@ -41,7 +41,7 @@
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="update.configuration.specific.url"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="update.configuration.specific.url"/>
</properties>
</component>
<hspacer id="39492">
@@ -71,7 +71,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle" key="update.switch.to.branch.text"/>
<text resource-bundle="org/jetbrains/idea/svn17/SvnBundle17" key="update.switch.to.branch.text"/>
</properties>
</component>
<component id="3e3c3" class="javax.swing.JLabel" binding="myCopyType">
plugins/svn4idea/svn4idea-tests.iml
+1 -3
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../out/classes/production/svn4idea-tests17" />
<output-test url="file://$MODULE_DIR$/../../../out/classes/test/svn4idea-tests17" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/testSource">
<sourceFolder url="file://$MODULE_DIR$/testSource" isTestSource="true" />
plugins/svn4idea/svn4idea.iml
+1 -3
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../out/classes/production/svn4idea17" />
<output-test url="file://$MODULE_DIR$/../../../out/classes/test/svn4idea17" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<exclude-exploded />
<content url="file://$MODULE_DIR$">