提交 262cd1fa 编写于 作者: A Antonio Muñiz

[JENKINS-27268] Use agent instead of slave in UI labels

上级 452b6fd7
......@@ -31,7 +31,7 @@ THE SOFTWARE.
<h2>Making sure all the needed plugins are installed</h2>
<p>
Jenkins uses an XML format for representing most of complex objects internally (such as slaves, views, jobs, and builds.)
Jenkins uses an XML format for representing most of complex objects internally (such as agents, views, jobs, and builds.)
As such, it has various APIs that send/receive those XMLs. For example, you can create a new job by POSTing its XML representation.
Starting 1.482, Jenkins annotates these XMLs with additional information indicating what plugins have been used in them.
This improves the portability of those XML files.
......
......@@ -22,7 +22,7 @@
WindowsInstallerLink.DisplayName=Install as Windows Service
WindowsInstallerLink.Description=Installs Jenkins as a Windows service to this system, so that Jenkins starts automatically when the machine boots.
WindowsSlaveInstaller.ConfirmInstallation=This will install a slave agent as a Windows service, so that a Jenkins slave starts automatically when the machine boots.
WindowsSlaveInstaller.ConfirmInstallation=This will install an agent as a Windows service, so that a Jenkins agent starts automatically when the machine boots.
WindowsSlaveInstaller.DotNetRequired=.NET Framework 2.0 or later is required for this feature
WindowsSlaveInstaller.InstallationSuccessful=Installation was successful. Would you like to start the service now?
WindowsSlaveInstaller.RootFsDoesntExist=Slave root directory \u2018{0}\u2019 doesn\u2019t exist
\ No newline at end of file
WindowsSlaveInstaller.RootFsDoesntExist=Agent root directory \u2018{0}\u2019 doesn\u2019t exist
\ No newline at end of file
......@@ -45,7 +45,7 @@ THE SOFTWARE.
${%The project was renamed recently and no build was done under the new name.}
</li>
<li>
${%The slave this project has run on for the last time was removed.}
${%The agent this project has run on for the last time was removed.}
</li>
<li>
${%li3(it.workspace)}
......
......@@ -31,7 +31,7 @@ THE SOFTWARE.
<pre>println System.getenv("PATH")</pre>
<pre>println "uname -a".execute().text</pre>
<p>
${%This execution happens in the slave agent JVM.}
${%This execution happens in the agent JVM.}
</p>
</t:scriptConsole>
</j:jelly>
......@@ -29,7 +29,7 @@ THE SOFTWARE.
<l:main-panel>
<h1>Tweak Launch Parameters</h1>
<p>
This page allows you to tweak the JVM parameters when launching JNLP slave agents.
This page allows you to tweak the JVM parameters when launching JNLP agents.
<!-- TODO: work from home for the rest -->
</p>
</l:main-panel>
......
......@@ -28,7 +28,7 @@ THE SOFTWARE.
<st:include page="sidepanel.jelly" />
<l:main-panel>
<form method="post" action="doDelete">
${%Are you sure about deleting the slave?}
${%Are you sure about deleting the agent?}
<f:submit value="${%Yes}" />
</form>
</l:main-panel>
......
......@@ -32,7 +32,7 @@ THE SOFTWARE.
<l:tasks>
<l:task contextMenu="false" href="${rootURL}/computer" icon="icon-up icon-md" title="${%Back to List}"/>
<l:task contextMenu="false" href="${rootURL}/${it.url}" icon="icon-search icon-md" title="${%Status}"/>
<l:task href="${rootURL}/${it.url}delete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" title="${%Delete Slave}"/>
<l:task href="${rootURL}/${it.url}delete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" title="${%Delete Agent}"/>
<l:task href="${rootURL}/${it.url}configure" icon="icon-setting icon-md" permission="${it.CONFIGURE}" title="${%Configure}"/>
<l:task href="${rootURL}/${it.url}builds" icon="icon-notepad icon-md" title="${%Build History}"/>
<l:task href="${rootURL}/${it.url}load-statistics" icon="icon-monitor icon-md" title="${%Load Statistics}"/>
......
......@@ -72,7 +72,7 @@ THE SOFTWARE.
<th initialSortDir="up">${%Build}</th>
<th>${%Duration}</th>
<j:if test="${isMasterSlaveEnabled}">
<th>${%Slave}</th>
<th>${%Agent}</th>
</j:if>
</tr>
</table>
......
......@@ -24,6 +24,6 @@ title={0} Byggetidstrend
Duration=Varighed
Build\ Time\ Trend=Byggetidstrend
Build=Byg
Slave=Slave
Agent=Slave
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Mere end et byg er n\u00f8dvendigt for at danne en trendrapport.
Timeline=Tidslinie
......@@ -23,7 +23,7 @@
title={0} Build-Dauer Trend
Build=Build
Duration=Dauer
Slave=Slave
Agent=Slave
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Für einen Trendbericht sind mindestens zwei Builds notwendig.
Timeline=Zeitleiste
Build\ Time\ Trend=Entwicklung der Build-Dauer
\ No newline at end of file
......@@ -22,7 +22,7 @@
title={0} Tendencia del tiempo de proceso
Build=Ejecución
Slave=Esclavo
Agent=Esclavo
Duration=Duración
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Más de 1 ejecución son necesarias para generar el gráfico
Build\ Time\ Trend=Tendencia del tiempo de ejecución
......
......@@ -25,5 +25,5 @@ title={0} Courbe de tendance de la dur\u00e9e du build
Build=Build
Build\ Time\ Trend=Tendance des temps de construction
Duration=Dur\u00e9e
Slave=Esclave
Agent=Esclave
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Plus de 1 build est n\u00e9cessaire pour le rapport de tendance.
......@@ -3,5 +3,5 @@
Build=\u00C9p\u00EDt\u00E9s
Build\ Time\ Trend=\u00C9p\u00EDt\u00E9si id\u0151 tendencia
Duration=Id\u0151
Slave=Csom\u00F3pont
Agent=Csom\u00F3pont
Timeline=Id\u0151vonal
......@@ -25,4 +25,4 @@ Timeline=\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3
Build=\u30d3\u30eb\u30c9
Build\ Time\ Trend=\u30d3\u30eb\u30c9\u6642\u9593\u306e\u63a8\u79fb
Duration=\u6240\u8981\u6642\u9593
Slave=\u30b9\u30ec\u30fc\u30d6
Agent=\u30b9\u30ec\u30fc\u30d6
......@@ -24,5 +24,5 @@ Build=\uBE4C\uB4DC
Build\ Time\ Trend=\uBE4C\uB4DC \uC18C\uC694 \uC2DC\uAC04 \uACBD\uD5A5
Duration=\uC18C\uC694\uC2DC\uAC04
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\uACBD\uD5A5 \uBCF4\uACE0\uC11C\uB294 1\uAC1C \uC774\uC0C1\uC758 \uBE4C\uB4DC\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
Slave=Slave
Agent=Slave
Timeline=\uD0C0\uC784\uB77C\uC778
......@@ -24,5 +24,5 @@ Build=B\u016Bv\u0113jums
Build\ Time\ Trend=B\u016Bv\u0113jumu laika tendence
Duration=Ilgums
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Tendences atskaitei nepiecie\u0161ams vismaz 1 b\u016Bv\u0113jums.
Slave=Slave
Agent=Slave
Timeline=Laika nogrieznis
......@@ -25,5 +25,5 @@ title={0} Duurtrend van een bouwpoging
Build=Bouwpoging
Build\ Time\ Trend=Bouw tijd trend
Duration=Duur
Slave=Slaaf
Agent=Slaaf
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=Er dienen minsten 2 bouwpogingen plaatsgevonden te hebben, vooralleer een trendrapport kan opgesteld worden.
......@@ -22,7 +22,7 @@
title={0} Tend\u00eancia de tempo de builds
Duration=Dura\u00e7\u00e3o
Slave=SlaveMore\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\u00c9 necess\u00e1rio mais do que um build para criar o relat\u00f3rio de tend\u00eancia.
Agent=SlaveMore\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\u00c9 necess\u00e1rio mais do que um build para criar o relat\u00f3rio de tend\u00eancia.
Build\ Time\ Trend=Tend\u00eancia de tempo de Build
Timeline=Linha do tempo
Build=Build
......@@ -25,5 +25,5 @@ title={0} \u0413\u0440\u0430\u0444\u0438\u043a \u0432\u0440\u0435\u043c\u0435\u0
Build=\u0421\u0431\u043e\u0440\u043a\u0430
Build\ Time\ Trend=\u0413\u0440\u0430\u0444\u0438\u043A \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438
Duration=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
Slave=\u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439
Agent=\u041f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u0439
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\u0414\u043b\u044f \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0433\u0440\u0430\u0444\u0438\u043a\u0430 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0431\u043e\u043b\u0435\u0435 \u0447\u0435\u043c \u043e\u0434\u043d\u043e\u0439 \u0441\u0431\u043e\u0440\u043a\u0435.
......@@ -3,5 +3,5 @@
Build=Zostavenie
Build\ Time\ Trend=Trend \u010Dasu zostavenia
Duration=Trvanie
Slave=Stroj
Agent=Stroj
Timeline=\u010Casov\u00E1 os
......@@ -23,4 +23,4 @@
Build=Bygge
Build\ Time\ Trend=Byggtidstrend
Duration=Tid
Slave=Nod
Agent=Nod
......@@ -25,5 +25,5 @@ title={0} yap\u0131land\u0131rma zaman\u0131 e\u011filimi
Build=Yap\u0131land\u0131rma
Build\ Time\ Trend=\u0130n\u015Faa Zaman E\u011Filimi
Duration=S\u00fcre
Slave=Slave
Agent=Slave
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=E\u011filim raporu i\u00e7in birden fazla yap\u0131land\u0131rman\u0131n olmas\u0131 gerekir.
......@@ -3,5 +3,5 @@
Build=\u041F\u043E\u0431\u0443\u0434\u043E\u0432\u0430
Build\ Time\ Trend=\u0422\u0440\u0435\u043D\u0434 \u0447\u0430\u0441\u0443 \u0431\u0443\u0434\u0443\u0432\u0430\u043D\u043D\u044F
Duration=\u0422\u0440\u0438\u0432\u0430\u043B\u0456\u0441\u0442\u044C
Slave=\u0412\u0438\u043A\u043E\u043D\u0430\u0432\u0435\u0446\u044C
Agent=\u0412\u0438\u043A\u043E\u043D\u0430\u0432\u0435\u0446\u044C
Timeline=\u0427\u0430\u0441
......@@ -28,7 +28,7 @@ Timeline=\u6642\u9593\u8ef8
Build\ Time\ Trend=\u5efa\u7f6e\u6642\u9593\u8da8\u52e2
Build=\u5efa\u7f6e
Duration=\u4f7f\u7528\u6642\u9593
Slave=Slave
Agent=Slave
More\ than\ 1\ builds\ are\ needed\ for\ the\ trend\ report.=\
\u81f3\u5c11\u8981\u6709\u5169\u6b21\u4ee5\u4e0a\u7684\u5efa\u7f6e\u8a18\u9304\u624d\u80fd\u7522\u51fa\u8da8\u52e2\u5831\u544a\u3002
......@@ -31,7 +31,7 @@ blurb=\
For a label: this is the sum of all executors across all online computers in this label. <br />\
For the entire Jenkins: this is the sum of all executors across all online computers in this Jenkins \
installation. <br /> \
Other than configuration changes, this value can also change when slaves go offline. \
Other than configuration changes, this value can also change when agents go offline. \
</dd> \
<dt>Number of busy executors</dt> \
<dd>\
......
......@@ -31,7 +31,7 @@ AbstractBuild.KeptBecause=This build is kept because of {0}.
AbstractItem.NoSuchJobExists=No such job \u2018{0}\u2019 exists. Perhaps you meant \u2018{1}\u2019?
AbstractItem.NoSuchJobExistsWithoutSuggestion=No such job \u2018{0}\u2019 exists.
AbstractItem.Pronoun=Item
AbstractProject.AssignedLabelString_NoMatch_DidYouMean=There\u2019s no slave/cloud that matches this assignment. Did you mean \u2018{1}\u2019 instead of \u2018{0}\u2019?
AbstractProject.AssignedLabelString_NoMatch_DidYouMean=There\u2019s no agent/cloud that matches this assignment. Did you mean \u2018{1}\u2019 instead of \u2018{0}\u2019?
AbstractProject.NewBuildForWorkspace=Scheduling a new build to get a workspace.
AbstractProject.AwaitingBuildForWorkspace=Awaiting build to get a workspace.
AbstractProject.AwaitingWorkspaceToComeOnline=We need to schedule a new build to get a workspace, but deferring {0}ms in the hope that one will become available soon
......@@ -72,7 +72,7 @@ AbstractProject.CancelPermission.Description=\
AbstractProject.AssignedLabelString.InvalidBooleanExpression=\
Invalid boolean expression: {0}
AbstractProject.AssignedLabelString.NoMatch=\
There's no slave/cloud that matches this assignment
There's no agent/cloud that matches this assignment
AbstractProject.CustomWorkspaceEmpty=Custom workspace is empty.
AbstractProject.LabelLink=<a href="{0}{1}">Label</a> is serviced by {2,choice,0#no nodes|1#1 node|1<{2} nodes}{3,choice,0#|1# and 1 cloud|1< and {3} clouds}
......@@ -99,21 +99,21 @@ CLI.offline-node.shortDescription=Stop using a node for performing builds tempor
CLI.wait-node-online.shortDescription=Wait for a node to become online.
CLI.wait-node-offline.shortDescription=Wait for a node to become offline.
Computer.Caption=Slave {0}
Computer.NoSuchSlaveExists=No such slave "{0}" exists. Did you mean "{1}"?
Computer.Permissions.Title=Slave
Computer.ExtendedReadPermission.Description=This permission allows users to read slave configuration.
Computer.ConfigurePermission.Description=This permission allows users to configure slaves.
Computer.DeletePermission.Description=This permission allows users to delete existing slaves.
Computer.CreatePermission.Description=This permission allows users to create slaves.
Computer.ConnectPermission.Description=This permission allows users to connect slaves or mark slaves as online.
Computer.DisconnectPermission.Description=This permission allows users to disconnect slaves or mark slaves as temporarily offline.
Computer.BuildPermission.Description=This permission allows users to run jobs as them on slaves.
Computer.BadChannel=Slave node offline or not a remote channel (such as master node).
ComputerSet.NoSuchSlave=No such slave: {0}
ComputerSet.SlaveAlreadyExists=Slave called \u2018{0}\u2019 already exists
ComputerSet.SpecifySlaveToCopy=Specify which slave to copy
Computer.Caption=Agent {0}
Computer.NoSuchSlaveExists=No such agent "{0}" exists. Did you mean "{1}"?
Computer.Permissions.Title=Agent
Computer.ExtendedReadPermission.Description=This permission allows users to read agent configuration.
Computer.ConfigurePermission.Description=This permission allows users to configure agents.
Computer.DeletePermission.Description=This permission allows users to delete existing agents.
Computer.CreatePermission.Description=This permission allows users to create agents.
Computer.ConnectPermission.Description=This permission allows users to connect agents or mark agents as online.
Computer.DisconnectPermission.Description=This permission allows users to disconnect agents or mark agents as temporarily offline.
Computer.BuildPermission.Description=This permission allows users to run jobs as them on agents.
Computer.BadChannel=Agent node offline or not a remote channel (such as master node).
ComputerSet.NoSuchSlave=No such agent: {0}
ComputerSet.SlaveAlreadyExists=Agent called \u2018{0}\u2019 already exists
ComputerSet.SpecifySlaveToCopy=Specify which agent to copy
ComputerSet.DisplayName=Nodes
Descriptor.From=(from <a href="{1}">{0}</a>)
......@@ -232,19 +232,19 @@ Run.Summary.BrokenSinceThisBuild=broken since this build
Run.Summary.BrokenSince=broken since build {0}
Run.Summary.Unknown=?
Slave.InvalidConfig.Executors=Invalid slave configuration for {0}. Invalid # of executors.
Slave.InvalidConfig.NoName=Invalid slave configuration. Name is empty
Slave.InvalidConfig.NoRemoteDir=Invalid slave configuration for {0}. No remote directory given
Slave.Launching={0} Launching slave agent
Slave.InvalidConfig.Executors=Invalid agent configuration for {0}. Invalid # of executors.
Slave.InvalidConfig.NoName=Invalid agent configuration. Name is empty
Slave.InvalidConfig.NoRemoteDir=Invalid agent configuration for {0}. No remote directory given
Slave.Launching={0} Launching agent
Slave.Network.Mounted.File.System.Warning=Are you sure you want to use network mounted file system for FS root? Note that this directory does not need to be visible to the master.
Slave.Remote.Director.Mandatory=Remote directory is mandatory
Slave.Terminated={0} slave agent was terminated
Slave.Terminated={0} agent was terminated
Slave.Remote.Relative.Path.Warning=Are you sure you want to use a relative path for the FS root? Note that relative \
paths require that you can assure that the selected launcher provides a consistent current working directory. Using \
an absolute path is highly recommended.
Slave.UnableToLaunch=Unable to launch the slave agent for {0}{1}
Slave.UnixSlave=This is a Unix slave
Slave.WindowsSlave=This is a Windows slave
Slave.UnableToLaunch=Unable to launch the agent for {0}{1}
Slave.UnixSlave=This is a Unix agent
Slave.WindowsSlave=This is a Windows agent
TopLevelItemDescriptor.NotApplicableIn={0} items are not applicable within {1}
......@@ -300,7 +300,7 @@ UpdateCenter.PluginCategory.scala=Scala Development
UpdateCenter.PluginCategory.scm=Source Code Management
UpdateCenter.PluginCategory.scm-related=Source Code Management related
UpdateCenter.PluginCategory.security=Security
UpdateCenter.PluginCategory.slaves=Slave Launchers and Controllers
UpdateCenter.PluginCategory.slaves=Agent Launchers and Controllers
UpdateCenter.PluginCategory.test=Testing
UpdateCenter.PluginCategory.trigger=Build Triggers
UpdateCenter.PluginCategory.ui=User Interface
......
......@@ -26,7 +26,7 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:ajax>
<div>
${%Controls how Jenkins starts this slave.}
${%Controls how Jenkins starts this agent.}
<dl>
<j:forEach var="d" items="${h.getComputerLauncherDescriptors()}">
......
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Controls\ how\ Jenkins\ starts\ this\ slave.=Styrer hvordan Jenkins starter denne slave.
Controls\ how\ Jenkins\ starts\ this\ agent.=Styrer hvordan Jenkins starter denne slave.
Controls\ how\ Jenkins\ starts\ this\ slave.=Steuert, wie Jenkins den Slave-Knoten startet.
Controls\ how\ Jenkins\ starts\ this\ agent.=Steuert, wie Jenkins den Slave-Knoten startet.
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Controls\ how\ Jenkins\ starts\ this\ slave.=Controla cómo Jenkins inicia este esclavo.
Controls\ how\ Jenkins\ starts\ this\ agent.=Controla cómo Jenkins inicia este esclavo.
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Controls\ how\ Jenkins\ starts\ this\ slave.=Contrôle la façon dont Jenkins démarre l''esclave.
Controls\ how\ Jenkins\ starts\ this\ agent.=Contrôle la façon dont Jenkins démarre l''esclave.
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Controls\ how\ Jenkins\ starts\ this\ slave.=\u3053\u306E\u30B9\u30EC\u30FC\u30D6\u306E\u8D77\u52D5\u65B9\u6CD5\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
Controls\ how\ Jenkins\ starts\ this\ agent.=\u3053\u306E\u30B9\u30EC\u30FC\u30D6\u306E\u8D77\u52D5\u65B9\u6CD5\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Controls\ how\ Jenkins\ starts\ this\ slave.=Controla como o Jenkins inicia esse slave
Controls\ how\ Jenkins\ starts\ this\ agent.=Controla como o Jenkins inicia esse slave
Controls\ how\ Jenkins\ starts\ this\ slave.= Jenkins'?n slave'i nas?l ba?lataca??n? kontrol eder.
Controls\ how\ Jenkins\ starts\ this\ agent.= Jenkins'?n slave'i nas?l ba?lataca??n? kontrol eder.
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Controls\ how\ Jenkins\ starts\ this\ slave.=\u63a7\u5236 Jenkins \u4f7f\u7528\u4ec0\u9ebc\u65b9\u5f0f\u555f\u52d5 Slave\u3002
Controls\ how\ Jenkins\ starts\ this\ agent.=\u63a7\u5236 Jenkins \u4f7f\u7528\u4ec0\u9ebc\u65b9\u5f0f\u555f\u52d5 Slave\u3002
blurb=Jenkins took some slaves offline because <a href="{0}/computer/">their key health metrics</a> went below a threshold. \
blurb=Jenkins took some agents offline because <a href="{0}/computer/">their key health metrics</a> went below a threshold. \
If you don\u2019t want Jenkins to do this, \
<a href="{0}/computer/configure">change the setting</a>.
......@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
blurb=Starts a slave by having Jenkins execute a command from the master. \
Use this when the master is capable of remotely executing a process on a slave, such as through ssh/rsh.
blurb=Starts an agent by having Jenkins execute a command from the master. \
Use this when the master is capable of remotely executing a process on an agent, such as through ssh/rsh.
......@@ -34,7 +34,7 @@ THE SOFTWARE.
<l:hasPermission permission="${it.CONNECT}">
<form method="post" action="launchSlaveAgent">
<f:submit value="${%Relaunch slave agent}" />
<f:submit value="${%Relaunch agent}" />
</form>
</l:hasPermission>
</j:when>
......@@ -42,7 +42,7 @@ THE SOFTWARE.
<j:otherwise>
<l:hasPermission permission="${it.CONNECT}">
<form method="post" action="launchSlaveAgent">
<f:submit value="${%Launch slave agent}" />
<f:submit value="${%Launch agent}" />
</form>
</l:hasPermission>
</j:otherwise>
......
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Launch\ slave\ agent=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0430\u0433\u0435\u043D\u0442\u0430 \u043D\u0430 \u043C\u0430\u0448\u0438\u043D\u0430\u0442\u0430
Launch\ agent=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0430\u0433\u0435\u043D\u0442\u0430 \u043D\u0430 \u043C\u0430\u0448\u0438\u043D\u0430\u0442\u0430
......@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Launch\ slave\ agent=Start slave agenter
Launch\ agent=Start slave agenter
launchingDescription=Denne node er ved at starte op
See\ log\ for\ more\ details=Se loggen for flere detaljer
Relaunch\ slave\ agent=Genstart slave agent
Relaunch\ agent=Genstart slave agent
......@@ -21,6 +21,6 @@
# THE SOFTWARE.
See\ log\ for\ more\ details=Mehr dazu im Systemprotokoll
Launch\ slave\ agent=Slave-Agenten starten
Launch\ agent=Slave-Agenten starten
launchingDescription=Dieser Knoten ist offline, weil Jenkins den dortigen Slave-Agenten nicht starten konnte.
Relaunch\ slave\ agent=Slave-Agenten neu starten
Relaunch\ agent=Slave-Agenten neu starten
......@@ -22,5 +22,5 @@
launchingDescription=Este nodo va a ser ejecutado.
See\ log\ for\ more\ details=Echa un vistazo al log para ver mas detalles
Launch\ slave\ agent=Lanzar agente esclavo
Relaunch\ slave\ agent=Relanzar agente esclavo
Launch\ agent=Lanzar agente esclavo
Relaunch\ agent=Relanzar agente esclavo
......@@ -21,4 +21,4 @@
# THE SOFTWARE.
See\ log\ for\ more\ details=Voir les logs pour plus de détails
Launch\ slave\ agent=Lancer l''agent esclave
Launch\ agent=Lancer l''agent esclave
......@@ -21,6 +21,6 @@
# THE SOFTWARE.
See\ log\ for\ more\ details=\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167
Launch\ slave\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u8D77\u52D5
Relaunch\ slave\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u518D\u8D77\u52D5
Launch\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u8D77\u52D5
Relaunch\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u518D\u8D77\u52D5
launchingDescription=\u3053\u306E\u30CE\u30FC\u30C9\u306F\u8D77\u52D5\u6E08\u307F\u3067\u3059\u3002
......@@ -20,8 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Relaunch\ slave\ agent=Relan\u00e7ar o agente slave
Relaunch\ agent=Relan\u00e7ar o agente slave
# This node is being launched.
launchingDescription=Este n\u00f3 est\u00e1 sendo lan\u00e7ado
Launch\ slave\ agent=Lan\u00e7ar agente slave
Launch\ agent=Lan\u00e7ar agente slave
See\ log\ for\ more\ details=Veja o log para mais detalhes
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Launch\ slave\ agent=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0443\u0437\u0435\u043B
Launch\ agent=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0443\u0437\u0435\u043B
......@@ -20,6 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Launch\ slave\ agent=Starta agent
Launch\ agent=Starta agent
See\ log\ for\ more\ details=Se loggen f\u00F6r mer information
description=Denna nod \u00E4r fr\u00E5nkopplad eftersom Jenkins kunde inte starta agenten p\u00E5 noden.
......@@ -22,5 +22,5 @@
launchingDescription=\u672C\u7BC0\u9EDE\u6B63\u5728\u555F\u52D5\u4E2D\u3002
See\ log\ for\ more\ details=\u67E5\u770B\u65E5\u8A8C\u53D6\u5F97\u8A73\u7D30\u8CC7\u6599
Relaunch\ slave\ agent=\u91CD\u65B0\u555F\u52D5 Slave \u4EE3\u7406\u7A0B\u5F0F
Launch\ slave\ agent=\u555F\u52D5 Slave \u4EE3\u7406\u7A0B\u5F0F
Relaunch\ agent=\u91CD\u65B0\u555F\u52D5 Slave \u4EE3\u7406\u7A0B\u5F0F
Launch\ agent=\u555F\u52D5 Slave \u4EE3\u7406\u7A0B\u5F0F
......@@ -21,7 +21,7 @@
# THE SOFTWARE.
detail=\
Adds a plain, dumb slave to Jenkins. This is called "dumb" because Jenkins doesn\u2019t provide \
higher level of integration with these slaves, such as dynamic provisioning. \
Select this type if no other slave types apply &mdash; for example such as when you are adding \
Adds a plain, permanent agent to Jenkins. This is called "permanent" because Jenkins doesn\u2019t provide \
higher level of integration with these agents, such as dynamic provisioning. \
Select this type if no other agent types apply &mdash; for example such as when you are adding \
a physical computer, virtual machines managed outside Jenkins, etc.
......@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
blurb=Starts a slave by launching an agent program through <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
The launch in this case is initiated by the slave, \
thus slaves need not be IP reachable from the master (e.g. behind the firewall.) \
blurb=Starts an agent by launching a program through <a href="http://en.wikipedia.org/wiki/Java_Web_Start">JNLP</a>. \
The launch in this case is initiated by the agent itself, \
thus agents need not be IP reachable from the master (e.g. behind the firewall.) \
It is still possible to start a launch without GUI, for example as a Windows service.
\ No newline at end of file
......@@ -34,7 +34,7 @@ THE SOFTWARE.
<j:when test="${it.offline and !it.temporarilyOffline}">
<j:if test="${h.hasPermission(it, it.CONNECT)}">
<p>
${%Connect slave to Jenkins one of these ways:}
${%Connect agent to Jenkins one of these ways:}
</p>
<ul>
<li>
......@@ -42,20 +42,20 @@ THE SOFTWARE.
<a href="slave-agent.jnlp" id="jnlp-link">
<img src="${imagesURL}/webstart.gif" alt="${%launch agent}" />
</a>
${%Launch agent from browser on slave}
${%Launch agent from browser}
</p>
</li>
<j:choose>
<j:when test="${it.ACL.hasPermission(app.ANONYMOUS, it.CONNECT)}">
<li>
<p>
${%Run from slave command line:}
${%Run from agent command line:}
</p>
<pre>javaws ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
</li>
<li>
<p>
${%Or if the slave is headless:}
${%Or if the agent is headless:}
</p>
<pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
</li>
......@@ -63,7 +63,7 @@ THE SOFTWARE.
<j:otherwise>
<li>
<p>
${%Run from slave command line:}
${%Run from agent command line:}
</p>
<!-- TODO conceal secret w/ JS if possible -->
<pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp -secret ${it.jnlpMac}</pre>
......
......@@ -20,10 +20,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Forbind Jenkins til slaver p\u00e5 en af f\u00f8lgende m\u00e5der:
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=Forbind Jenkins til slaver p\u00e5 en af f\u00f8lgende m\u00e5der:
launch\ agent=start agent
Connected\ via\ JNLP\ agent.=Forbundet via JNLP agent.
Or\ if\ the\ slave\ is\ headless\:=Eller hvis slaven er hovedl\u00f8s:
Run\ from\ slave\ command\ line\:=K\u00f8r fra slavens kommandolinje:
Or\ if\ the\ agent\ is\ headless\:=Eller hvis slaven er hovedl\u00f8s:
Run\ from\ agent\ command\ line\:=K\u00f8r fra slavens kommandolinje:
slaveAgentPort.disabled=TCP port for JNLP slave agent er sl\u00e5et fra.
Launch\ agent\ from\ browser\ on\ slave=Start agent fra browser p\u00e5 slaven
Launch\ agent\ from\ browser=Start agent fra browser p\u00e5 slaven
......@@ -22,9 +22,9 @@
slaveAgentPort.disabled=TCP-Port für JNLP-Slaves ist deaktiviert.
configure.link.text=Zur globalen Sicherheitskonfiguration wechseln und ändern
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Der Slave kann eine Verbindung zum Jenkins-Master mit einer der folgenden Möglichkeiten aufbauen:
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=Der Slave kann eine Verbindung zum Jenkins-Master mit einer der folgenden Möglichkeiten aufbauen:
launch\ agent=Agent starten
Launch\ agent\ from\ browser\ on\ slave=Agent aus einem Webbrowser auf den Slave starten
Run\ from\ slave\ command\ line\:=Agent aus der Kommandozeile heraus starten:
Or\ if\ the\ slave\ is\ headless\:=Oder falls der Slave keine GUI anbietet ("headless"-Modus):
Launch\ agent\ from\ browser=Agent aus einem Webbrowser auf den Slave starten
Run\ from\ agent\ command\ line\:=Agent aus der Kommandozeile heraus starten:
Or\ if\ the\ agent\ is\ headless\:=Oder falls der Slave keine GUI anbietet ("headless"-Modus):
Connected\ via\ JNLP\ agent.=Verbunden über JNLP-Agent.
......@@ -22,9 +22,9 @@
slaveAgentPort.disabled=El puerto TCP para los agentes esclavos via JNLP está deshabilitado.
launch\ agent=Lanzar agente
Or\ if\ the\ slave\ is\ headless\:=O si el esclavo no tiene pantalla
Run\ from\ slave\ command\ line\:=Ejecutar desde la línea de comandos del esclavo
Launch\ agent\ from\ browser\ on\ slave=Lanzar el agente desde el navegador en el esclavo
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Conectar el esclavo a Jenkins usando uno de estos métodos
Or\ if\ the\ agent\ is\ headless\:=O si el esclavo no tiene pantalla
Run\ from\ agent\ command\ line\:=Ejecutar desde la línea de comandos del esclavo
Launch\ agent\ from\ browser=Lanzar el agente desde el navegador en el esclavo
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=Conectar el esclavo a Jenkins usando uno de estos métodos
Connected\ via\ JNLP\ agent.=Conectado a través del agente JNLP
......@@ -21,8 +21,8 @@
# THE SOFTWARE.
slaveAgentPort.disabled=Le port TCP pour l''esclave JNLP est d\u00E9sactiv\u00E9.
Launch\ agent\ from\ browser\ on\ slave=Lancer l''agent \u00E0 partir du navigateur sur l''esclave
Run\ from\ slave\ command\ line:=Ex\u00E9cuter l''esclave \u00E0 partir de l\u2019interpr\u00E8te de commandes
Launch\ agent\ from\ browser=Lancer l''agent \u00E0 partir du navigateur sur l''esclave
Run\ from\ agent\ command\ line:=Ex\u00E9cuter l''esclave \u00E0 partir de l\u2019interpr\u00E8te de commandes
launch\ agent=lancer l''agent
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways:=Connecter l''esclave \u00E0 Jenkins avec l''une des mani\u00E8res suivantes:
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways:=Connecter l''esclave \u00E0 Jenkins avec l''une des mani\u00E8res suivantes:
Connected\ via\ JNLP\ agent.=Connect\u00E9 via l\u2019agent JNLP.
......@@ -21,10 +21,10 @@
# THE SOFTWARE.
slaveAgentPort.disabled=JNLP\u30b9\u30ec\u30fc\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u7528\u306eTCP\u30dd\u30fc\u30c8\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=\u6b21\u306e\u3044\u305a\u308c\u304b\u306e\u65b9\u6cd5\u3067\u30b9\u30ec\u30fc\u30d6\u3092Jenkins\u306b\u63a5\u7d9a\u3057\u307e\u3059\u3002
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=\u6b21\u306e\u3044\u305a\u308c\u304b\u306e\u65b9\u6cd5\u3067\u30b9\u30ec\u30fc\u30d6\u3092Jenkins\u306b\u63a5\u7d9a\u3057\u307e\u3059\u3002
launch\ agent=\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306e\u8d77\u52d5
Launch\ agent\ from\ browser\ on\ slave=\u30b9\u30ec\u30fc\u30d6\u4e0a\u306e\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3092\u8d77\u52d5
Run\ from\ slave\ command\ line\:=\u30b9\u30ec\u30fc\u30d6\u3067\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304b\u3089\u8d77\u52d5:
Or\ if\ the\ slave\ is\ headless\:=\u3082\u3057\u304f\u306f\u3001\u30b9\u30ec\u30fc\u30d6\u3067X\u304c\u8d77\u52d5\u3057\u3066\u3044\u306a\u3044\u5834\u5408:
Launch\ agent\ from\ browser=\u30b9\u30ec\u30fc\u30d6\u4e0a\u306e\u30d6\u30e9\u30a6\u30b6\u304b\u3089\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3092\u8d77\u52d5
Run\ from\ agent\ command\ line\:=\u30b9\u30ec\u30fc\u30d6\u3067\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304b\u3089\u8d77\u52d5:
Or\ if\ the\ agent\ is\ headless\:=\u3082\u3057\u304f\u306f\u3001\u30b9\u30ec\u30fc\u30d6\u3067X\u304c\u8d77\u52d5\u3057\u3066\u3044\u306a\u3044\u5834\u5408:
Connected\ via\ JNLP\ agent.=JNLP\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u7d4c\u7531\u3067\u63a5\u7d9a
configure.link.text=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u8a2d\u5b9a\u30da\u30fc\u30b8\u3067\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
\ No newline at end of file
......@@ -20,13 +20,13 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Or\ if\ the\ slave\ is\ headless\:=Ou, se o slave \u00e9 sem master
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=Conecta slave ao Jenkins por uma dessas maneiras:
Run\ from\ slave\ command\ line\:=Executar comando de linha pelo slave
Or\ if\ the\ agent\ is\ headless\:=Ou, se o slave \u00e9 sem master
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=Conecta slave ao Jenkins por uma dessas maneiras:
Run\ from\ agent\ command\ line\:=Executar comando de linha pelo slave
launch\ agent=Lan\u00e7ar agente
# TCP port for JNLP slave agents is disabled.
slaveAgentPort.disabled=Porta TCP para JNLP est\u00e1 desativada
Launch\ agent\ from\ browser\ on\ slave=Lan\u00e7ar agente de um navegador do slave
Launch\ agent\ from\ browser=Lan\u00e7ar agente de um navegador do slave
Connected\ via\ JNLP\ agent.=Conectado via JNLP agente.
# Go to security configuration screen and change it
configure.link.text=V\u00e1 para a p\u00e1gina de configura\u00e7\u00e3o de seguran\u00e7a para alterar
......@@ -20,8 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways:=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0438\u0442\u044C slave \u043A Jenkins \u043E\u0434\u043D\u0438\u043C \u0438\u0437 \u0441\u043F\u043E\u0441\u043E\u0431\u043E\u0432:
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways:=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0438\u0442\u044C slave \u043A Jenkins \u043E\u0434\u043D\u0438\u043C \u0438\u0437 \u0441\u043F\u043E\u0441\u043E\u0431\u043E\u0432:
Connected\ via\ JNLP\ agent.=\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D \u0447\u0435\u0440\u0435\u0437 JNLP \u0430\u0433\u0435\u043D\u0442\u0430.
Launch\ agent\ from\ browser\ on\ slave=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0430\u0433\u0435\u043D\u0442\u0430 \u0438\u0437 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430 \u043D\u0430 slave
Run\ from\ slave\ command\ line:=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432 \u043A\u043E\u043C\u043C\u0430\u043D\u0434\u043D\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u0435 \u043F\u043E\u0434\u0447\u0438\u043D\u0435\u043D\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430
Launch\ agent\ from\ browser=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0430\u0433\u0435\u043D\u0442\u0430 \u0438\u0437 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430 \u043D\u0430 slave
Run\ from\ agent\ command\ line:=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432 \u043A\u043E\u043C\u043C\u0430\u043D\u0434\u043D\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u0435 \u043F\u043E\u0434\u0447\u0438\u043D\u0435\u043D\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430
launch\ agent=\u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0430\u0433\u0435\u043D\u0442\u0430
......@@ -21,9 +21,9 @@
# THE SOFTWARE.
slaveAgentPort.disabled=JNLP Slave \u4ee3\u7406\u7a0b\u5f0f\u7684 TCP \u9023\u63a5\u57e0\u5df2\u95dc\u9589\u3002
Connect\ slave\ to\ Jenkins\ one\ of\ these\ ways\:=\u53ef\u4ee5\u7528\u4e0b\u9762\u9019\u4e9b\u65b9\u6cd5\u5c07 Slave \u9023\u5230 Jenkins:
Connect\ agent\ to\ Jenkins\ one\ of\ these\ ways\:=\u53ef\u4ee5\u7528\u4e0b\u9762\u9019\u4e9b\u65b9\u6cd5\u5c07 Slave \u9023\u5230 Jenkins:
launch\ agent=\u555f\u52d5\u4ee3\u7406\u7a0b\u5f0f
Launch\ agent\ from\ browser\ on\ slave=\u5728 Slave \u7684\u700f\u89bd\u5668\u4e0a\u555f\u52d5\u4ee3\u7406\u7a0b\u5f0f
Run\ from\ slave\ command\ line\:=\u7531 Slave \u547d\u4ee4\u5217\u57f7\u884c:
Or\ if\ the\ slave\ is\ headless\:=\u5982\u679c Slave \u6c92\u6709\u5468\u908a:
Launch\ agent\ from\ browser=\u5728 Slave \u7684\u700f\u89bd\u5668\u4e0a\u555f\u52d5\u4ee3\u7406\u7a0b\u5f0f
Run\ from\ agent\ command\ line\:=\u7531 Slave \u547d\u4ee4\u5217\u57f7\u884c:
Or\ if\ the\ agent\ is\ headless\:=\u5982\u679c Slave \u6c92\u6709\u5468\u908a:
Connected\ via\ JNLP\ agent.=\u5C07\u7531 JNLP \u4EE3\u7406\u7A0B\u5F0F\u5EFA\u7ACB\u9023\u7DDA\u3002
......@@ -20,21 +20,21 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
RetentionStrategy.Always.displayName=Keep this slave on-line as much as possible
RetentionStrategy.Demand.displayName=Take this slave on-line when in demand and off-line when idle
RetentionStrategy.Always.displayName=Keep this agent on-line as much as possible
RetentionStrategy.Demand.displayName=Take this agent on-line when in demand and off-line when idle
RetentionStrategy.Demand.OfflineIdle=Offline because computer was idle; it will be relaunched when needed.
CommandLauncher.displayName=Launch slave via execution of command on the Master
JNLPLauncher.displayName=Launch slave agents via Java Web Start
ComputerLauncher.unexpectedError=Unexpected error in launching a slave. This is probably a bug in Jenkins
ComputerLauncher.abortedLaunch=Launching slave process aborted.
CommandLauncher.displayName=Launch agent via execution of command on the Master
JNLPLauncher.displayName=Launch agents via Java Web Start
ComputerLauncher.unexpectedError=Unexpected error in launching an agent. This is probably a bug in Jenkins
ComputerLauncher.abortedLaunch=Launching agent process aborted.
CommandLauncher.NoLaunchCommand=No launch command specified
ConnectionActivityMonitor.OfflineCause=Repeated ping attempts failed
DumbSlave.displayName=Dumb Slave
DumbSlave.displayName=Permanent Agent
NodeProvisioner.EmptyString=
OfflineCause.LaunchFailed=This node is offline because Jenkins failed to launch the slave agent on it.
OfflineCause.LaunchFailed=This agent is offline because Jenkins failed to launch the agent process on it.
OfflineCause.connection_was_broken_=Connection was broken: {0}
SimpleScheduledRetentionStrategy.FinishedUpTime=Computer has finished its scheduled uptime
SimpleScheduledRetentionStrategy.displayName=Take this slave on-line according to a schedule
SimpleScheduledRetentionStrategy.displayName=Take this agent on-line according to a schedule
EnvironmentVariablesNodeProperty.displayName=Environment variables
SlaveComputer.DisconnectedBy=Disconnected by {0}{1}
NodeDescripter.CheckName.Mandatory=Name is mandatory
......
......@@ -3,7 +3,7 @@
<l:layout title="${it.displayName}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
The slave has been already launched.
The agent has been already launched.
</l:main-panel>
</l:layout>
</j:jelly>
......@@ -37,7 +37,7 @@ THE SOFTWARE.
codebase="${rootURL}computer/${h.encode(it.node.nodeName)}/">
<information>
<title>Slave Agent for ${it.displayName}</title>
<title>Agent for ${it.displayName}</title>
<vendor>Jenkins project</vendor>
<homepage href="https://jenkins-ci.org/"/>
</information>
......
......@@ -53,7 +53,7 @@ THE SOFTWARE.
</j:forEach>
</j:when>
<j:otherwise>
${%System Information is unavailable when slave is offline.}
${%System Information is unavailable when agent is offline.}
</j:otherwise>
</j:choose>
</l:hasPermission>
......
......@@ -21,5 +21,5 @@
# THE SOFTWARE.
System\ Information=\u30b7\u30b9\u30c6\u30e0\u60c5\u5831
System\ Information\ is\ unavailable\ when\ slave\ is\ offline.=\
System\ Information\ is\ unavailable\ when\ agent\ is\ offline.=\
\u30b9\u30ec\u30fc\u30d6\u304c\u30aa\u30d5\u30e9\u30a4\u30f3\u306e\u5834\u5408\u306b\u306f\u3001\u30b7\u30b9\u30c6\u30e0\u60c5\u5831\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
\ No newline at end of file
......@@ -21,4 +21,4 @@
# THE SOFTWARE.
System\ Information=Informa\u00e7t\u00e3o de sistema
System\ Information\ is\ unavailable\ when\ slave\ is\ offline.=As informa\u00e7\u00f5es do sistema n\u00e3o est\u00e3o dispon\u00edveis quando o sistema est\u00e1 offline.
System\ Information\ is\ unavailable\ when\ agent\ is\ offline.=As informa\u00e7\u00f5es do sistema n\u00e3o est\u00e3o dispon\u00edveis quando o sistema est\u00e1 offline.
......@@ -36,4 +36,4 @@ InstallSourceProperty.DescriptorImpl.displayName=Install automatically
JDKInstaller.DescriptorImpl.displayName=Install from java.sun.com
JDKInstaller.DescriptorImpl.doCheckId=Define JDK ID
JDKInstaller.DescriptorImpl.doCheckAcceptLicense=You must agree to the license to download the JDK.
ToolDescriptor.NotADirectory={0} is not a directory on the Jenkins master (but perhaps it exists on some slaves)
ToolDescriptor.NotADirectory={0} is not a directory on the Jenkins master (but perhaps it exists on some agents)
......@@ -8,7 +8,7 @@ EXECUTOR_NUMBER.blurb=\
(among executors of the same machine) that\u2019s \
carrying out this build. This is the number you see in \
the "build executor status", except that the number starts from 0, not 1.
NODE_NAME.blurb=Name of the slave if the build is on a slave, or "master" if run on master
NODE_NAME.blurb=Name of the agent if the build is on an agent, or "master" if run on master
NODE_LABELS.blurb=Whitespace-separated list of labels that the node is assigned.
WORKSPACE.blurb=The absolute path of the directory assigned to the build as a workspace.
JENKINS_HOME.blurb=The absolute path of the directory assigned on the master node for Jenkins to store data.
......
......@@ -36,12 +36,12 @@ THE SOFTWARE.
This page has moved
</h1>
<p>
Starting 1.271, slave configuration is split into individual configuration page per slave,
Starting 1.271, agent configuration is split into individual configuration page per agent,
accessible from <a href="computer/">here</a>.
</p>
<ul>
<li>To configure existing slaves, click the above link, click their name, and then click the config link from the left</li>
<li>To add a new slave, click the above link, and click "add new slave"</li>
<li>To configure existing agents, click the above link, click their name, and then click the config link from the left</li>
<li>To add a new agent, click the above link, and click "add new agent"</li>
</ul>
</l:main-panel>
</l:layout>
......
threadDump_blurb=Visit <a href="{0}">this page</a> for master and slave thread dumps.
threadDump_blurb=Visit <a href="{0}">this page</a> for master and agent thread dumps.
blurb=Jenkins has rejected some commands from slaves, because we are unsure if it is open for slaves to execute, \
blurb=Jenkins has rejected some commands from agents, because we are unsure if it is open for agents to execute, \
but this rejection has probably broken some builds. You should examine the situation to see if they should be whitelisted.
\ No newline at end of file
......@@ -26,14 +26,14 @@ THE SOFTWARE.
<l:layout title="${%Whitelist}" permission="${app.RUN_SCRIPTS}">
<st:include page="sidepanel.jelly" it="${app}"/>
<l:main-panel>
<h1>${%Slave &#8594; Master Access Control}</h1>
<h1>${%Agent &#8594; Master Access Control}</h1>
<p>
Jenkins master is now more strict about what commands its slaves can send to the master.
Jenkins master is now more strict about what commands its agents can send to the master.
Unfortunately, this prevents some plugins from functioning correctly, as those plugins do not
specify which commands are open for slaves to execute and which ones are not.
specify which commands are open for agents to execute and which ones are not.
While plugin developers work on updating this,
as an administrator, you can mark commands as OK for slaves to execute (aka "whitelisting".)
as an administrator, you can mark commands as OK for agents to execute (aka "whitelisting".)
</p>
<div class="warning" style="margin:1em">
Please see <a href="http://jenkins-ci.org/security-144">the discussion of this feature</a> to
......@@ -41,8 +41,8 @@ THE SOFTWARE.
</div>
<j:if test="${it.masterKillSwitch}">
<div class="warning" style="margin:1em">
The slave &#8594; master access control subsystem is currently disabled.
This is unsafe if you have slaves from other less trusted people.
The agent &#8594; master access control subsystem is currently disabled.
This is unsafe if you have agents from other less trusted people.
You can put it back on from <a href="${rootURL}/configureSecurity">Global Security Configuration UI</a>
</div>
</j:if>
......@@ -50,7 +50,7 @@ THE SOFTWARE.
<form method="post" action="submit">
<h2>Currently Whitelisted Commands</h2>
<p>
The following commands are currently whitelisted for slaves to execute them on the master.
The following commands are currently whitelisted for agents to execute them on the master.
Type in any fully-qualified class names to white list them:
</p>
<textarea id="whitelist" name="whitelist" style="width:100%; height:5em">${it.whitelisted.read()}</textarea>
......@@ -60,8 +60,8 @@ THE SOFTWARE.
<j:if test="${!empty(rejectedList)}">
<h2>Currently Rejected Commands</h2>
<p>
Slaves have attempted to use the following functionalities but the plugins that implement them
did not specify whether they are usable from slaves or not. Check ones you want to whitelist:
Agents have attempted to use the following functionalities but the plugins that implement them
did not specify whether they are usable from agents or not. Check ones you want to whitelist:
</p>
<ul style="list-style:none">
<j:forEach var="r" items="${rejectedList}">
......@@ -86,7 +86,7 @@ THE SOFTWARE.
<h2>File Access Rules</h2>
<p>
The following rules control which part of <tt>$JENKINS_HOME</tt> can be access from slaves:
The following rules control which part of <tt>$JENKINS_HOME</tt> can be access from agents:
</p>
<textarea id="filePathRules" name="filePathRules" style="width:100%; height:5em">${it.filePathRules.read()}</textarea>
<p>
......
......@@ -20,6 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Slave\ &\#8594;\ Master\ Access\ Control=\u30b9\u30ec\u30fc\u30d6 - \u30de\u30b9\u30bf\u9593 \u30a2\u30af\u30bb\u30b9\u5236\u5fa1
Agent\ &\#8594;\ Master\ Access\ Control=\u30b9\u30ec\u30fc\u30d6 - \u30de\u30b9\u30bf\u9593 \u30a2\u30af\u30bb\u30b9\u5236\u5fa1
Whitelist=\u30db\u30ef\u30a4\u30c8\u30ea\u30b9\u30c8
Update=\u66f4\u65b0
......@@ -20,6 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Slave\ &\#8594;\ Master\ Access\ Control=controle de acesso ao Master slave
Agent\ &\#8594;\ Master\ Access\ Control=controle de acesso ao Master slave
Whitelist=
Update=
blurb=Slave to master security subsystem is currently off. \
blurb=Agent to master security subsystem is currently off. \
<a href="http://jenkins-ci.org/security-144">Please read the documentation</a> and consider turning it on.
\ No newline at end of file
......@@ -26,7 +26,7 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<st:documentation>
listbox for choosing the slave's usage.
listbox for choosing the agent's usage.
<st:attribute name="name">
Name of the &lt;select> element.
......
......@@ -58,7 +58,7 @@ THE SOFTWARE.
</j:if>
</j:when>
<j:otherwise>
${%It is not possible to run scripts when slave is offline.}
${%It is not possible to run scripts when agent is offline.}
</j:otherwise>
</j:choose>
</l:main-panel>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册