From a90914a86001b881bc7d53388b49c2242ee6a55b Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Fri, 17 Oct 2014 20:55:13 +0400 Subject: [PATCH 1/2] svn: Refactored SvnConfiguration - removed unused parameters, @NotNull --- .../src/org/jetbrains/idea/svn/SvnConfiguration.java | 7 ++++--- .../src/org/jetbrains/idea/svn/svnkit/SvnKitManager.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java index a9586e8d1458..5aa16cd75864 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java @@ -66,7 +66,7 @@ public class SvnConfiguration implements PersistentStateComponent Date: Sat, 18 Oct 2014 21:21:45 +0400 Subject: [PATCH 2/2] svn: Updated settings - renamed "Interactive mode" checkbox to "Enable interactive mode", updated description --- .../src/org/jetbrains/idea/svn/SvnBundle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties index e6f36b2b2fb7..f06a4e9b3ddd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties @@ -201,9 +201,9 @@ dialog.edit.http.proxies.settings.test.connection.succes.title=Connection test s confirmation.text.delete.stored.authentication.information=You are about to delete all stored Subversion authentication information.\nWould you like to proceed with deletion? confirmation.title.clear.authentication.cache=Clear Authentication Cache -command.line.interactive.mode.title=Interactive mode -command.line.interactive.mode.description=Emulates behaviour as if Subversion commands were executed directly from terminal (in interactive mode).
\ - Primarily intended to be used for handling password/passphrase prompts for svn+ssh repositories and trusting invalid server certificates for https repositories. +command.line.interactive.mode.title=Enable interactive mode +command.line.interactive.mode.description=Emulates the behavior when Subversion commands are executed directly from the terminal (in the interactive mode).
\ + This is required to handle password/passphrase prompts for svn+ssh repositories, and trust invalid server certificates for https repositories. ssh.settings.title=SSH Settings ssh.settings.executable.label=SSH executable\: