diff --git a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js index 508b16d59e..7114c96149 100644 --- a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js @@ -53,6 +53,8 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ enableProxyText: 'Enable Proxy', proxyServerText: 'Proxy Server', proxyPortText: 'Proxy Port', + proxyUserText: 'Proxy User', + proxyPasswordText: 'Proxy Password', baseUrlText: 'Base Url', forceBaseUrlText: 'Force Base Url', @@ -74,6 +76,8 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ enableProxyHelpText: 'Enable Proxy', proxyServerHelpText: 'The proxy server', proxyPortHelpText: 'The proxy port', + proxyUserHelpText: 'The username for the proxy server authentication.', + proxyPasswordHelpText: 'The password for the proxy server authentication.', baseUrlHelpText: 'The url of the application (with context path) i.e. http://localhost:8080/scm', forceBaseUrlHelpText: 'Redirects to the base url if the request comes from a other url', diff --git a/scm-webapp/src/main/webapp/resources/js/i18n/de.js b/scm-webapp/src/main/webapp/resources/js/i18n/de.js index 9b46944d3f..8d9ec74036 100644 --- a/scm-webapp/src/main/webapp/resources/js/i18n/de.js +++ b/scm-webapp/src/main/webapp/resources/js/i18n/de.js @@ -270,6 +270,8 @@ if (Sonia.config.ScmConfigPanel){ enableProxyText: 'Proxy aktivieren', proxyServerText: 'Proxy Server', proxyPortText: 'Proxy Port', + proxyUserText: 'Proxy User', + proxyPasswordText: 'Proxy Passwort', baseUrlText: 'Basis-URL', forceBaseUrlText: 'Basis-URL forcieren', @@ -296,6 +298,8 @@ if (Sonia.config.ScmConfigPanel){ enableProxyHelpText: 'Proxy-Einstellungen verwenden.', proxyServerHelpText: 'Der Proxy-Server.', proxyPortHelpText: 'Der Proxy-Port', + proxyUserHelpText: 'Der Benutzername für die Authentifizierung am Proxy-Server.', + proxyPasswordHelpText: 'Das Passwort für die Authentifizierung am Proxy-Server.', baseUrlHelpText: 'Die vollständige URL des Server, inclusive Context-Pfad z.B.: http://localhost:8080/scm.', forceBaseUrlHelpText: 'Leitet alle Zugriffe die nicht von der Basis-URL kommen auf die Basis-URL um.' });