From 40e2d00da4cc648e4873beb55f9e8b75bf61efdc Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 15 Nov 2023 12:34:28 +1000 Subject: [PATCH 1/8] Move proxy configuration form out of pluginManager screens as it is not related Signed-off-by: Olivier Lamy --- core/src/main/java/hudson/PluginManager.java | 22 ----- .../hudson/ProxyConfigurationManager.java | 95 +++++++++++++++++++ .../main/resources/hudson/Messages.properties | 2 + .../hudson/PluginManager/advanced.jelly | 15 --- .../ProxyConfigurationManager/index.jelly | 50 ++++++++++ .../main/resources/images/symbols/proxy.svg | 1 + 6 files changed, 148 insertions(+), 37 deletions(-) create mode 100644 core/src/main/java/hudson/ProxyConfigurationManager.java create mode 100644 core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly create mode 100644 war/src/main/resources/images/symbols/proxy.svg diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 649cc045b482..f808928454a7 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -45,7 +45,6 @@ import hudson.model.AbstractModelObject; import hudson.model.AdministrativeMonitor; import hudson.model.Api; -import hudson.model.Descriptor; import hudson.model.DownloadService; import hudson.model.Failure; import hudson.model.ItemGroupMixIn; @@ -166,7 +165,6 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.interceptor.RequirePOST; -import org.kohsuke.stapler.verb.POST; import org.springframework.security.core.Authentication; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -1797,22 +1795,6 @@ public HttpResponse doSiteConfigure(@QueryParameter String site) throws IOExcept return new HttpRedirect("advanced"); } - @POST - public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException { - Jenkins jenkins = Jenkins.get(); - jenkins.checkPermission(Jenkins.ADMINISTER); - - ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm()); - if (pc.name == null) { - jenkins.proxy = null; - ProxyConfiguration.getXmlFile().delete(); - } else { - jenkins.proxy = pc; - jenkins.proxy.save(); - } - return new HttpRedirect("advanced"); - } - interface PluginCopier { void copy(File target) throws Exception; @@ -2130,10 +2112,6 @@ protected String identifyPluginShortName(File t) { return FilenameUtils.getBaseName(t.getName()); // fall back to the base name of what's uploaded } - public Descriptor getProxyDescriptor() { - return Jenkins.get().getDescriptor(ProxyConfiguration.class); - } - /** * Prepares plugins for some expected XML configuration. * If the configuration (typically a job’s {@code config.xml}) diff --git a/core/src/main/java/hudson/ProxyConfigurationManager.java b/core/src/main/java/hudson/ProxyConfigurationManager.java new file mode 100644 index 000000000000..834689c8085b --- /dev/null +++ b/core/src/main/java/hudson/ProxyConfigurationManager.java @@ -0,0 +1,95 @@ +/* + * The MIT License + * + * Copyright (c) 2023, CloudBees Inc, and other contributors + * + * 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. + */ + +package hudson; + +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.model.Descriptor; +import hudson.model.ManagementLink; +import hudson.security.Permission; +import java.io.IOException; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.HttpRedirect; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.verb.POST; + +@Extension +public class ProxyConfigurationManager extends ManagementLink { + + @Override + public String getDisplayName() { + return Messages.ProxyConfigurationManager_DisplayName(); + } + + @Override + public String getIconFileName() { + return "symbol-proxy"; + } + + @Override + public String getUrlName() { + return "proxyConfigurationManager"; + } + + @NonNull + @Override + public Category getCategory() { + return Category.CONFIGURATION; + } + + @NonNull + @Override + public Permission getRequiredPermission() { + return Jenkins.SYSTEM_READ; + } + + @Override + public String getDescription() { + return Messages.ProxyConfigurationManager_Description(); + } + + public Descriptor getProxyDescriptor() { + return Jenkins.get().getDescriptor(ProxyConfiguration.class); + } + + + @POST + public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException { + Jenkins jenkins = Jenkins.get(); + jenkins.checkPermission(Jenkins.ADMINISTER); + + ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm()); + if (pc.name == null) { + jenkins.proxy = null; + ProxyConfiguration.getXmlFile().delete(); + } else { + jenkins.proxy = pc; + jenkins.proxy.save(); + } + return new HttpRedirect(".."); + } + +} diff --git a/core/src/main/resources/hudson/Messages.properties b/core/src/main/resources/hudson/Messages.properties index aca1dc5ff295..f819794b72ed 100644 --- a/core/src/main/resources/hudson/Messages.properties +++ b/core/src/main/resources/hudson/Messages.properties @@ -127,3 +127,5 @@ PluginWrapper.NoSuchPlugin=No such plugin found with the name ''{0}'' PluginWrapper.Error.Disabling=There was an error disabling the ''{0}'' plugin. Error: ''{1}'' TcpSlaveAgentListener.PingAgentProtocol.displayName=Ping protocol +ProxyConfigurationManager.DisplayName=Proxy Configuration +ProxyConfigurationManager.Description=Configure the http proxy used by Jenkins diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 347c9b463124..eae92ea26f44 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -38,21 +38,6 @@ THE SOFTWARE.
-
-

${%HTTP Proxy Configuration}

- - - - - - - - - - - - -
diff --git a/core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly b/core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly new file mode 100644 index 000000000000..b0b9d07f1b6b --- /dev/null +++ b/core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly @@ -0,0 +1,50 @@ + + + + + + + +
+
+

${%HTTP Proxy Configuration}

+ + + + + + + + + + + + +
+
+ + + diff --git a/war/src/main/resources/images/symbols/proxy.svg b/war/src/main/resources/images/symbols/proxy.svg new file mode 100644 index 000000000000..11caac0148cf --- /dev/null +++ b/war/src/main/resources/images/symbols/proxy.svg @@ -0,0 +1 @@ + \ No newline at end of file From 3137d95ab33bf08ff5cb131ac486a9b2bf2f86df Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 16 Nov 2023 19:08:23 +1000 Subject: [PATCH 2/8] move proxy configuration to Configure System Signed-off-by: Olivier Lamy --- core/src/main/java/hudson/PluginManager.java | 16 ++++++ .../hudson/ProxyConfigurationManager.java | 55 +++++-------------- .../{index.jelly => config.jelly} | 29 +++------- .../main/resources/images/symbols/proxy.svg | 1 - 4 files changed, 38 insertions(+), 63 deletions(-) rename core/src/main/resources/hudson/ProxyConfigurationManager/{index.jelly => config.jelly} (57%) delete mode 100644 war/src/main/resources/images/symbols/proxy.svg diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index f808928454a7..a7d74fcee478 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -45,6 +45,7 @@ import hudson.model.AbstractModelObject; import hudson.model.AdministrativeMonitor; import hudson.model.Api; +import hudson.model.Descriptor; import hudson.model.DownloadService; import hudson.model.Failure; import hudson.model.ItemGroupMixIn; @@ -165,6 +166,7 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.interceptor.RequirePOST; +import org.kohsuke.stapler.verb.POST; import org.springframework.security.core.Authentication; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -1795,6 +1797,16 @@ public HttpResponse doSiteConfigure(@QueryParameter String site) throws IOExcept return new HttpRedirect("advanced"); } + @POST + public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException { + Jenkins jenkins = Jenkins.get(); + jenkins.checkPermission(Jenkins.ADMINISTER); + + ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm()); + ProxyConfigurationManager.saveProxyConfiguration(pc); + return new HttpRedirect("advanced"); + } + interface PluginCopier { void copy(File target) throws Exception; @@ -2112,6 +2124,10 @@ protected String identifyPluginShortName(File t) { return FilenameUtils.getBaseName(t.getName()); // fall back to the base name of what's uploaded } + public Descriptor getProxyDescriptor() { + return Jenkins.get().getDescriptor(ProxyConfiguration.class); + } + /** * Prepares plugins for some expected XML configuration. * If the configuration (typically a job’s {@code config.xml}) diff --git a/core/src/main/java/hudson/ProxyConfigurationManager.java b/core/src/main/java/hudson/ProxyConfigurationManager.java index 834689c8085b..42f890ca8422 100644 --- a/core/src/main/java/hudson/ProxyConfigurationManager.java +++ b/core/src/main/java/hudson/ProxyConfigurationManager.java @@ -26,62 +26,38 @@ import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Descriptor; -import hudson.model.ManagementLink; -import hudson.security.Permission; import java.io.IOException; -import javax.servlet.ServletException; +import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; -import org.kohsuke.stapler.HttpRedirect; -import org.kohsuke.stapler.HttpResponse; +import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.verb.POST; @Extension -public class ProxyConfigurationManager extends ManagementLink { +public class ProxyConfigurationManager extends GlobalConfiguration { + @NonNull @Override public String getDisplayName() { return Messages.ProxyConfigurationManager_DisplayName(); } - @Override - public String getIconFileName() { - return "symbol-proxy"; - } - - @Override - public String getUrlName() { - return "proxyConfigurationManager"; - } - - @NonNull - @Override - public Category getCategory() { - return Category.CONFIGURATION; - } - - @NonNull - @Override - public Permission getRequiredPermission() { - return Jenkins.SYSTEM_READ; - } - - @Override - public String getDescription() { - return Messages.ProxyConfigurationManager_Description(); - } - public Descriptor getProxyDescriptor() { return Jenkins.get().getDescriptor(ProxyConfiguration.class); } + @Override + public boolean configure(StaplerRequest req, JSONObject json) throws FormException { + ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, json); + try { + saveProxyConfiguration(pc); + } catch (IOException e) { + throw new FormException(e.getMessage(), e, null); + } + return true; + } - @POST - public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException { + public static void saveProxyConfiguration(ProxyConfiguration pc) throws IOException { Jenkins jenkins = Jenkins.get(); - jenkins.checkPermission(Jenkins.ADMINISTER); - - ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm()); if (pc.name == null) { jenkins.proxy = null; ProxyConfiguration.getXmlFile().delete(); @@ -89,7 +65,6 @@ public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, Ser jenkins.proxy = pc; jenkins.proxy.save(); } - return new HttpRedirect(".."); } } diff --git a/core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly b/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly similarity index 57% rename from core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly rename to core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly index b0b9d07f1b6b..969724403344 100644 --- a/core/src/main/resources/hudson/ProxyConfigurationManager/index.jelly +++ b/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly @@ -25,26 +25,11 @@ THE SOFTWARE. - - - -
-
-

${%HTTP Proxy Configuration}

- - - - - - - - - - - - -
-
- - + + + + + + + diff --git a/war/src/main/resources/images/symbols/proxy.svg b/war/src/main/resources/images/symbols/proxy.svg deleted file mode 100644 index 11caac0148cf..000000000000 --- a/war/src/main/resources/images/symbols/proxy.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 2d1d71fc8ad448c91d231ce960cb56c73d528329 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 16 Nov 2023 19:10:14 +1000 Subject: [PATCH 3/8] add @Restricted(NoExternalUse.class) Signed-off-by: Olivier Lamy --- core/src/main/java/hudson/ProxyConfigurationManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/ProxyConfigurationManager.java b/core/src/main/java/hudson/ProxyConfigurationManager.java index 42f890ca8422..52f15f84c87e 100644 --- a/core/src/main/java/hudson/ProxyConfigurationManager.java +++ b/core/src/main/java/hudson/ProxyConfigurationManager.java @@ -30,9 +30,11 @@ import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; -@Extension +@Extension @Restricted(NoExternalUse.class) public class ProxyConfigurationManager extends GlobalConfiguration { @NonNull From 310bd6ac11939f525d055193b6d5d91ddc6ffcef Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 29 Nov 2023 11:25:38 +1000 Subject: [PATCH 4/8] add info with link for proxy configuration moved Signed-off-by: Olivier Lamy --- core/src/main/resources/hudson/PluginManager/advanced.jelly | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index eae92ea26f44..68e1cafd7394 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -37,6 +37,10 @@ THE SOFTWARE. +
+ ${%The Proxy configuration form has been moved to} Configure System page +
+
From 48d3fcf6911b00d4ea96d096e1dc7c81892cd634 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 30 Nov 2023 10:22:12 +1000 Subject: [PATCH 5/8] fix localisation Signed-off-by: Olivier Lamy --- core/src/main/resources/hudson/PluginManager/advanced.jelly | 2 +- .../src/main/resources/hudson/PluginManager/advanced.properties | 2 ++ .../main/resources/hudson/PluginManager/advanced_fr.properties | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 68e1cafd7394..5d7184c3552e 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -38,7 +38,7 @@ THE SOFTWARE.
- ${%The Proxy configuration form has been moved to} Configure System page + ${%proxyMovedBlurb(rootURL+"/manage/configure")}
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.properties b/core/src/main/resources/hudson/PluginManager/advanced.properties index a60f0274e9af..5fe88b5809ad 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.properties +++ b/core/src/main/resources/hudson/PluginManager/advanced.properties @@ -23,3 +23,5 @@ deploytext=\ You can select a plugin file from your local system or provide a URL to install \ a plugin from outside the configured update site(s). + +proxyMovedBlurb=The Proxy configuration form has been moved to Configure System page diff --git a/core/src/main/resources/hudson/PluginManager/advanced_fr.properties b/core/src/main/resources/hudson/PluginManager/advanced_fr.properties index 70e4bf603a44..d99993b01f90 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced_fr.properties +++ b/core/src/main/resources/hudson/PluginManager/advanced_fr.properties @@ -33,3 +33,4 @@ Server=Serveur User\ name=Nom d''utilisateur No\ Proxy\ Host=Pas de proxy pour Password=Mot de passe +proxyMovedBlurb=La configuration du Proxy a été déplacé ici Page du configuration du System \ No newline at end of file From 8315dd5cf3153c842557760bf040996818381c13 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 30 Nov 2023 10:53:36 +1000 Subject: [PATCH 6/8] use advanced to make the proxy configuration section smaller Signed-off-by: Olivier Lamy --- .../resources/hudson/ProxyConfigurationManager/config.jelly | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly b/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly index 969724403344..41e5a8da0d12 100644 --- a/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly +++ b/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly @@ -26,10 +26,12 @@ THE SOFTWARE. + + From da4c77db93e7ffe55e7b817dd930a46e3790f73a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 30 Nov 2023 11:05:56 +1000 Subject: [PATCH 7/8] format Signed-off-by: Olivier Lamy --- .../hudson/ProxyConfigurationManager/config.jelly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly b/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly index 41e5a8da0d12..98cfd0e1fbb0 100644 --- a/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly +++ b/core/src/main/resources/hudson/ProxyConfigurationManager/config.jelly @@ -27,11 +27,11 @@ THE SOFTWARE. xmlns:t="/lib/hudson" xmlns:f="/lib/form"> - - - - - + + + + + From 9954752925d6b35f4f96d61781797d537e377553 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 30 Nov 2023 14:22:52 +1000 Subject: [PATCH 8/8] fix localisation links as well Signed-off-by: Olivier Lamy --- core/src/main/resources/hudson/model/Messages.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_bg.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_de.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_es.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_fr.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_it.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_ja.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_lt.properties | 4 ++-- .../src/main/resources/hudson/model/Messages_pt_BR.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_sr.properties | 4 ++-- .../src/main/resources/hudson/model/Messages_zh_TW.properties | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index c6e48911de7c..e0721b8fd0af 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -289,10 +289,10 @@ UpdateCenter.Status.CheckingJavaNet=Checking update center connectivity UpdateCenter.Status.Success=Success UpdateCenter.Status.UnknownHostException=\ Failed to resolve host name {0}. \ - Perhaps you need to configure HTTP proxy? + Perhaps you need to configure HTTP proxy? UpdateCenter.Status.ConnectionFailed=\ Failed to connect to {0}. \ - Perhaps you need to configure HTTP proxy? + Perhaps you need to configure HTTP proxy? UpdateCenter.init=Initialing update center UpdateCenter.CoreUpdateMonitor.DisplayName=Jenkins Update Notification diff --git a/core/src/main/resources/hudson/model/Messages_bg.properties b/core/src/main/resources/hudson/model/Messages_bg.properties index 42a23b5d8af1..b6468b07f70e 100644 --- a/core/src/main/resources/hudson/model/Messages_bg.properties +++ b/core/src/main/resources/hudson/model/Messages_bg.properties @@ -400,10 +400,10 @@ UpdateCenter.Status.Success=\ Успех UpdateCenter.Status.UnknownHostException=\ Неуспешна проверка на адреса „{0}“.\ - Вероятно трябва да настроите\ + Вероятно трябва да настроите\ сървър-посредник за HTTP. UpdateCenter.Status.ConnectionFailed=\ - Вероятно трябва да настроите\ + Вероятно трябва да настроите\ сървър-посредник за HTTP. UpdateCenter.init=\ Инициализиране на центъра за обновяване diff --git a/core/src/main/resources/hudson/model/Messages_de.properties b/core/src/main/resources/hudson/model/Messages_de.properties index 1a413b4822bb..917c6238b57e 100644 --- a/core/src/main/resources/hudson/model/Messages_de.properties +++ b/core/src/main/resources/hudson/model/Messages_de.properties @@ -291,10 +291,10 @@ UpdateCenter.Status.CheckingJavaNet=Überprüfe Zugang zu jenkins-ci.org-Server UpdateCenter.Status.Success=Erfolgreich UpdateCenter.Status.UnknownHostException=\ Hostname {0} konnte nicht aufgelöst werden. \ - Eventuell sollten Sie einen HTTP-Proxy konfigurieren? + Eventuell sollten Sie einen HTTP-Proxy konfigurieren? UpdateCenter.Status.ConnectionFailed=\ Es konnte keine Verbindung zu {0} aufgebaut werden. \ - Eventuell sollten Sie einen HTTP-Proxy konfigurieren? + Eventuell sollten Sie einen HTTP-Proxy konfigurieren? UpdateCenter.init=Initialisiere das Update Center UpdateCenter.CoreUpdateMonitor.DisplayName=Jenkins-Update-Benachrichtigungen UpdateCenter.DisplayName=Update-Center diff --git a/core/src/main/resources/hudson/model/Messages_es.properties b/core/src/main/resources/hudson/model/Messages_es.properties index 881ee8c98c7e..d57de3106e8e 100644 --- a/core/src/main/resources/hudson/model/Messages_es.properties +++ b/core/src/main/resources/hudson/model/Messages_es.properties @@ -176,10 +176,10 @@ UpdateCenter.Status.CheckingJavaNet=Probando conectividad con jenkins-ci.org UpdateCenter.Status.Success=Correcto UpdateCenter.Status.UnknownHostException=\ Nombre de servidor imposible de resolver {0}. \ - Quizás tengas que configurar to proxy + Quizás tengas que configurar to proxy UpdateCenter.Status.ConnectionFailed=\ Imposible de conectar con {0}. \ - Quizás tengas que configurar to proxy + Quizás tengas que configurar to proxy UpdateCenter.init=Inicializando centro de actualizaciones UpdateCenter.PluginCategory.builder=Plugins relacionados con la forma de ejecutar trabajos UpdateCenter.PluginCategory.buildwrapper=Plugins que añaden tareas relacionadas con la ejecución diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties index a7b94dbac835..073805ad5139 100644 --- a/core/src/main/resources/hudson/model/Messages_fr.properties +++ b/core/src/main/resources/hudson/model/Messages_fr.properties @@ -274,10 +274,10 @@ UpdateCenter.Status.CheckingJavaNet=Vérification de la connexion à jenkins-ci. UpdateCenter.Status.Success=Succès UpdateCenter.Status.UnknownHostException=\ Impossible de résoudre le nom de host {0}. \ - Peut-être devez-vous configurer un proxy HTTP? + Peut-être devez-vous configurer un proxy HTTP? UpdateCenter.Status.ConnectionFailed=\ Echec lors de la connexion à {0}. \ - Peut-être devez-vous configurer le proxy HTTP. + Peut-être devez-vous configurer le proxy HTTP. UpdateCenter.init=Initialisation du centre de mise à jour UpdateCenter.CoreUpdateMonitor.DisplayName=Notification de mise à jour de Jenkins diff --git a/core/src/main/resources/hudson/model/Messages_it.properties b/core/src/main/resources/hudson/model/Messages_it.properties index 594c10afac37..23938f9ea828 100644 --- a/core/src/main/resources/hudson/model/Messages_it.properties +++ b/core/src/main/resources/hudson/model/Messages_it.properties @@ -437,11 +437,11 @@ UpdateCenter.Status.CheckingJavaNet=Controllo connettività al Centro \ aggiornamenti in corso UpdateCenter.Status.ConnectionFailed=Impossibile \ connettersi a {0}. Forse è necessario \ - configurare il proxy HTTP? + configurare il proxy HTTP? UpdateCenter.Status.Success=Operazione completata UpdateCenter.Status.UnknownHostException=Impossibile \ risolvere il nome host {0}. Forse è necessario \ - configurare il proxy HTTP? + configurare il proxy HTTP? User.IllegalFullname="{0}" è vietato come nome completo per motivi di sicurezza. User.IllegalUsername="{0}" è vietato come nome utente per motivi di sicurezza. View.ConfigurePermission.Description=Questo permesso consente agli utenti di \ diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties index 3fc987f24017..475606108217 100644 --- a/core/src/main/resources/hudson/model/Messages_ja.properties +++ b/core/src/main/resources/hudson/model/Messages_ja.properties @@ -215,10 +215,10 @@ UpdateCenter.Status.CheckingJavaNet=jenkins-ci.orgとの接続をチェックし UpdateCenter.Status.Success=成功 UpdateCenter.Status.UnknownHostException=\ ホスト名 {0}の解決に失敗しました。 \ - たぶん、HTTPプロクシーを設定する必要があります。 + たぶん、HTTPプロクシーを設定する必要があります。 UpdateCenter.Status.ConnectionFailed=\ {0} との接続に失敗しました。 \ - たぶん、HTTPプロクシーを設定する必要があります。 + たぶん、HTTPプロクシーを設定する必要があります。 UpdateCenter.init=アップデートセンターの初期化中 UpdateCenter.PluginCategory.builder=ビルドツール UpdateCenter.PluginCategory.buildwrapper=ビルドラッパー diff --git a/core/src/main/resources/hudson/model/Messages_lt.properties b/core/src/main/resources/hudson/model/Messages_lt.properties index 60ff2702330d..3248fdb97d67 100644 --- a/core/src/main/resources/hudson/model/Messages_lt.properties +++ b/core/src/main/resources/hudson/model/Messages_lt.properties @@ -234,10 +234,10 @@ UpdateCenter.Status.CheckingJavaNet=Tikrinamas prisijungimas prie atnaujinimų c UpdateCenter.Status.Success=Sėkmė UpdateCenter.Status.UnknownHostException=\ Nepavyko išspręsti stoties pavadinimo {0}. \ - Gal jums reikia sukonfigūruoti HTTP šliuzą? + Gal jums reikia sukonfigūruoti HTTP šliuzą? UpdateCenter.Status.ConnectionFailed=\ Nepavyko prisijungti prie {0}. \ - Gal jums reikia sukonfigūruoti HTTP šliuzą? + Gal jums reikia sukonfigūruoti HTTP šliuzą? UpdateCenter.init=Inicializuojamas atnaujinimų centras UpdateCenter.PluginCategory.android=Android kūrimas UpdateCenter.PluginCategory.builder=Kūrimo įrankiai diff --git a/core/src/main/resources/hudson/model/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/Messages_pt_BR.properties index c7dbe7f6adde..9643b131f2a9 100644 --- a/core/src/main/resources/hudson/model/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Messages_pt_BR.properties @@ -132,7 +132,7 @@ Slave.Remote.Director.Mandatory=Diretório remoto é obrigatório Run.InProgressDuration={0} e contando UpdateCenter.Status.UnknownHostException=\ Erro ao resolver o nome do hospedeiro {0}. \ - Talvez você precise configurar um proxy HTTP? + Talvez você precise configurar um proxy HTTP? Hudson.NotUsesUTF8ToDecodeURL=não use caracteres UTF-8 nas URLs UpdateCenter.Status.CheckingInternet=Checando conexão com a Internet View.DeletePermission.Description=\ @@ -203,7 +203,7 @@ Hudson.NotANegativeNumber=Número não negativo UpdateCenter.PluginCategory.misc=Diversos UpdateCenter.Status.ConnectionFailed=\ Erro ao conectar em {0}. \ - Talvez voê precise configurar um proxy HTTP? + Talvez voê precise configurar um proxy HTTP? UpdateCenter.PluginCategory.maven=Maven UpdateCenter.PluginCategory.upload=Carregadores de artefatos Permalink.LastUnstableBuild=Última construção instável diff --git a/core/src/main/resources/hudson/model/Messages_sr.properties b/core/src/main/resources/hudson/model/Messages_sr.properties index fe5ca1b3adba..3802bd4820e8 100644 --- a/core/src/main/resources/hudson/model/Messages_sr.properties +++ b/core/src/main/resources/hudson/model/Messages_sr.properties @@ -201,9 +201,9 @@ UpdateCenter.Status.CheckingInternet=Провера везом са интерн UpdateCenter.Status.CheckingJavaNet=Провера везом са центар за aжурирање UpdateCenter.Status.Success=Успех UpdateCenter.Status.UnknownHostException=Неуспешна провера адресе {0}. \ -Можда морате поставити HTTP proxy? +Можда морате поставити HTTP proxy? UpdateCenter.Status.ConnectionFailed=Неуспешно повезивање са {0}. \ -Можда морате поставити HTTP proxy? +Можда морате поставити HTTP proxy? UpdateCenter.init=Инициализација центра за ажурирање UpdateCenter.PluginCategory.builder=Алати за изградњу UpdateCenter.PluginCategory.buildwrapper=Скрипт омотачи за изградњу diff --git a/core/src/main/resources/hudson/model/Messages_zh_TW.properties b/core/src/main/resources/hudson/model/Messages_zh_TW.properties index 04c6a60ca31e..b0a151aced77 100644 --- a/core/src/main/resources/hudson/model/Messages_zh_TW.properties +++ b/core/src/main/resources/hudson/model/Messages_zh_TW.properties @@ -214,10 +214,10 @@ UpdateCenter.Status.CheckingJavaNet=檢查是否能連到更新中心 UpdateCenter.Status.Success=成功 UpdateCenter.Status.UnknownHostException=\ 無法解析主機名稱 {0}。\ - 說不定您應該要設定 HTTP 代理伺服器? + 說不定您應該要設定 HTTP 代理伺服器? UpdateCenter.Status.ConnectionFailed=\ 無法連線到{0}。\ - 說不定您應該要設定 HTTP 代理伺服器? + 說不定您應該要設定 HTTP 代理伺服器? UpdateCenter.init=初始化更新中心 UpdateCenter.PluginCategory.builder=建置工具 UpdateCenter.PluginCategory.buildwrapper=建置包裝程式