diff --git a/changelog.html b/changelog.html index 840eee0e08..c3ac01421a 100644 --- a/changelog.html +++ b/changelog.html @@ -90,6 +90,8 @@ Upcoming changes (issue 5771)
  • Fixed a bug where Jenkins failed to show localized text for Hebrew, Indonesian, and Yedish. +
  • + Proxy configuration supported "no proxy host" setting to allow some hosts to bypass proxy.
  • Added/improved localization to Arabic, Bulgarian, Catalan, Czech, Danish, German, Greek, Esperanto, Spanish, Estonian, Basque, Finnish, French, Hebrew, Hindi, Hungarian, Indonesian, Icelandic, Italian, Kannada, Korean, Lithuanian, Latvian, Marathi, Norwegian, Dutch, Polish, Portugeese, Romanian, Russian, Slovak, Slovenian, Serbian, Swedish, Telgu, Turkish, Ukrainian, and Chinese. Thanks everyone! diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 372dc3969f..80d1a0927f 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -28,6 +28,7 @@ import hudson.init.InitMilestone; import hudson.init.InitStrategy; import hudson.init.InitializerFinder; import hudson.model.AbstractModelObject; +import hudson.model.Descriptor; import hudson.model.Failure; import hudson.model.UpdateCenter; import hudson.model.UpdateSite; @@ -611,49 +612,21 @@ public abstract class PluginManager extends AbstractModelObject { } - public HttpResponse doProxyConfigure( - @QueryParameter("proxy.server") String server, - @QueryParameter("proxy.port") String port, - @QueryParameter("proxy.userName") String userName, - @QueryParameter("proxy.password") String password) throws IOException { - Jenkins hudson = Jenkins.getInstance(); - hudson.checkPermission(Jenkins.ADMINISTER); + public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException { + Jenkins jenkins = Jenkins.getInstance(); + jenkins.checkPermission(Jenkins.ADMINISTER); - server = Util.fixEmptyAndTrim(server); - if(server==null) { - hudson.proxy = null; + ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm()); + if (pc.name==null) { + jenkins.proxy = null; ProxyConfiguration.getXmlFile().delete(); - } else try { - int proxyPort = Integer.parseInt(Util.fixNull(port)); - if (proxyPort < 0 || proxyPort > 65535) { - throw new Failure(Messages.PluginManager_PortNotInRange(0, 65535)); - } - hudson.proxy = new ProxyConfiguration(server, proxyPort, - Util.fixEmptyAndTrim(userName),Util.fixEmptyAndTrim(password)); - hudson.proxy.save(); - } catch (NumberFormatException nfe) { - throw new Failure(Messages.PluginManager_PortNotANumber()); + } else { + jenkins.proxy = pc; + jenkins.proxy.save(); } return new HttpRedirect("advanced"); } - public FormValidation doCheckProxyPort(@QueryParameter String value) { - value = Util.fixEmptyAndTrim(value); - if (value == null) { - return FormValidation.ok(); - } - int port; - try { - port = Integer.parseInt(value); - } catch (NumberFormatException e) { - return FormValidation.error(Messages.PluginManager_PortNotANumber()); - } - if (port < 0 || port > 65535) { - return FormValidation.error(Messages.PluginManager_PortNotInRange(0, 65535)); - } - return FormValidation.ok(); - } - /** * Uploads a plugin. */ @@ -687,6 +660,10 @@ public abstract class PluginManager extends AbstractModelObject { } } + public Descriptor getProxyDescriptor() { + return Jenkins.getInstance().getDescriptor(ProxyConfiguration.class); + } + /** * {@link ClassLoader} that can see all plugins. */ diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java index 47b03500e0..ae10f81e63 100644 --- a/core/src/main/java/hudson/ProxyConfiguration.java +++ b/core/src/main/java/hudson/ProxyConfiguration.java @@ -23,6 +23,10 @@ */ package hudson; +import com.google.common.collect.Lists; +import hudson.model.AbstractDescribableImpl; +import hudson.model.Descriptor; +import hudson.util.FormValidation; import jenkins.model.Jenkins; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; @@ -41,7 +45,13 @@ import java.net.URLConnection; import com.thoughtworks.xstream.XStream; import java.io.InputStream; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; + import org.jvnet.robust_http_client.RetryableHttpStream; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.QueryParameter; /** * HTTP proxy configuration. @@ -57,7 +67,7 @@ import org.jvnet.robust_http_client.RetryableHttpStream; * * @see jenkins.model.Jenkins#proxy */ -public final class ProxyConfiguration implements Saveable { +public final class ProxyConfiguration extends AbstractDescribableImpl implements Saveable { public final String name; public final int port; @@ -67,8 +77,12 @@ public final class ProxyConfiguration implements Saveable { private final String userName; /** - * null + * List of host names that shouldn't use proxy, as typed by users. + * + * @see #getNoProxyHostPatterns() */ + public final String noProxyHost; + @Deprecated private String password; @@ -82,10 +96,16 @@ public final class ProxyConfiguration implements Saveable { } public ProxyConfiguration(String name, int port, String userName, String password) { - this.name = name; + this(name,port,userName,password,null); + } + + @DataBoundConstructor + public ProxyConfiguration(String name, int port, String userName, String password, String noProxyHost) { + this.name = Util.fixEmptyAndTrim(name); this.port = port; - this.userName = userName; + this.userName = Util.fixEmptyAndTrim(userName); this.secretPassword = Secret.fromString(password); + this.noProxyHost = Util.fixEmptyAndTrim(noProxyHost); } public String getUserName() { @@ -105,7 +125,35 @@ public final class ProxyConfiguration implements Saveable { return (secretPassword == null) ? null : secretPassword.getEncryptedValue(); } + /** + * Returns the list of properly formatted no proxy host names. + */ + public List getNoProxyHostPatterns() { + if (noProxyHost==null) return Collections.emptyList(); + + List r = Lists.newArrayList(); + for (String s : noProxyHost.split("[ \t\n,|]+")) { + if (s.length()==0) continue; + r.add(Pattern.compile(s.replace(".", "\\.").replace("*", "[^.]*"))); + } + return r; + } + + /** + * @deprecated + * Use {@link #createProxy(String)} + */ public Proxy createProxy() { + return createProxy(null); + } + + public Proxy createProxy(String host) { + if (host!=null && noProxyHost!=null) { + for (Pattern p : getNoProxyHostPatterns()) { + if (p.matcher(host).matches()) + return Proxy.NO_PROXY; + } + } return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(name,port)); } @@ -145,7 +193,7 @@ public final class ProxyConfiguration implements Saveable { if(p==null) return url.openConnection(); - URLConnection con = url.openConnection(p.createProxy()); + URLConnection con = url.openConnection(p.createProxy(url.getHost())); if(p.getUserName()!=null) { // Add an authenticator which provides the credentials for proxy authentication Authenticator.setDefault(new Authenticator() { @@ -171,7 +219,7 @@ public final class ProxyConfiguration implements Saveable { if (p == null) return new RetryableHttpStream(url); - InputStream is = new RetryableHttpStream(url, p.createProxy()); + InputStream is = new RetryableHttpStream(url, p.createProxy(url.getHost())); if (p.getUserName() != null) { // Add an authenticator which provides the credentials for proxy authentication Authenticator.setDefault(new Authenticator() { @@ -194,4 +242,29 @@ public final class ProxyConfiguration implements Saveable { static { XSTREAM.alias("proxy", ProxyConfiguration.class); } + + @Extension + public static class DescriptorImpl extends Descriptor { + @Override + public String getDisplayName() { + return "Proxy Configuration"; + } + + public FormValidation doCheckPort(@QueryParameter String value) { + value = Util.fixEmptyAndTrim(value); + if (value == null) { + return FormValidation.ok(); + } + int port; + try { + port = Integer.parseInt(value); + } catch (NumberFormatException e) { + return FormValidation.error(Messages.PluginManager_PortNotANumber()); + } + if (port < 0 || port > 65535) { + return FormValidation.error(Messages.PluginManager_PortNotInRange(0, 65535)); + } + return FormValidation.ok(); + } + } } diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 98f7b551ad..da82f1f666 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -32,25 +32,15 @@ THE SOFTWARE. - +

    ${%HTTP Proxy Configuration}

    - - - - - - - - - - - - - - + + + + + diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config.groovy b/core/src/main/resources/hudson/ProxyConfiguration/config.groovy new file mode 100644 index 0000000000..a7aea49410 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config.groovy @@ -0,0 +1,19 @@ +package hudson.ProxyConfiguration; + +def f=namespace(lib.FormTagLib) + +f.entry(title:_("Server"),field:"name") { + f.textbox() +} +f.entry(title:_("Port"),field:"port") { + f.number(clazz:"number",min:0,max:65535,step:1) +} +f.entry(title:_("User name"),field:"userName") { + f.textbox() +} +f.entry(title:_("Password"),field:"password") { + f.password(value:instance?.encryptedPassword) +} +f.entry(title:_("No Proxy Host"),field:"noProxyHost") { + f.textarea() +} diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_da.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_da.properties new file mode 100644 index 0000000000..7d9ae2d5a0 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_da.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=Adgangskode +User\ name=Brugernavn +Port=Port +Server=Server diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_de.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_de.properties new file mode 100644 index 0000000000..ca929eb4fd --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_de.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Harald Wellmann, Simon Wiest +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Server=Server +Port=Port +User\ name=Benutzername +Password=Kennwort diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_es.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_es.properties new file mode 100644 index 0000000000..9ce49f8b13 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_es.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +User\ name=Usuario +Server=Servidor +Port=Puerto +Password=Contrase\u00f1a diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_fi.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_fi.properties new file mode 100644 index 0000000000..e66d579965 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_fi.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=Salasana +Port=Portti +Server=Palvelin +User\ name=K\u00e4ytt\u00e4j\u00e4 diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_fr.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_fr.properties new file mode 100644 index 0000000000..461167fb10 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_fr.properties @@ -0,0 +1,28 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Proxy\ Needs\ Authorization=Le proxy n\u00e9cessite une authentification +Server=Serveur +Port= +User\ name=Nom d''utilisateur +No\ Proxy\ for=Pas de proxy pour +Password=Mot de passe diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_it.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_it.properties new file mode 100644 index 0000000000..91419ea77d --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_it.properties @@ -0,0 +1,29 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Check\ now=Controlla ora +HTTP\ Proxy\ Configuration=Configurazione Proxy HTTP +Port=Porta +Submit=Invia +User\ name=Nome utente +lastUpdated=Informazioni di aggiornamento ottenute: {0} fa +uploadtext=Puoi fare l''upload di un file .hpi per installare diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_ja.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_ja.properties new file mode 100644 index 0000000000..421e0aa4bf --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_ja.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Server=\u30b5\u30fc\u30d0\u30fc +Port=\u30dd\u30fc\u30c8\u756a\u53f7 +User\ name=\u30e6\u30fc\u30b6\u30fc\u540d +Password=\u30d1\u30b9\u30ef\u30fc\u30c9 diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_ko.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_ko.properties new file mode 100644 index 0000000000..3f049e1546 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_ko.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=\uc554\ud638 +Port=\ud3ec\ud2b8 +Server=\uc11c\ubc84 +User\ name=\uc0ac\uc6a9\uc790\uba85 diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_nb_NO.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_nb_NO.properties new file mode 100644 index 0000000000..b96449ebd8 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_nb_NO.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=Passord +Port=Port +Server=Server +User\ name=Brukernavn diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_nl.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_nl.properties new file mode 100644 index 0000000000..1cbecc3026 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_nl.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Wim Rosseel +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=Wachtwoord +Server=Server +Port=Poortnummer +User\ name=Gebruikersnaam diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_pl.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_pl.properties new file mode 100644 index 0000000000..a03b5b7cb5 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_pl.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=Has\u0142o +Port=Port +Server=Serwer +User\ name=Nazwa u\u017cytkownika diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_pt_BR.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_pt_BR.properties new file mode 100644 index 0000000000..8976514e9c --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_pt_BR.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Server=Servidor +Password=Senha +User\ name=Nomde de usu\u00e1rio +Port=Porta diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_ru.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_ru.properties new file mode 100644 index 0000000000..eec64f2f09 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_ru.properties @@ -0,0 +1,26 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Password=\u041f\u0430\u0440\u043e\u043b\u044c +Port=\u041f\u043e\u0440\u0442 +Server=\u0421\u0435\u0440\u0432\u0435\u0440 +User\ name=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties new file mode 100644 index 0000000000..d07169c071 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties @@ -0,0 +1,36 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Check\ now=Kontrollera nu +File=Fil +HTTP\ Proxy\ Configuration=HTTP proxy konfiguration +Password=L\u00F6senord +Port=Port +Server=Server +Submit=Skicka +URL=URL +Update\ Site=Updatera sajt +Upload=Ladda upp +Upload\ Plugin=Ladda upp insticksmodul +User\ name=Anv\u00E4ndarnamn +lastUpdated=Information uppdaterad {0} sedan +uploadtext=Du kan ladda upp en .hpi-fil f\u00F6r att installera en insticksmodul som ligger utanf\u00F6r den centrala instickskatalogen. diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_tr.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_tr.properties new file mode 100644 index 0000000000..7d12d210c9 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_tr.properties @@ -0,0 +1,31 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +HTTP\ Proxy\ Configuration=HTTP Proxy Konfig\u00fcrasyonu +Submit=G\u00f6nder +Upload\ Plugin=Eklenti Y\u00fckle +uploadtext=\ +Merkezi eklenti repository''si d\u0131\u015f\u0131nda bir eklenti eklemek i\u00e7in .hpi dosyas\u0131n\u0131 y\u00fcklemeniz yeterli olacakt\u0131r. +File=Dosya +Upload=Y\u00fckle +lastUpdated=Al\u0131nan son g\u00fcncelleme bilgisi : {0} \u00f6nce +Check\ now=\u015eimdi kontrol et diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_zh_CN.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_zh_CN.properties new file mode 100644 index 0000000000..afffdf88b2 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_zh_CN.properties @@ -0,0 +1,36 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Check\ now=\u7ACB\u5373\u83B7\u53D6 +File=\u6587\u4EF6 +HTTP\ Proxy\ Configuration=\u4EE3\u7406\u8BBE\u7F6E +Password=\u5BC6\u7801 +Port=\u7AEF\u53E3 +Server=\u670D\u52A1\u5668 +Submit=\u63D0\u4EA4 +URL=URL +Update\ Site=\u5347\u7EA7\u7AD9\u70B9 +Upload=\u4E0A\u4F20 +Upload\ Plugin=\u4E0A\u4F20\u63D2\u4EF6 +User\ name=\u7528\u6237\u540D +lastUpdated=\u66F4\u65B0\u4FE1\u606F\u83B7\u53D6\u4E8E{0}\u524D +uploadtext=\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0A\u4F20\u4E00\u4E2A.hpi\u6587\u4EF6\u6765\u5B89\u88C5\u63D2\u4EF6\u3002 diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_zh_TW.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_zh_TW.properties new file mode 100644 index 0000000000..5a3886abb9 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/config_zh_TW.properties @@ -0,0 +1,36 @@ +# The MIT License +# +# Copyright (c) 2004-2010, Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Check\ now=\u99AC\u4E0A\u6AA2\u67E5 +File=\u6A94\u6848 +HTTP\ Proxy\ Configuration=HTTP \u4EE3\u7406\u4F3A\u670D\u5668\u8A2D\u5B9A +Password=\u5BC6\u78BC +Port=\u9023\u63A5\u57E0 +Server=\u4F3A\u670D\u5668 +Submit=\u9001\u51FA +URL=URL +Update\ Site=\u66F4\u65B0\u7DB2\u7AD9 +Upload=\u4E0A\u50B3 +Upload\ Plugin=\u4E0A\u50B3\u5916\u639B\u7A0B\u5F0F +User\ name=\u4F7F\u7528\u8005\u540D\u7A31 +lastUpdated=\u66F4\u65B0\u8CC7\u8A0A\u53D6\u5F97\u6642\u9593: {0} \u4EE5\u524D +uploadtext=\u60A8\u53EF\u4EE5\u624B\u52D5\u4E0A\u50B3 .hpi \u6A94\u6848\u4F86\u5B89\u88DD\u4E0D\u5728\u4E2D\u592E\u5132\u5B58\u5EAB\u4E0A\u7684\u5916\u639B\u7A0B\u5F0F\u3002 diff --git a/war/src/main/webapp/help/update-center/proxy-server.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name.html diff --git a/war/src/main/webapp/help/update-center/proxy-server_de.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_de.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server_de.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name_de.html diff --git a/war/src/main/webapp/help/update-center/proxy-server_fr.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_fr.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server_fr.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name_fr.html diff --git a/war/src/main/webapp/help/update-center/proxy-server_ja.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_ja.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server_ja.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name_ja.html diff --git a/war/src/main/webapp/help/update-center/proxy-server_nl.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_nl.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server_nl.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name_nl.html diff --git a/war/src/main/webapp/help/update-center/proxy-server_pt_BR.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_pt_BR.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server_pt_BR.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name_pt_BR.html diff --git a/war/src/main/webapp/help/update-center/proxy-server_tr.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_tr.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-server_tr.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-name_tr.html diff --git a/core/src/main/resources/hudson/ProxyConfiguration/help-noProxyHost.html b/core/src/main/resources/hudson/ProxyConfiguration/help-noProxyHost.html new file mode 100644 index 0000000000..a0421a7792 --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfiguration/help-noProxyHost.html @@ -0,0 +1,4 @@ +
    + Specify host name patterns that shouldn't go through the proxy, one host per line. + "*" is the wild card host name (such as "*.cloudbees.com" or "www*.jenkins-ci.org") +
    \ No newline at end of file diff --git a/war/src/main/webapp/help/update-center/proxy-port.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port.html diff --git a/war/src/main/webapp/help/update-center/proxy-port_de.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port_de.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port_de.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port_de.html diff --git a/war/src/main/webapp/help/update-center/proxy-port_fr.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port_fr.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port_fr.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port_fr.html diff --git a/war/src/main/webapp/help/update-center/proxy-port_ja.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port_ja.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port_ja.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port_ja.html diff --git a/war/src/main/webapp/help/update-center/proxy-port_nl.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port_nl.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port_nl.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port_nl.html diff --git a/war/src/main/webapp/help/update-center/proxy-port_pt_BR.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port_pt_BR.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port_pt_BR.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port_pt_BR.html diff --git a/war/src/main/webapp/help/update-center/proxy-port_tr.html b/core/src/main/resources/hudson/ProxyConfiguration/help-port_tr.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-port_tr.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-port_tr.html diff --git a/war/src/main/webapp/help/update-center/proxy-username.html b/core/src/main/resources/hudson/ProxyConfiguration/help-userName.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-username.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-userName.html diff --git a/war/src/main/webapp/help/update-center/proxy-username_de.html b/core/src/main/resources/hudson/ProxyConfiguration/help-userName_de.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-username_de.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-userName_de.html diff --git a/war/src/main/webapp/help/update-center/proxy-username_ja.html b/core/src/main/resources/hudson/ProxyConfiguration/help-userName_ja.html similarity index 100% rename from war/src/main/webapp/help/update-center/proxy-username_ja.html rename to core/src/main/resources/hudson/ProxyConfiguration/help-userName_ja.html