diff --git a/plugins/svn4idea/resources/messages/SvnBundle.properties b/plugins/svn4idea/resources/messages/SvnBundle.properties index a6d1c5187b4d..93ab3fe32974 100644 --- a/plugins/svn4idea/resources/messages/SvnBundle.properties +++ b/plugins/svn4idea/resources/messages/SvnBundle.properties @@ -671,3 +671,9 @@ configurable.SvnConfigureProxiesComponent.display.name=HTTP Proxies Configuratio settings.use.custom.directory=&Use custom configuration directory: settings.check.mergeinfo=Check svn:mergeinfo in target subtree when preparing for merge settings.maximum.revisions.number=Maximum number of revisions to look back in annotations: +settings.HTTP.timeout=HTTP timeout: +settings.seconds=seconds +settings.SSH.connection.timeout=SSH connection timeout: +settings.SSH.read.timeout=SSH read timeout: +settings.edit.servers.subversion.runtime.configuration.file=Edit 'servers' Subversion runtime configuration file +settings.SSL.protocols=SSL protocols: \ No newline at end of file diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/NetworkSettingsPanel.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/NetworkSettingsPanel.form index 79b5bee60c1e..626bb5996966 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/NetworkSettingsPanel.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/NetworkSettingsPanel.form @@ -36,7 +36,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -174,7 +174,7 @@ - +