The Unified and Autonomous Development Platform
chore: Improved job executor match
Robin Shend4ddc9d11ff7
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 39d2b06338..e82b02bb05 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -136,7 +136,7 @@ public class Job implements NamedElement, Validatable {return new ArrayList<>();}- @Editable(order=200, placeholderProvider="getJobExecutorPlaceholder", description="Optionally specify executor for this job")+ @Editable(order=200, placeholderProvider="getJobExecutorPlaceholder", descriptionProvider="getJobExecutorDescription")@Interpolative(literalSuggester="suggestJobExecutors", variableSuggester="suggestVariables")public String getJobExecutor() {return jobExecutor;@@ -153,6 +153,14 @@ public class Job implements NamedElement, Validatable {elsereturn _T("First applicable executor");}++ @SuppressWarnings("unused")+ private static String getJobExecutorDescription() {+ if (OneDev.getInstance(SettingManager.class).getJobExecutors().isEmpty())+ return _T("Optionally specify executor for this job. Leave empty to use auto-discover executor");+ else+ return _T("Optionally specify executor for this job. Leave empty to use first applicable executor");+ }@SuppressWarnings("unused")private static List<InputSuggestion> suggestJobExecutors(String matchWith) {@@ -166,10 +174,10 @@ public class Job implements NamedElement, Validatable {JobMatchContext context = new JobMatchContext(page.getProject(), branch, null, SecurityUtils.getAuthUser(), jobName);for (JobExecutor executor: OneDev.getInstance(SettingManager.class).getJobExecutors()) {if (executor.isEnabled()) {- if (executor.getJobRequirement() == null) {+ if (executor.getJobMatch() == null) {applicableJobExecutors.add(executor.getName());} else {- if (JobMatch.parse(executor.getJobRequirement(), true, true).matches(context))+ if (JobMatch.parse(executor.getJobMatch(), true, true).matches(context))applicableJobExecutors.add(executor.getName());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.javaindex 43b017db3c..6ec41a2cba 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java@@ -21,7 +21,9 @@ import io.onedev.server.annotation.SubPath;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;@Editable(order=160, name="Build Image", group = DOCKER_IMAGE, description="Build docker image with docker buildx. " +"This step can only be executed by server docker executor or remote docker executor, and it uses the buildx " +@@ -124,6 +126,11 @@ public class BuildImageStep extends Step {registryLogins, getPlatforms(), getMoreOptions());}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return executor instanceof DockerAware && !(executor instanceof KubernetesAware);+ }+@Editablepublic static interface Output extends Serializable {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.javaindex c882bb016b..b382890077 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java@@ -98,4 +98,9 @@ public class CheckoutStep extends Step {cloneCredential.newCloneInfo(build, jobToken), checkoutPath);}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex 8b59002549..f9ac3a1402 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -21,6 +21,7 @@ import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.util.EditContext;@@ -147,4 +148,12 @@ public class CommandStep extends Step {}}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ if (isRunInContainer())+ return executor instanceof DockerAware;+ else+ return !(executor instanceof DockerAware);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.javaindex e61a71405f..991fe5be22 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java@@ -8,7 +8,9 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.ReservedOptions;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;@Editable(order=260, name="Prune Builder Cache", group = DOCKER_IMAGE, description="" +"Prune image cache of docker buildx builder. This step calls docker builder prune command " +@@ -34,4 +36,9 @@ public class PruneBuilderCacheStep extends Step {return new PruneBuilderCacheFacade(getOptions());}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return executor instanceof DockerAware && !(executor instanceof KubernetesAware);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.javaindex e942e7b053..2fa24c5133 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java@@ -25,7 +25,9 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.job.JobContext;import io.onedev.server.job.JobManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.SessionManager;import io.onedev.server.util.patternset.PatternSet;@@ -125,4 +127,9 @@ public class PublishSiteStep extends ServerSideStep {});}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return executor.isSitePublishEnabled();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex e900645e12..7129bb0df5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -20,7 +20,9 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;@Editable(order=150, name="Run Docker Container", description="Run specified docker container. <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>Job workspace</a> "+ "is mounted into the container and its path is placed in environment variable <code>ONEDEV_WORKSPACE</code>. " +@@ -157,4 +159,9 @@ public class RunContainerStep extends Step {registryLogins, isUseTTY());}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return executor instanceof DockerAware && !(executor instanceof KubernetesAware);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.javaindex 80ba36c81f..1e88f42cc3 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java@@ -16,7 +16,9 @@ import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;@Editable(order=230, name="Run Buildx Image Tools", group = DOCKER_IMAGE, description="Run docker buildx imagetools " +"command with specified arguments. This step can only be executed by server docker executor " +@@ -62,4 +64,9 @@ public class RunImagetoolsStep extends Step {return new RunImagetoolsFacade(getArguments(), registryLogins);}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return executor instanceof DockerAware && !(executor instanceof KubernetesAware);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.javaindex 81ef0efdfb..dd881108a7 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerSideStep.java@@ -42,6 +42,11 @@ public abstract class ServerSideStep extends Step {}public abstract ServerStepResult run(Long buildId, File inputDir, TaskLogger logger);++ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return true;+ }public Collection<String> getPlaceholders() {Collection<String> placeholders = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.javaindex a66fb9e9e6..ade6bea3e1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java@@ -167,5 +167,10 @@ public class SetupCacheStep extends Step {getChangeDetectionExcludes(), getUploadProjectPath(), uploadAccessToken);}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return true;+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.javaindex a72bfb5eaf..19b76131b5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java@@ -67,5 +67,7 @@ public abstract class Step implements Serializable {}public abstract StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination);-++ public abstract boolean isApplicable(Build build, JobExecutor executor);+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.javaindex c1df2d2a32..d79aab2ae7 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java@@ -127,4 +127,18 @@ public class UseTemplateStep extends CompositeStep {return actions;}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ var template = build.getSpec().getStepTemplateMap().get(getTemplateName());+ if (template != null) {+ for (var step: template.getSteps()) {+ if (!step.isApplicable(build, executor))+ return false;+ }+ return true;+ } else {+ return true;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 6d23b371ba..800303cb35 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -8107,4 +8107,26 @@ public class DataMigrator {}}+ private void migrate204(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("JOB_EXECUTORS")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element executorElement : valueElement.elements()) {+ var jobRequirementElement = executorElement.element("jobRequirement");+ if (jobRequirementElement != null)+ jobRequirementElement.setName("jobMatch");+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 5c6a2675eb..371c257e34 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -142,6 +142,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;@@ -499,9 +500,16 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizlistenerRegistry.post(new BuildSubmitted(build));}- private boolean isApplicable(JobExecutor executor, Build build) {- if (executor.getJobRequirement() != null) {- JobMatch jobMatch = JobMatch.parse(executor.getJobRequirement(), true, true);+ private boolean isApplicable(Build build, JobExecutor executor) {+ if (!build.getJob().getRequiredServices().isEmpty() && !(executor instanceof DockerAware))+ return false;++ for (var step: build.getJob().getSteps()) {+ if (!step.isApplicable(build, executor))+ return false;+ }+ if (executor.getJobMatch() != null) {+ JobMatch jobMatch = JobMatch.parse(executor.getJobMatch(), true, true);PullRequest request = build.getRequest();if (request != null) {if (request.getSource() != null) {@@ -537,7 +545,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizif (jobExecutor != null) {if (!jobExecutor.isEnabled())throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is disabled");- else if (!isApplicable(jobExecutor, build))+ else if (!isApplicable(build, jobExecutor))throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is not applicable for current job");elsereturn jobExecutor;@@ -547,7 +555,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {if (!settingManager.getJobExecutors().isEmpty()) {for (var executor : settingManager.getJobExecutors()) {- if (executor.isEnabled() && isApplicable(executor, build))+ if (executor.isEnabled() && isApplicable(build, executor))return executor;}throw new ExplicitException("No applicable job executor");@@ -559,11 +567,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizJobExecutor jobExecutor = discoverer.discover();if (jobExecutor != null) {jobExecutor.setName("auto-discovered");- jobLogger.log("Discovered " + EditableUtils.getDisplayName(jobExecutor.getClass()).toLowerCase());- return jobExecutor;+ if (isApplicable(build, jobExecutor)) {+ jobLogger.log("Discovered " + EditableUtils.getDisplayName(jobExecutor.getClass()).toLowerCase());+ return jobExecutor;+ }}}- throw new ExplicitException("No applicable job executor discovered");+ throw new ExplicitException("No applicable job executor discovered for current job");}}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 61fe108e8b..8c9d9f0eeb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -34,7 +34,7 @@ public abstract class JobExecutor implements Serializable {private String name;- private String jobRequirement;+ private String jobMatch;private boolean htmlReportPublishEnabled;@@ -87,61 +87,61 @@ public abstract class JobExecutor implements Serializable {@Editable(order=10000, name="Applicable Jobs", placeholder="Any job", description="Optionally specify applicable jobs of this executor")@io.onedev.server.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)@Nullable- public String getJobRequirement() {- return jobRequirement;+ public String getJobMatch() {+ return jobMatch;}- public void setJobRequirement(String jobRequirement) {- this.jobRequirement = jobRequirement;+ public void setJobMatch(String jobMatch) {+ this.jobMatch = jobMatch;}public abstract boolean execute(JobContext jobContext, TaskLogger jobLogger);public Usage onDeleteProject(String projectPath) {Usage usage = new Usage();- if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingProject(projectPath)) {+ if (jobMatch != null && JobMatch.parse(jobMatch, true, true).isUsingProject(projectPath)) {usage.add("applicable jobs" );}return usage;}public void onMoveProject(String oldPath, String newPath) {- if (jobRequirement != null) {- JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);- jobMatch.onMoveProject(oldPath, newPath);- jobRequirement = jobMatch.toString();+ if (jobMatch != null) {+ JobMatch parsedJobMatch = JobMatch.parse(jobMatch, true, true);+ parsedJobMatch.onMoveProject(oldPath, newPath);+ jobMatch = parsedJobMatch.toString();}}public Usage onDeleteUser(String userName) {Usage usage = new Usage();- if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingUser(userName)) {+ if (jobMatch != null && JobMatch.parse(jobMatch, true, true).isUsingUser(userName)) {usage.add("applicable jobs");}return usage;}public void onRenameUser(String oldName, String newName) {- if (jobRequirement != null) {- JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);- jobMatch.onRenameUser(oldName, newName);- jobRequirement = jobMatch.toString();+ if (jobMatch != null) {+ JobMatch parsedJobMatch = JobMatch.parse(jobMatch, true, true);+ parsedJobMatch.onRenameUser(oldName, newName);+ jobMatch = parsedJobMatch.toString();}}public Usage onDeleteGroup(String groupName) {Usage usage = new Usage();- if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingGroup(groupName)) {+ if (jobMatch != null && JobMatch.parse(jobMatch, true, true).isUsingGroup(groupName)) {usage.add("applicable jobs");}return usage;}public void onRenameGroup(String oldName, String newName) {- if (jobRequirement != null) {- JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);- jobMatch.onRenameGroup(oldName, newName);- jobRequirement = jobMatch.toString();+ if (jobMatch != null) {+ JobMatch parsedJobMatch = JobMatch.parse(jobMatch, true, true);+ parsedJobMatch.onRenameGroup(oldName, newName);+ jobMatch = parsedJobMatch.toString();}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.htmlindex 87e3d8e5d2..9c9d905a0b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html@@ -2,11 +2,8 @@<div class="job-executors"><div class="body"><div wicket:id="jobExecutorSetting">- <div wicket:id="withExecutors" class="alert alert-info mb-5">- <wicket:t>For a particular job, the first applicable executor will be used</wicket:t>- </div>- <div wicket:id="withoutExecutors" class="alert alert-info mb-5">- <wicket:t>No executors defined. Jobs will use auto-discovered executor</wicket:t>+ <div wicket:id="noExecutors" class="alert alert-info mb-5">+ <wicket:t>No executors defined. Jobs will use auto-discovered executors instead</wicket:t></div><ul class="list-unstyled"><li wicket:id="executors" class="executor mb-5"><div wicket:id="executor"></div></li>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.javaindex 966b90d57a..c29a66d2b4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java@@ -93,14 +93,7 @@ public class JobExecutorsPage extends AdministrationPage {}.items("li.executor").handle(".card-header"));container.add(newAddNewFrag());- container.add(new WebMarkupContainer("withExecutors") {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getSettingManager().getJobExecutors().isEmpty());- }- });- container.add(new WebMarkupContainer("withoutExecutors") {+ container.add(new WebMarkupContainer("noExecutors") {@Overrideprotected void onConfigure() {super.onConfigure();diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.javaindex cd97a7471d..1c93a81138 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java@@ -1119,8 +1119,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "Aktivieren Sie dies, wenn das Zugriffstoken dieselben Berechtigungen wie der Besitzer hat");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","Aktivieren Sie diese Option, um den Pull-Request automatisch zu mergen, wenn er bereit ist (alle Gutachter haben zugestimmt, alle erforderlichen Jobs sind abgeschlossen usw.)");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "Aktivieren Sie dies, um den HTML-Bericht-Veröffentlichungsschritt auszuführen. Um XSS-Angriffe zu vermeiden, stellen Sie sicher, dass dieser Executor nur von vertrauenswürdigen Jobs verwendet werden kann");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","Aktivieren Sie dies, um den Site-Veröffentlichungsschritt auszuführen. OneDev wird Projekt-Site-Dateien unverändert bereitstellen. Um XSS-Angriffe zu vermeiden, stellen Sie sicher, dass dieser Executor nur von vertrauenswürdigen Jobs verwendet werden kann");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_de extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "Fehler beim Validieren der Commit-Nachricht von \"{0}\": {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","Fehler beim Validieren der Commit-Nachricht von <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}");+ m.put("Error verifying GPG signature", "Fehler beim Überprüfen der GPG-Signatur");m.put("Estimated Time", "Geschätzte Zeit");m.put("Estimated Time Edit Bean", "Bearbeitungs-Bean für geschätzte Zeit");m.put("Estimated Time Issue Field", "Feld für geschätzte Zeit bei Problemen");@@ -1460,7 +1459,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Hours Per Day", "Stunden pro Tag");m.put("How to Publish", "Wie veröffentlichen");m.put("Html Report", "HTML-Bericht");- m.put("Html Report Publish Enabled", "HTML-Bericht Veröffentlichung aktiviert");m.put("Http Method", "HTTP-Methode");m.put("I didn't eat it. I swear!", "Ich habe es nicht gegessen. Ich schwöre!");m.put("ID token was expired", "ID-Token ist abgelaufen");@@ -1582,6 +1580,7 @@ public class Translation_de extends TranslationResourceBundle {"Interaktiver Web-Shell-Zugriff auf laufende Jobs ist eine Enterprise-Funktion. <a href='https://onedev.io/pricing' target='_blank'>30 Tage kostenlos testen</a>");m.put("Internal Database", "Interne Datenbank");m.put("Interpreter", "Interpreter");+ m.put("Invalid GPG signature", "Ungültige GPG-Signatur");m.put("Invalid PCRE syntax", "Ungültige PCRE-Syntax");m.put("Invalid access token: {0}", "Ungültiges Zugriffstoken: {0}");m.put("Invalid credentials", "Ungültige Anmeldedaten");@@ -1726,7 +1725,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Job Properties", "Job-Eigenschaften");m.put("Job Properties Bean", "Job-Eigenschaften Bean");m.put("Job Property", "Job-Eigenschaft");- m.put("Job Requirement", "Job-Anforderung");m.put("Job Secret", "Job-Geheimnis");m.put("Job Secret Edit Bean", "Job-Geheimnis Bearbeiten Bean");m.put("Job Secrets", "Job-Geheimnisse");@@ -1848,6 +1846,7 @@ public class Translation_de extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","Langfristiger Aktualisierungstoken des oben genannten Kontos, der verwendet wird, um Zugriffstoken für den Zugriff auf den Office 365-Mailserver zu generieren. <b class='text-info'>TIPPS: </b> Sie können die Schaltfläche auf der rechten Seite dieses Feldes verwenden, um sich bei Ihrem Office 365-Konto anzumelden und einen Aktualisierungstoken zu generieren. Beachten Sie, dass der Aktualisierungstoken neu generiert werden sollte, wenn die Mandanten-ID, die Client-ID, das Client-Geheimnis oder der Benutzerprinzipalname geändert wird");m.put("Longest Duration First", "Längste Dauer zuerst");+ m.put("Looks like a GPG signature but without necessary data", "Sieht aus wie eine GPG-Signatur, aber ohne notwendige Daten");m.put("Low", "Niedrig");m.put("Low Severity", "Niedrige Schwere");m.put("MERGED", "VERMISCHT");@@ -2064,7 +2063,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("No diffs", "Keine Unterschiede");m.put("No diffs to navigate", "Keine Unterschiede zum Navigieren");m.put("No directories to skip", "Keine Verzeichnisse zum Überspringen");- m.put("No executors defined. Jobs will use auto-discovered executor", "Keine Executor definiert. Jobs verwenden automatisch erkannten Executor");m.put("No external authenticator", "Kein externer Authentifikator");m.put("No fields to prompt", "Keine Felder zum Abfragen");m.put("No fields to remove", "Keine Felder zum Entfernen");@@ -2129,6 +2127,7 @@ public class Translation_de extends TranslationResourceBundle {m.put("None", "Keine");m.put("Not Active Since", "Nicht aktiv seit");m.put("Not Used Since", "Nicht verwendet seit");+ m.put("Not a verified email of signing GPG key", "Keine verifizierte E-Mail des signierenden GPG-Schlüssels");m.put("Not a verified email of signing ssh key owner", "Nicht eine verifizierte E-Mail des Besitzers des signierenden SSH-Schlüssels");m.put("Not assigned", "Nicht zugewiesen");m.put("Not authorized to create project under \"{0}\"", "Nicht berechtigt, ein Projekt unter \"{0}\" zu erstellen");@@ -2294,8 +2293,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "Optional geben Sie Argumente an, um das obige Image auszuführen");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","Optional geben Sie Artefakte an, die aus der Abhängigkeit in den <a href='https://docs.onedev.io/concepts#job-workspace'>Job-Arbeitsbereich</a> abgerufen werden sollen. Nur veröffentlichte Artefakte (über den Artefakt-Veröffentlichungsschritt) können abgerufen werden. Lassen Sie das Feld leer, um keine Artefakte abzurufen");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "Optional geben Sie einen autorisierten Executor für diesen Job an. Lassen Sie das Feld leer, um den ersten anwendbaren Executor zu verwenden (oder verwenden Sie den automatisch erkannten Executor, wenn keine Executor definiert sind)");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","Optional geben Sie autorisierte Rollen an, um diese Schaltfläche zu drücken. Wenn nicht angegeben, sind alle Benutzer berechtigt");m.put("Optionally specify base query of the list", "Optional geben Sie die Basisabfrage der Liste an");@@ -2344,7 +2341,6 @@ public class Translation_de extends TranslationResourceBundle {"Optional geben Sie Probleme an, die für diesen Übergang anwendbar sind. Lassen Sie das Feld leer für alle Probleme");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","Optional geben Sie Probleme an, die für diesen Übergang anwendbar sind. Lassen Sie das Feld leer für alle Probleme.");- m.put("Optionally specify job requirement of this executor", "Optional geben Sie die Job-Anforderung dieses Executors an");m.put("Optionally specify jobs allowed to use this script", "Optional geben Sie Jobs an, die dieses Skript verwenden dürfen");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","Optional geben Sie das Speicherlimit für jeden Job/Service an, der diesen Executor verwendet. Überprüfen Sie <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes-Ressourcenmanagement</a> für Details");@@ -3185,6 +3181,7 @@ public class Translation_de extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "Signatur erfolgreich mit dem GPG-Schlüssel des Taggers verifiziert");m.put("Signature verified successfully with tagger's SSH key", "Signatur erfolgreich mit dem SSH-Schlüssel des Taggers verifiziert");m.put("Signature verified successfully with trusted GPG key", "Signatur erfolgreich mit einem vertrauenswürdigen GPG-Schlüssel verifiziert");+ m.put("Signed with an unknown GPG key ", "Mit einem unbekannten GPG-Schlüssel signiert");m.put("Signed with an unknown ssh key", "Mit einem unbekannten SSH-Schlüssel signiert");m.put("Signer Email Addresses", "Signer-E-Mail-Adressen");m.put("Signing Key ID", "Signierschlüssel-ID");@@ -3194,7 +3191,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Single sign on via discord.com", "Single Sign-On über discord.com");m.put("Single sign on via twitch.tv", "Single Sign-On über twitch.tv");m.put("Site", "Website");- m.put("Site Publish Enabled", "Website-Veröffentlichung aktiviert");m.put("Size", "Größe");m.put("Size invalid", "Ungültige Größe");m.put("Slack Notifications", "Slack-Benachrichtigungen");@@ -3768,10 +3764,6 @@ public class Translation_de extends TranslationResourceBundle {"Dieser Executor führt Build-Jobs als Docker-Container auf Remote-Maschinen über <a href='/~administration/agents' target='_blank'>Agents</a> aus");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Dieser Executor führt Build-Jobs als Pods in einem Kubernetes-Cluster aus. Es werden keine Agents benötigt.<b class='text-danger'>Hinweis:</b> Stellen Sie sicher, dass die Server-URL in den Systemeinstellungen korrekt angegeben ist, da Job-Pods darauf zugreifen müssen, um Quellcode und Artefakte herunterzuladen");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität des OneDev-Servers aus.<br><b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Berechtigungen wie der OneDev-Server-Prozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Jobs über die Job-Anforderungseinstellung verwendet werden kann");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität von Remote-Maschinen über <a href='/~administration/agents' target='_blank'>Agents</a> aus.<br><b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Berechtigungen wie der entsprechende Agent-Prozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Jobs über die Job-Anforderungseinstellung verwendet werden kann");m.put("This field is required", "Dieses Feld ist erforderlich");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Dieser Filter wird verwendet, um den LDAP-Eintrag für den aktuellen Benutzer zu bestimmen. Zum Beispiel: <i>(&(uid={0})(objectclass=person))</i>. In diesem Beispiel repräsentiert <i>{0}</i> den Anmeldenamen des aktuellen Benutzers.");@@ -4206,8 +4198,6 @@ public class Translation_de extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","Ob dieses Feld einbezogen werden soll, wenn das Problem ursprünglich geöffnet wird oder nicht. Wenn nicht, können Sie dieses Feld später einbeziehen, wenn das Problem durch eine Problemübergangsregel in andere Zustände überführt wird");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "Ob geschätzte/aufgewendete Zeit nur in Stunden/Minuten eingegeben und angezeigt werden soll oder nicht");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "Ob Docker-Sock in den Job-Container eingebunden werden soll, um Docker-Operationen in Job-Befehlen zu unterstützen<br><b class='text-danger'>WARNUNG</b>: Bösartige Jobs können die gesamte OneDev steuern, indem sie den eingebundenen Docker-Sock bedienen. Sie sollten die oben genannten Job-Anforderungen konfigurieren, um sicherzustellen, dass der Executor nur von vertrauenswürdigen Jobs verwendet werden kann, wenn diese Option aktiviert ist");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","Ob Tag-Zuordnungen auf der nächsten Seite vorab ausgefüllt werden sollen oder nicht. Sie möchten dies möglicherweise deaktivieren, wenn zu viele Tags angezeigt werden sollen");m.put("Whether or not to require this dependency to be successful", "Ob diese Abhängigkeit erfolgreich sein muss oder nicht");@@ -4363,6 +4353,7 @@ public class Translation_de extends TranslationResourceBundle {m.put("issue:Number", "Anzahl");m.put("issues", "Probleme");m.put("job", "Job");+ m.put("key ID: ", "Schlüssel-ID:");m.put("lines", "Zeilen");m.put("link:Multiple", "Mehrere");m.put("log", "Protokoll");@@ -4502,12 +4493,22 @@ public class Translation_de extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "Fehler beim Überprüfen der GPG-Signatur");- m.put("Invalid GPG signature", "Ungültige GPG-Signatur");- m.put("Looks like a GPG signature but without necessary data", "Sieht aus wie eine GPG-Signatur, aber ohne notwendige Daten");- m.put("Not a verified email of signing GPG key", "Keine verifizierte E-Mail des signierenden GPG-Schlüssels");- m.put("Signed with an unknown GPG key ", "Mit einem unbekannten GPG-Schlüssel signiert");- m.put("key ID: ", "Schlüssel-ID:");+ m.put("Enable Html Report Publish", "HTML-Berichtveröffentlichung aktivieren");+ m.put("Enable Site Publish", "Site-Veröffentlichung aktivieren");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "Aktivieren Sie dies, um den Schritt zur Veröffentlichung des HTML-Berichts auszuführen. Um XSS-Angriffe zu vermeiden, stellen Sie sicher, dass dieser Executor nur von vertrauenswürdigen Jobs verwendet werden kann");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "Keine Executor definiert. Jobs verwenden stattdessen automatisch erkannte Executor");+ m.put("Optionally specify applicable jobs of this executor", "Optional anwendbare Jobs für diesen Executor angeben");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "Optional Executor für diesen Job angeben. Leer lassen, um automatisch erkannten Executor zu verwenden");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "Optional Executor für diesen Job angeben. Leer lassen, um den ersten anwendbaren Executor zu verwenden");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität des OneDev-Servers aus.<br><b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Berechtigungen wie der OneDev-Serverprozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Jobs verwendet werden kann");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "Dieser Executor führt Build-Jobs mit der Shell-Funktionalität von Remote-Maschinen über <a href='/~administration/agents' target='_blank'>Agents</a> aus.<br><b class='text-danger'>WARNUNG</b>: Jobs, die mit diesem Executor ausgeführt werden, haben dieselben Berechtigungen wie der OneDev-Agent-Prozess. Stellen Sie sicher, dass er nur von vertrauenswürdigen Jobs verwendet werden kann");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "Ob der Docker-Sock in den Job-Container eingebunden werden soll, um Docker-Operationen in Job-Befehlen zu unterstützen<br><b class='text-danger'>WARNUNG</b>: Bösartige Jobs können die Kontrolle über das gesamte OneDev übernehmen, indem sie den eingebundenen Docker-Sock verwenden. Stellen Sie sicher, dass dieser Executor nur von vertrauenswürdigen Jobs verwendet werden kann, wenn diese Option aktiviert ist");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.javaindex 77ec7989ac..d042132f7f 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java@@ -1119,8 +1119,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "Habilitar esto si el token de acceso tiene los mismos permisos que el propietario");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","Habilitar esta opción para fusionar automáticamente la solicitud de extracción cuando esté lista (todos los revisores aprobaron, todos los trabajos requeridos pasaron, etc.)");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "Habilitar esto para permitir ejecutar el paso de publicación de informes HTML. Para evitar ataques XSS, asegúrese de que este ejecutor solo pueda ser utilizado por trabajos confiables");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","Habilitar esto para permitir ejecutar el paso de publicación del sitio. OneDev servirá los archivos del sitio del proyecto tal como están. Para evitar ataques XSS, asegúrese de que este ejecutor solo pueda ser utilizado por trabajos confiables");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_es extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "Error al validar el mensaje de commit de \"{0}\": {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","Error al validar el mensaje de commit de <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}");+ m.put("Error verifying GPG signature", "Error al verificar la firma GPG");m.put("Estimated Time", "Tiempo Estimado");m.put("Estimated Time Edit Bean", "Bean de Edición de Tiempo Estimado");m.put("Estimated Time Issue Field", "Campo de Problema de Tiempo Estimado");@@ -1460,7 +1459,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Hours Per Day", "Horas por día");m.put("How to Publish", "Cómo publicar");m.put("Html Report", "Informe HTML");- m.put("Html Report Publish Enabled", "Publicación de informe HTML habilitada");m.put("Http Method", "Método Http");m.put("I didn't eat it. I swear!", "No me lo comí. ¡Lo juro!");m.put("ID token was expired", "El token de ID ha expirado");@@ -1582,6 +1580,7 @@ public class Translation_es extends TranslationResourceBundle {"El acceso interactivo a la shell web para trabajos en ejecución es una característica empresarial. <a href='https://onedev.io/pricing' target='_blank'>Prueba gratis</a> por 30 días");m.put("Internal Database", "Base de datos interna");m.put("Interpreter", "Intérprete");+ m.put("Invalid GPG signature", "Firma GPG inválida");m.put("Invalid PCRE syntax", "Sintaxis PCRE inválida");m.put("Invalid access token: {0}", "Token de acceso inválido: {0}");m.put("Invalid credentials", "Credenciales inválidas");@@ -1726,7 +1725,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Job Properties", "Propiedades de Trabajo");m.put("Job Properties Bean", "Bean de Propiedades de Trabajo");m.put("Job Property", "Propiedad de Trabajo");- m.put("Job Requirement", "Requisito de Trabajo");m.put("Job Secret", "Secreto de Trabajo");m.put("Job Secret Edit Bean", "Editar Bean de Secreto de Trabajo");m.put("Job Secrets", "Secretos de Trabajo");@@ -1848,6 +1846,7 @@ public class Translation_es extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","Token de actualización de larga duración de la cuenta anterior que se utilizará para generar un token de acceso para acceder al servidor de correo de Office 365. <b class='text-info'>CONSEJOS: </b> puede usar el botón en el lado derecho de este campo para iniciar sesión en su cuenta de Office 365 y generar el token de actualización. Tenga en cuenta que cada vez que se cambie el id del inquilino, el id del cliente, el secreto del cliente o el nombre principal del usuario, se debe regenerar el token de actualización");m.put("Longest Duration First", "Mayor Duración Primero");+ m.put("Looks like a GPG signature but without necessary data", "Parece una firma GPG pero sin los datos necesarios");m.put("Low", "Bajo");m.put("Low Severity", "Severidad Baja");m.put("MERGED", "FUSIONADO");@@ -2064,7 +2063,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("No diffs", "No hay diferencias");m.put("No diffs to navigate", "No hay diferencias para navegar");m.put("No directories to skip", "No hay directorios para omitir");- m.put("No executors defined. Jobs will use auto-discovered executor", "No hay ejecutores definidos. Los trabajos usarán el ejecutor descubierto automáticamente");m.put("No external authenticator", "No hay autenticador externo");m.put("No fields to prompt", "No hay campos para solicitar");m.put("No fields to remove", "No hay campos para eliminar");@@ -2129,6 +2127,7 @@ public class Translation_es extends TranslationResourceBundle {m.put("None", "Ninguno");m.put("Not Active Since", "No activo desde");m.put("Not Used Since", "No usado desde");+ m.put("Not a verified email of signing GPG key", "No es un correo electrónico verificado de la clave GPG de firma");m.put("Not a verified email of signing ssh key owner", "No es un correo electrónico verificado del propietario de la clave ssh de firma");m.put("Not assigned", "No asignado");m.put("Not authorized to create project under \"{0}\"", "No autorizado para crear un proyecto bajo \"{0}\"");@@ -2294,8 +2293,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "Opcionalmente especifique argumentos para ejecutar la imagen anterior.");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","Opcionalmente especifique artefactos para recuperar de la dependencia en el <a href='https://docs.onedev.io/concepts#job-workspace'>espacio de trabajo del trabajo</a>. Solo se pueden recuperar artefactos publicados (a través del paso de publicación de artefactos). Déjelo vacío para no recuperar ningún artefacto.");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "Opcionalmente especifique el ejecutor autorizado para este trabajo. Déjelo vacío para usar el primer ejecutor aplicable (o use el ejecutor auto-descubierto si no se definen ejecutores).");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","Opcionalmente especifique roles autorizados para presionar este botón. Si no se especifica, todos los usuarios están permitidos.");m.put("Optionally specify base query of the list", "Opcionalmente especifique la consulta base de la lista.");@@ -2344,7 +2341,6 @@ public class Translation_es extends TranslationResourceBundle {"Opcionalmente especifique problemas aplicables para esta transición. Déjelo vacío para todos los problemas.");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","Opcionalmente especifique problemas aplicables para esta transición. Déjelo vacío para todos los problemas.");- m.put("Optionally specify job requirement of this executor", "Opcionalmente especifique el requisito de trabajo de este ejecutor.");m.put("Optionally specify jobs allowed to use this script", "Opcionalmente especifique trabajos permitidos para usar este script.");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","Opcionalmente especifique el límite de memoria para cada trabajo/servicio que use este ejecutor. Consulte <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>gestión de recursos de Kubernetes</a> para más detalles.");@@ -3185,6 +3181,7 @@ public class Translation_es extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "Firma verificada exitosamente con la clave GPG del etiquetador");m.put("Signature verified successfully with tagger's SSH key", "Firma verificada exitosamente con la clave SSH del etiquetador");m.put("Signature verified successfully with trusted GPG key", "Firma verificada exitosamente con la clave GPG de confianza");+ m.put("Signed with an unknown GPG key ", "Firmado con una clave GPG desconocida");m.put("Signed with an unknown ssh key", "Firmado con una clave ssh desconocida");m.put("Signer Email Addresses", "Direcciones de correo electrónico del firmante");m.put("Signing Key ID", "ID de clave de firma");@@ -3194,7 +3191,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Single sign on via discord.com", "Inicio de sesión único a través de discord.com");m.put("Single sign on via twitch.tv", "Inicio de sesión único a través de twitch.tv");m.put("Site", "Sitio");- m.put("Site Publish Enabled", "Publicación del sitio habilitada");m.put("Size", "Tamaño");m.put("Size invalid", "Tamaño inválido");m.put("Slack Notifications", "Notificaciones de Slack");@@ -3768,10 +3764,6 @@ public class Translation_es extends TranslationResourceBundle {"Este ejecutor ejecuta trabajos de construcción como contenedores de Docker en máquinas remotas a través de <a href='/~administration/agents' target='_blank'>agentes</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Este ejecutor ejecuta trabajos de construcción como pods en un clúster de Kubernetes. No se requieren agentes.<b class='text-danger'>Nota:</b> Asegúrese de que la URL del servidor esté especificada correctamente en la configuración del sistema, ya que los pods de trabajo necesitan acceder a ella para descargar el código fuente y los artefactos");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "Este ejecutor ejecuta trabajos de construcción con la instalación de shell del servidor de OneDev.<br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen los mismos permisos que el proceso del servidor de OneDev. Asegúrese de que solo pueda ser utilizado por trabajos confiables mediante la configuración de requisitos de trabajo");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "Este ejecutor ejecuta trabajos de construcción con la instalación de shell de máquinas remotas a través de <a href='/~administration/agents' target='_blank'>agentes</a><br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen los mismos permisos que el proceso del agente correspondiente. Asegúrese de que solo pueda ser utilizado por trabajos confiables mediante la configuración de requisitos de trabajo");m.put("This field is required", "Este campo es obligatorio");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Este filtro se utiliza para determinar la entrada LDAP del usuario actual. Por ejemplo: <i>(&(uid={0})(objectclass=person))</i>. En este ejemplo, <i>{0}</i> representa el nombre de inicio de sesión del usuario actual.");@@ -4206,8 +4198,6 @@ public class Translation_es extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","Si se debe incluir este campo cuando el problema se abre inicialmente o no. Si no, puedes incluir este campo más tarde cuando el problema se transite a otros estados mediante la regla de transición de problemas");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "Si se debe ingresar y mostrar el tiempo estimado/gastado solo en horas/minutos o no");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "Si se debe montar el socket de Docker en el contenedor de trabajo para admitir operaciones de Docker en los comandos de trabajo o no<br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos maliciosos pueden tomar control de todo OneDev operando el socket de Docker montado. Debes configurar el requisito de trabajo anterior para asegurarte de que el ejecutor solo pueda ser utilizado por trabajos confiables si esta opción está habilitada");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","Si se deben pre-poblar las asignaciones de etiquetas en la siguiente página o no. Es posible que desees deshabilitar esto si hay demasiadas etiquetas para mostrar");m.put("Whether or not to require this dependency to be successful", "Si se requiere que esta dependencia sea exitosa o no");@@ -4363,6 +4353,7 @@ public class Translation_es extends TranslationResourceBundle {m.put("issue:Number", "Número");m.put("issues", "problemas");m.put("job", "trabajo");+ m.put("key ID: ", "ID de clave:");m.put("lines", "líneas");m.put("link:Multiple", "Múltiples");m.put("log", "registro");@@ -4502,12 +4493,22 @@ public class Translation_es extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "Error al verificar la firma GPG");- m.put("Invalid GPG signature", "Firma GPG inválida");- m.put("Looks like a GPG signature but without necessary data", "Parece una firma GPG pero sin los datos necesarios");- m.put("Not a verified email of signing GPG key", "No es un correo electrónico verificado de la clave GPG de firma");- m.put("Signed with an unknown GPG key ", "Firmado con una clave GPG desconocida");- m.put("key ID: ", "ID de clave:");+ m.put("Enable Html Report Publish", "Habilitar la publicación del informe Html");+ m.put("Enable Site Publish", "Habilitar la publicación del sitio");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "Habilite esto para permitir ejecutar el paso de publicación del informe html. Para evitar ataques XSS, asegúrese de que este ejecutor solo pueda ser utilizado por trabajos confiables");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "No se han definido ejecutores. Los trabajos usarán ejecutores descubiertos automáticamente");+ m.put("Optionally specify applicable jobs of this executor", "Especifique opcionalmente los trabajos aplicables de este ejecutor");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "Especifique opcionalmente el ejecutor para este trabajo. Déjelo vacío para usar el ejecutor descubierto automáticamente");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "Especifique opcionalmente el ejecutor para este trabajo. Déjelo vacío para usar el primer ejecutor aplicable");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "Este ejecutor ejecuta trabajos de construcción con la instalación de shell del servidor de OneDev.<br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen los mismos permisos que el proceso del servidor de OneDev. Asegúrese de que solo pueda ser utilizado por trabajos confiables");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "Este ejecutor ejecuta trabajos de construcción con la instalación de shell de máquinas remotas a través de <a href='/~administration/agents' target='_blank'>agentes</a><br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos que se ejecutan con este ejecutor tienen los mismos permisos que el proceso del agente de OneDev. Asegúrese de que solo pueda ser utilizado por trabajos confiables");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "Si se debe montar o no el socket de Docker en el contenedor del trabajo para admitir operaciones de Docker en los comandos del trabajo<br><b class='text-danger'>ADVERTENCIA</b>: Los trabajos maliciosos pueden tomar el control de todo OneDev operando el socket de Docker montado. Asegúrese de que este ejecutor solo pueda ser utilizado por trabajos confiables si esta opción está habilitada");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.javaindex fb86592589..c7d18a4496 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java@@ -1119,8 +1119,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "Activer ceci si le jeton d'accès a les mêmes permissions que le propriétaire");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","Activer cette option pour fusionner automatiquement la demande de tirage lorsqu'elle est prête (tous les examinateurs ont approuvé, tous les travaux requis ont réussi, etc.)");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "Activer ceci pour permettre l'exécution de l'étape de publication du rapport HTML. Pour éviter les attaques XSS, assurez-vous que cet exécuteur ne peut être utilisé que par des travaux de confiance");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","Activer ceci pour permettre l'exécution de l'étape de publication du site. OneDev servira les fichiers du site du projet tels quels. Pour éviter les attaques XSS, assurez-vous que cet exécuteur ne peut être utilisé que par des travaux de confiance");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "Erreur lors de la validation du message de commit de \"{0}\" : {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","Erreur lors de la validation du message de commit de <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a> : {2}");+ m.put("Error verifying GPG signature", "Erreur de vérification de la signature GPG");m.put("Estimated Time", "Temps estimé");m.put("Estimated Time Edit Bean", "Éditeur de temps estimé");m.put("Estimated Time Issue Field", "Champ de problème de temps estimé");@@ -1460,7 +1459,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Hours Per Day", "Heures par jour");m.put("How to Publish", "Comment publier");m.put("Html Report", "Rapport HTML");- m.put("Html Report Publish Enabled", "Publication du rapport HTML activée");m.put("Http Method", "Méthode Http");m.put("I didn't eat it. I swear!", "Je ne l'ai pas mangé. Je le jure !");m.put("ID token was expired", "Le jeton ID a expiré");@@ -1582,6 +1580,7 @@ public class Translation_fr extends TranslationResourceBundle {"L'accès interactif à la console web pour les tâches en cours est une fonctionnalité d'entreprise. <a href='https://onedev.io/pricing' target='_blank'>Essayez gratuitement</a> pendant 30 jours");m.put("Internal Database", "Base de données interne");m.put("Interpreter", "Interpréteur");+ m.put("Invalid GPG signature", "Signature GPG invalide");m.put("Invalid PCRE syntax", "Syntaxe PCRE invalide");m.put("Invalid access token: {0}", "Jeton d'accès invalide : {0}");m.put("Invalid credentials", "Identifiants invalides");@@ -1726,7 +1725,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Job Properties", "Propriétés de tâche");m.put("Job Properties Bean", "Propriétés de tâche Bean");m.put("Job Property", "Propriété de tâche");- m.put("Job Requirement", "Exigence de tâche");m.put("Job Secret", "Secret de tâche");m.put("Job Secret Edit Bean", "Modifier le secret de tâche Bean");m.put("Job Secrets", "Secrets de tâche");@@ -1848,6 +1846,7 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","Jeton de rafraîchissement longue durée du compte ci-dessus qui sera utilisé pour générer un jeton d'accès pour accéder au serveur de messagerie Office 365. <b class='text-info'>CONSEILS : </b> vous pouvez utiliser le bouton à droite de ce champ pour vous connecter à votre compte Office 365 et générer un jeton de rafraîchissement. Notez que chaque fois que l'identifiant du locataire, l'identifiant client, le secret client ou le nom principal de l'utilisateur est modifié, le jeton de rafraîchissement doit être régénéré");m.put("Longest Duration First", "Durée la Plus Longue en Premier");+ m.put("Looks like a GPG signature but without necessary data", "Ressemble à une signature GPG mais sans les données nécessaires");m.put("Low", "Faible");m.put("Low Severity", "Gravité Faible");m.put("MERGED", "FUSIONNÉ");@@ -2064,7 +2063,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("No diffs", "Aucune différence");m.put("No diffs to navigate", "Aucune différence à naviguer");m.put("No directories to skip", "Aucun répertoire à ignorer");- m.put("No executors defined. Jobs will use auto-discovered executor", "Aucun exécuteur défini. Les tâches utiliseront l'exécuteur découvert automatiquement");m.put("No external authenticator", "Aucun authentificateur externe");m.put("No fields to prompt", "Aucun champ à demander");m.put("No fields to remove", "Aucun champ à supprimer");@@ -2129,6 +2127,7 @@ public class Translation_fr extends TranslationResourceBundle {m.put("None", "Aucun");m.put("Not Active Since", "Non actif depuis");m.put("Not Used Since", "Non utilisé depuis");+ m.put("Not a verified email of signing GPG key", "Pas un email vérifié de la clé GPG de signature");m.put("Not a verified email of signing ssh key owner", "Pas un email vérifié du propriétaire de la clé ssh de signature");m.put("Not assigned", "Non assigné");m.put("Not authorized to create project under \"{0}\"", "Non autorisé à créer un projet sous \"{0}\"");@@ -2294,8 +2293,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "Spécifiez éventuellement des arguments pour exécuter l'image ci-dessus.");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","Spécifiez éventuellement des artefacts à récupérer de la dépendance dans <a href='https://docs.onedev.io/concepts#job-workspace'>l'espace de travail de la tâche</a>. Seuls les artefacts publiés (via l'étape de publication d'artefacts) peuvent être récupérés. Laissez vide pour ne récupérer aucun artefact.");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "Spécifiez éventuellement un exécuteur autorisé pour cette tâche. Laissez vide pour utiliser le premier exécuteur applicable (ou utilisez l'exécuteur auto-découvert si aucun exécuteur n'est défini).");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","Spécifiez éventuellement les rôles autorisés à appuyer sur ce bouton. Si non spécifié, tous les utilisateurs sont autorisés.");m.put("Optionally specify base query of the list", "Spécifiez éventuellement la requête de base de la liste.");@@ -2344,7 +2341,6 @@ public class Translation_fr extends TranslationResourceBundle {"Spécifiez éventuellement les problèmes applicables à cette transition. Laissez vide pour tous les problèmes.");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","Spécifiez éventuellement les problèmes applicables à cette transition. Laissez vide pour tous les problèmes.");- m.put("Optionally specify job requirement of this executor", "Spécifiez éventuellement les exigences de tâche de cet exécuteur.");m.put("Optionally specify jobs allowed to use this script", "Spécifiez éventuellement les tâches autorisées à utiliser ce script.");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","Spécifiez éventuellement la limite de mémoire pour chaque tâche/service utilisant cet exécuteur. Consultez <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>la gestion des ressources Kubernetes</a> pour plus de détails.");@@ -3185,6 +3181,7 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "Signature vérifiée avec succès avec la clé GPG du tagger");m.put("Signature verified successfully with tagger's SSH key", "Signature vérifiée avec succès avec la clé SSH du tagger");m.put("Signature verified successfully with trusted GPG key", "Signature vérifiée avec succès avec une clé GPG de confiance");+ m.put("Signed with an unknown GPG key ", "Signé avec une clé GPG inconnue");m.put("Signed with an unknown ssh key", "Signé avec une clé ssh inconnue");m.put("Signer Email Addresses", "Adresses email du signataire");m.put("Signing Key ID", "ID de clé de signature");@@ -3194,7 +3191,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Single sign on via discord.com", "Authentification unique via discord.com");m.put("Single sign on via twitch.tv", "Authentification unique via twitch.tv");m.put("Site", "Site");- m.put("Site Publish Enabled", "Publication du site activée");m.put("Size", "Taille");m.put("Size invalid", "Taille invalide");m.put("Slack Notifications", "Notifications Slack");@@ -3768,10 +3764,6 @@ public class Translation_fr extends TranslationResourceBundle {"Cet exécuteur exécute des tâches de construction en tant que conteneurs Docker sur des machines distantes via <a href='/~administration/agents' target='_blank'>agents</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Cet exécuteur exécute des tâches de construction en tant que pods dans un cluster Kubernetes. Aucun agent n'est requis.<b class='text-danger'>Remarque :</b> Assurez-vous que l'URL du serveur est correctement spécifiée dans les paramètres système, car les pods de tâches doivent y accéder pour télécharger les sources et les artefacts");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "Cet exécuteur exécute des tâches de construction avec la fonctionnalité shell du serveur OneDev.<br><b class='text-danger'>AVERTISSEMENT</b> : Les tâches exécutées avec cet exécuteur ont les mêmes permissions que le processus du serveur OneDev. Assurez-vous qu'il ne peut être utilisé que par des tâches de confiance via le paramètre de requête de tâche");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "Cet exécuteur exécute des tâches de construction avec la fonctionnalité shell des machines distantes via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>AVERTISSEMENT</b> : Les tâches exécutées avec cet exécuteur ont les mêmes permissions que le processus de l'agent correspondant. Assurez-vous qu'il ne peut être utilisé que par des tâches de confiance via le paramètre de requête de tâche");m.put("This field is required", "Ce champ est requis");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Ce filtre est utilisé pour déterminer l'entrée LDAP de l'utilisateur actuel. Par exemple : <i>(&(uid={0})(objectclass=person))</i>. Dans cet exemple, <i>{0}</i> représente le nom de connexion de l'utilisateur actuel.");@@ -4206,8 +4198,6 @@ public class Translation_fr extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","Si ce champ doit être inclus lors de l'ouverture initiale de l'issue ou non. Sinon, vous pouvez inclure ce champ plus tard lorsque l'issue est transité vers d'autres états via une règle de transition d'issue");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "Si le temps estimé/dépensé doit être saisi et affiché uniquement en heures/minutes ou non");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "Si le docker sock doit être monté dans le conteneur de job pour prendre en charge les opérations docker dans les commandes de job ou non<br><b class='text-danger'>AVERTISSEMENT</b> : Les jobs malveillants peuvent prendre le contrôle de l'ensemble de OneDev en opérant le docker sock monté. Vous devez configurer l'exigence de job ci-dessus pour vous assurer que l'exécuteur ne peut être utilisé que par des jobs de confiance si cette option est activée");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","Si les mappages de tags doivent être pré-remplis dans la page suivante ou non. Vous pouvez vouloir désactiver cela s'il y a trop de tags à afficher");m.put("Whether or not to require this dependency to be successful", "Si cette dépendance doit être réussie ou non");@@ -4363,6 +4353,7 @@ public class Translation_fr extends TranslationResourceBundle {m.put("issue:Number", "Numéro");m.put("issues", "problèmes");m.put("job", "travail");+ m.put("key ID: ", "ID de clé :");m.put("lines", "lignes");m.put("link:Multiple", "Multiple");m.put("log", "journal");@@ -4502,12 +4493,22 @@ public class Translation_fr extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "Erreur de vérification de la signature GPG");- m.put("Invalid GPG signature", "Signature GPG invalide");- m.put("Looks like a GPG signature but without necessary data", "Ressemble à une signature GPG mais sans les données nécessaires");- m.put("Not a verified email of signing GPG key", "Pas un email vérifié de la clé GPG de signature");- m.put("Signed with an unknown GPG key ", "Signé avec une clé GPG inconnue");- m.put("key ID: ", "ID de clé :");+ m.put("Enable Html Report Publish", "Activer la publication du rapport Html");+ m.put("Enable Site Publish", "Activer la publication du site");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "Activez cette option pour permettre l'exécution de l'étape de publication du rapport html. Pour éviter les attaques XSS, assurez-vous que cet exécuteur ne peut être utilisé que par des travaux de confiance");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "Aucun exécuteur défini. Les travaux utiliseront des exécuteurs découverts automatiquement à la place");+ m.put("Optionally specify applicable jobs of this executor", "Spécifiez éventuellement les travaux applicables à cet exécuteur");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "Spécifiez éventuellement un exécuteur pour ce travail. Laissez vide pour utiliser l'exécuteur découvert automatiquement");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "Spécifiez éventuellement un exécuteur pour ce travail. Laissez vide pour utiliser le premier exécuteur applicable");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "Cet exécuteur exécute des travaux de construction avec la fonctionnalité shell du serveur OneDev.<br><b class='text-danger'>AVERTISSEMENT</b> : Les travaux exécutés avec cet exécuteur ont les mêmes permissions que le processus du serveur OneDev. Assurez-vous qu'il ne peut être utilisé que par des travaux de confiance");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "Cet exécuteur exécute des travaux de construction avec la fonctionnalité shell des machines distantes via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>AVERTISSEMENT</b> : Les travaux exécutés avec cet exécuteur ont les mêmes permissions que le processus de l'agent OneDev. Assurez-vous qu'il ne peut être utilisé que par des travaux de confiance");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "Monter ou non le socket docker dans le conteneur de travail pour prendre en charge les opérations docker dans les commandes de travail<br><b class='text-danger'>AVERTISSEMENT</b> : Des travaux malveillants peuvent prendre le contrôle de l'ensemble de OneDev en opérant sur le socket docker monté. Assurez-vous que cet exécuteur ne peut être utilisé que par des travaux de confiance si cette option est activée");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.javaindex 584f3d14f8..d11dcd923d 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java@@ -1119,8 +1119,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "Abilita questa opzione se il token di accesso ha gli stessi permessi del proprietario");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","Abilita questa opzione per unire automaticamente la pull request quando pronta (tutti i revisori hanno approvato, tutti i lavori richiesti sono passati, ecc.)");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "Abilita questa opzione per consentire l'esecuzione del passaggio di pubblicazione del report HTML. Per evitare attacchi XSS, assicurati che questo executor possa essere utilizzato solo da lavori fidati");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","Abilita questa opzione per consentire l'esecuzione del passaggio di pubblicazione del sito. OneDev servirà i file del sito del progetto così come sono. Per evitare attacchi XSS, assicurati che questo executor possa essere utilizzato solo da lavori fidati");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_it extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "Errore nella validazione del messaggio di commit di \"{0}\": {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","Errore nella validazione del messaggio di commit di <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}");+ m.put("Error verifying GPG signature", "Errore nella verifica della firma GPG");m.put("Estimated Time", "Tempo Stimato");m.put("Estimated Time Edit Bean", "Bean di Modifica del Tempo Stimato");m.put("Estimated Time Issue Field", "Campo Problema Tempo Stimato");@@ -1460,7 +1459,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Hours Per Day", "Ore al giorno");m.put("How to Publish", "Come pubblicare");m.put("Html Report", "Report HTML");- m.put("Html Report Publish Enabled", "Pubblicazione del report HTML abilitata");m.put("Http Method", "Metodo Http");m.put("I didn't eat it. I swear!", "Non l'ho mangiato. Lo giuro!");m.put("ID token was expired", "Il token ID è scaduto");@@ -1582,6 +1580,7 @@ public class Translation_it extends TranslationResourceBundle {"Accesso alla shell web interattiva per i lavori in esecuzione è una funzionalità aziendale. <a href='https://onedev.io/pricing' target='_blank'>Prova gratis</a> per 30 giorni");m.put("Internal Database", "Database Interno");m.put("Interpreter", "Interprete");+ m.put("Invalid GPG signature", "Firma GPG non valida");m.put("Invalid PCRE syntax", "Sintassi PCRE non valida");m.put("Invalid access token: {0}", "Token di accesso non valido: {0}");m.put("Invalid credentials", "Credenziali non valide");@@ -1726,7 +1725,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Job Properties", "Proprietà Lavoro");m.put("Job Properties Bean", "Bean Proprietà Lavoro");m.put("Job Property", "Proprietà Lavoro");- m.put("Job Requirement", "Requisito Lavoro");m.put("Job Secret", "Segreto Lavoro");m.put("Job Secret Edit Bean", "Modifica Bean Segreto Lavoro");m.put("Job Secrets", "Segreti Lavoro");@@ -1848,6 +1846,7 @@ public class Translation_it extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","Token di aggiornamento a lunga durata dell'account sopra che verrà utilizzato per generare token di accesso per accedere al server di posta di Office 365. <b class='text-info'>CONSIGLI: </b> puoi utilizzare il pulsante sul lato destro di questo campo per accedere al tuo account Office 365 e generare il token di aggiornamento. Nota che ogni volta che l'id tenant, l'id client, il segreto client o il nome principale dell'utente vengono modificati, il token di aggiornamento deve essere rigenerato");m.put("Longest Duration First", "Durata più lunga prima");+ m.put("Looks like a GPG signature but without necessary data", "Sembra una firma GPG ma senza i dati necessari");m.put("Low", "Basso");m.put("Low Severity", "Gravità Bassa");m.put("MERGED", "UNITO");@@ -2064,7 +2063,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("No diffs", "Nessuna differenza");m.put("No diffs to navigate", "Nessuna differenza da navigare");m.put("No directories to skip", "Nessuna directory da saltare");- m.put("No executors defined. Jobs will use auto-discovered executor", "Nessun esecutore definito. I lavori utilizzeranno l'esecutore auto-scoperto");m.put("No external authenticator", "Nessun autenticatore esterno");m.put("No fields to prompt", "Nessun campo da richiedere");m.put("No fields to remove", "Nessun campo da rimuovere");@@ -2129,6 +2127,7 @@ public class Translation_it extends TranslationResourceBundle {m.put("None", "Nessuno");m.put("Not Active Since", "Non attivo da");m.put("Not Used Since", "Non utilizzato da");+ m.put("Not a verified email of signing GPG key", "Email non verificata della chiave GPG di firma");m.put("Not a verified email of signing ssh key owner", "Email non verificata del proprietario della chiave ssh di firma");m.put("Not assigned", "Non assegnato");m.put("Not authorized to create project under \"{0}\"", "Non autorizzato a creare un progetto sotto \"{0}\"");@@ -2294,8 +2293,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "Specifica facoltativamente gli argomenti per eseguire l'immagine sopra");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","Specifica facoltativamente gli artefatti da recuperare dalla dipendenza in <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Possono essere recuperati solo artefatti pubblicati (tramite il passaggio di pubblicazione degli artefatti). Lascia vuoto per non recuperare alcun artefatto");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "Specifica facoltativamente l'esecutore autorizzato per questo job. Lascia vuoto per utilizzare il primo esecutore applicabile (o utilizza l'esecutore auto-scoperto se non sono definiti esecutori)");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","Specifica facoltativamente i ruoli autorizzati per premere questo pulsante. Se non specificato, tutti gli utenti sono autorizzati");m.put("Optionally specify base query of the list", "Specifica facoltativamente la query di base della lista");@@ -2344,7 +2341,6 @@ public class Translation_it extends TranslationResourceBundle {"Specifica facoltativamente i problemi applicabili per questa transizione. Lascia vuoto per tutti i problemi");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","Specifica facoltativamente i problemi applicabili per questa transizione. Lascia vuoto per tutti i problemi.");- m.put("Optionally specify job requirement of this executor", "Specifica facoltativamente il requisito del job di questo esecutore");m.put("Optionally specify jobs allowed to use this script", "Specifica facoltativamente i job autorizzati a utilizzare questo script");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","Specifica facoltativamente il limite di memoria per ogni job/servizio che utilizza questo esecutore. Consulta <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>la gestione delle risorse di Kubernetes</a> per i dettagli");@@ -3185,6 +3181,7 @@ public class Translation_it extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "Firma verificata con successo con la chiave GPG del tagger");m.put("Signature verified successfully with tagger's SSH key", "Firma verificata con successo con la chiave SSH del tagger");m.put("Signature verified successfully with trusted GPG key", "Firma verificata con successo con la chiave GPG fidata");+ m.put("Signed with an unknown GPG key ", "Firmato con una chiave GPG sconosciuta");m.put("Signed with an unknown ssh key", "Firmato con una chiave ssh sconosciuta");m.put("Signer Email Addresses", "Indirizzi email del firmatario");m.put("Signing Key ID", "ID della chiave di firma");@@ -3194,7 +3191,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Single sign on via discord.com", "Single Sign-On tramite discord.com");m.put("Single sign on via twitch.tv", "Single Sign-On tramite twitch.tv");m.put("Site", "Sito");- m.put("Site Publish Enabled", "Pubblicazione del sito abilitata");m.put("Size", "Dimensione");m.put("Size invalid", "Dimensione non valida");m.put("Slack Notifications", "Notifiche Slack");@@ -3768,10 +3764,6 @@ public class Translation_it extends TranslationResourceBundle {"Questo executor esegue i lavori di build come container docker su macchine remote tramite <a href='/~administration/agents' target='_blank'>agenti</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Questo executor esegue i lavori di build come pod in un cluster Kubernetes. Non sono richiesti agenti.<b class='text-danger'>Nota:</b> Assicurati che l'URL del server sia specificato correttamente nelle impostazioni di sistema poiché i pod di lavoro devono accedervi per scaricare sorgenti e artefatti");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "Questo executor esegue i lavori di build utilizzando la funzionalità shell del server OneDev.<br><b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo executor hanno gli stessi permessi del processo del server OneDev. Assicurati che possa essere utilizzato solo da lavori affidabili tramite l'impostazione dei requisiti del lavoro");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "Questo executor esegue i lavori di build utilizzando la funzionalità shell delle macchine remote tramite <a href='/~administration/agents' target='_blank'>agenti</a><br><b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo executor hanno gli stessi permessi del processo dell'agente corrispondente. Assicurati che possa essere utilizzato solo da lavori affidabili tramite l'impostazione dei requisiti del lavoro");m.put("This field is required", "Questo campo è obbligatorio");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Questo filtro viene utilizzato per determinare la voce LDAP per l'utente corrente. Ad esempio: <i>(&(uid={0})(objectclass=person))</i>. In questo esempio, <i>{0}</i> rappresenta il nome di login dell'utente corrente.");@@ -4206,8 +4198,6 @@ public class Translation_it extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","Se includere questo campo quando il problema è inizialmente aperto o meno. In caso contrario, puoi includere questo campo successivamente quando il problema viene transitato ad altri stati tramite regola di transizione del problema");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "Se inserire e visualizzare il tempo stimato/speso solo in ore/minuti o meno");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "Se montare il socket docker nel container di lavoro per supportare le operazioni docker nei comandi di lavoro o meno<br><b class='text-danger'>AVVERTIMENTO</b>: I lavori dannosi possono prendere il controllo di tutto OneDev operando il socket docker montato. Dovresti configurare il requisito del lavoro sopra per assicurarti che l'esecutore possa essere utilizzato solo da lavori fidati se questa opzione è abilitata");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","Se pre-popolare le mappature dei tag nella pagina successiva o meno. Potresti voler disabilitare questo se ci sono troppi tag da visualizzare");m.put("Whether or not to require this dependency to be successful", "Se richiedere che questa dipendenza abbia successo o meno");@@ -4363,6 +4353,7 @@ public class Translation_it extends TranslationResourceBundle {m.put("issue:Number", "Numero");m.put("issues", "problemi");m.put("job", "lavoro");+ m.put("key ID: ", "ID chiave:");m.put("lines", "righe");m.put("link:Multiple", "Multiplo");m.put("log", "log");@@ -4502,12 +4493,22 @@ public class Translation_it extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "Errore nella verifica della firma GPG");- m.put("Invalid GPG signature", "Firma GPG non valida");- m.put("Looks like a GPG signature but without necessary data", "Sembra una firma GPG ma senza i dati necessari");- m.put("Not a verified email of signing GPG key", "Email non verificata della chiave GPG di firma");- m.put("Signed with an unknown GPG key ", "Firmato con una chiave GPG sconosciuta");- m.put("key ID: ", "ID chiave:");+ m.put("Enable Html Report Publish", "Abilita Pubblicazione Report Html");+ m.put("Enable Site Publish", "Abilita Pubblicazione Sito");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "Abilita questa opzione per consentire l'esecuzione del passaggio di pubblicazione del report html. Per evitare attacchi XSS, assicurati che questo executor possa essere utilizzato solo da lavori fidati");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "Nessun executor definito. I lavori utilizzeranno executor rilevati automaticamente");+ m.put("Optionally specify applicable jobs of this executor", "Specifica facoltativamente i lavori applicabili di questo executor");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "Specifica facoltativamente l'executor per questo lavoro. Lascia vuoto per utilizzare l'executor rilevato automaticamente");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "Specifica facoltativamente l'executor per questo lavoro. Lascia vuoto per utilizzare il primo executor applicabile");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "Questo executor esegue lavori di build con la funzionalità shell del server OneDev.<br><b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo executor hanno gli stessi permessi del processo del server OneDev. Assicurati che possa essere utilizzato solo da lavori fidati");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "Questo executor esegue lavori di build con la funzionalità shell di macchine remote tramite <a href='/~administration/agents' target='_blank'>agenti</a><br><b class='text-danger'>ATTENZIONE</b>: I lavori eseguiti con questo executor hanno gli stessi permessi del processo dell'agente OneDev. Assicurati che possa essere utilizzato solo da lavori fidati");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "Se montare o meno il socket docker nel container del lavoro per supportare le operazioni docker nei comandi del lavoro<br><b class='text-danger'>ATTENZIONE</b>: I lavori dannosi possono prendere il controllo dell'intero OneDev operando sul socket docker montato. Assicurati che questo executor possa essere utilizzato solo da lavori fidati se questa opzione è abilitata");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.javaindex d05abcbd83..5decfa21c1 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java@@ -1119,8 +1119,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "アクセス トークンが所有者と同じ権限を持つ場合にこれを有効にする");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","このオプションを有効にすると、準備が整ったときにプルリクエストを自動的にマージできます (すべてのレビューアが承認し、すべての必要なジョブが成功するなど)");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "HTMLレポート公開ステップを実行できるようにするにはこれを有効にします。XSS攻撃を防ぐため、このエグゼキュータが信頼できるジョブでのみ使用されることを確認してください");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","サイト公開ステップを実行できるようにするにはこれを有効にします。OneDevはプロジェクトサイトファイルをそのまま提供します。XSS攻撃を防ぐため、このエグゼキュータが信頼できるジョブでのみ使用されることを確認してください");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "\"{0}\"のコミットメッセージの検証中にエラーが発生しました: {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","<a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>のコミットメッセージの検証中にエラーが発生しました: {2}");+ m.put("Error verifying GPG signature", "GPG署名の検証エラー");m.put("Estimated Time", "推定時間");m.put("Estimated Time Edit Bean", "推定時間編集Bean");m.put("Estimated Time Issue Field", "推定時間問題フィールド");@@ -1460,7 +1459,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Hours Per Day", "1日あたりの時間");m.put("How to Publish", "公開方法");m.put("Html Report", "HTMLレポート");- m.put("Html Report Publish Enabled", "HTMLレポート公開を有効化");m.put("Http Method", "HTTPメソッド");m.put("I didn't eat it. I swear!", "私は食べていません。誓います!");m.put("ID token was expired", "IDトークンが期限切れです");@@ -1582,6 +1580,7 @@ public class Translation_ja extends TranslationResourceBundle {"実行中のジョブへのインタラクティブなウェブシェルアクセスはエンタープライズ機能です。<a href='https://onedev.io/pricing' target='_blank'>30日間無料でお試しください</a>");m.put("Internal Database", "内部データベース");m.put("Interpreter", "インタープリター");+ m.put("Invalid GPG signature", "無効なGPG署名");m.put("Invalid PCRE syntax", "無効なPCRE構文");m.put("Invalid access token: {0}", "無効なアクセス トークン: {0}");m.put("Invalid credentials", "無効な資格情報");@@ -1726,7 +1725,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Job Properties", "ジョブプロパティ");m.put("Job Properties Bean", "ジョブプロパティビーン");m.put("Job Property", "ジョブプロパティ");- m.put("Job Requirement", "ジョブ要件");m.put("Job Secret", "ジョブシークレット");m.put("Job Secret Edit Bean", "ジョブシークレット編集ビーン");m.put("Job Secrets", "ジョブシークレット一覧");@@ -1848,6 +1846,7 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","上記アカウントの長期リフレッシュトークンは、Office 365メールサーバーにアクセスするためのアクセストークンを生成するために使用されます。<b class='text-info'>ヒント: </b>このフィールドの右側にあるボタンを使用してOffice 365アカウントにログインし、リフレッシュトークンを生成できます。テナントID、クライアントID、クライアントシークレット、またはユーザープリンシパル名が変更された場合は、リフレッシュトークンを再生成する必要があります");m.put("Longest Duration First", "最長期間優先");+ m.put("Looks like a GPG signature but without necessary data", "必要なデータがないGPG署名のようです");m.put("Low", "低い");m.put("Low Severity", "低い重大度");m.put("MERGED", "マージ済み");@@ -2064,7 +2063,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("No diffs", "差分なし");m.put("No diffs to navigate", "ナビゲートする差分なし");m.put("No directories to skip", "スキップするディレクトリなし");- m.put("No executors defined. Jobs will use auto-discovered executor", "エグゼキュータが定義されていません。ジョブは自動検出されたエグゼキュータを使用します");m.put("No external authenticator", "外部認証機関なし");m.put("No fields to prompt", "プロンプトするフィールドなし");m.put("No fields to remove", "削除するフィールドなし");@@ -2129,6 +2127,7 @@ public class Translation_ja extends TranslationResourceBundle {m.put("None", "なし");m.put("Not Active Since", "以降アクティブではありません");m.put("Not Used Since", "以降使用されていません");+ m.put("Not a verified email of signing GPG key", "署名GPGキーの確認済みメールではありません");m.put("Not a verified email of signing ssh key owner", "署名sshキー所有者の確認済みメールではありません");m.put("Not assigned", "未割り当て");m.put("Not authorized to create project under \"{0}\"", "\"{0}\"の下にプロジェクトを作成する権限がありません");@@ -2294,8 +2293,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "オプションで、上記のイメージを実行するための引数を指定してください。");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","オプションで、依存関係から<a href='https://docs.onedev.io/concepts#job-workspace'>ジョブワークスペース</a>に取得するアーティファクトを指定してください。公開されたアーティファクト(アーティファクト公開ステップを介して)だけが取得可能です。アーティファクトを取得しない場合は空のままにしてください。");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "オプションで、このジョブの認証済みエグゼキューターを指定してください。最初に適用可能なエグゼキューターを使用する場合は空のままにしてください(またはエグゼキューターが定義されていない場合は自動検出されたエグゼキューターを使用します)。");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","オプションで、このボタンを押すための認証済みロールを指定してください。指定されていない場合、すべてのユーザーが許可されます。");m.put("Optionally specify base query of the list", "オプションで、リストの基本クエリを指定してください。");@@ -2344,7 +2341,6 @@ public class Translation_ja extends TranslationResourceBundle {"オプションで、この遷移に適用される課題を指定してください。すべての課題に適用する場合は空のままにしてください。");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","オプションで、この遷移に適用される課題を指定してください。すべての課題に適用する場合は空のままにしてください。");- m.put("Optionally specify job requirement of this executor", "オプションで、このエグゼキューターのジョブ要件を指定してください。");m.put("Optionally specify jobs allowed to use this script", "オプションで、このスクリプトを使用することが許可されているジョブを指定してください。");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","オプションで、このエグゼキューターを使用する各ジョブ/サービスのメモリ制限を指定してください。詳細については<a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetesリソース管理</a>を確認してください。");@@ -3185,6 +3181,7 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "タグ付け者のGPGキーで署名が正常に検証されました");m.put("Signature verified successfully with tagger's SSH key", "タグ付け者のSSHキーで署名が正常に検証されました");m.put("Signature verified successfully with trusted GPG key", "信頼されたGPGキーで署名が正常に検証されました");+ m.put("Signed with an unknown GPG key ", "不明なGPGキーで署名されています");m.put("Signed with an unknown ssh key", "未知のsshキーで署名されました");m.put("Signer Email Addresses", "署名者のメールアドレス");m.put("Signing Key ID", "署名キーID");@@ -3194,7 +3191,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Single sign on via discord.com", "discord.comを介したシングルサインオン");m.put("Single sign on via twitch.tv", "twitch.tvを介したシングルサインオン");m.put("Site", "サイト");- m.put("Site Publish Enabled", "サイト公開が有効");m.put("Size", "サイズ");m.put("Size invalid", "サイズが無効");m.put("Slack Notifications", "Slack通知");@@ -3768,10 +3764,6 @@ public class Translation_ja extends TranslationResourceBundle {"このエグゼキュータは、<a href='/~administration/agents' target='_blank'>エージェント</a>を介してリモートマシン上でDockerコンテナとしてビルドジョブを実行します");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","このエグゼキュータは、Kubernetesクラスター内のPodとしてビルドジョブを実行します。エージェントは不要です。<b class='text-danger'>注意:</b> ジョブPodがソースやアーティファクトをダウンロードするためにサーバーURLがシステム設定で正しく指定されていることを確認してください");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "このエグゼキュータは、OneDevサーバーのシェル機能を使用してビルドジョブを実行します。<br><b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブは、OneDevサーバープロセスと同じ権限を持ちます。ジョブ要件設定を通じて信頼できるジョブのみが使用できるようにしてください");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "このエグゼキュータは、<a href='/~administration/agents' target='_blank'>エージェント</a>を介してリモートマシンのシェル機能を使用してビルドジョブを実行します<br><b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブは、対応するエージェントプロセスと同じ権限を持ちます。ジョブ要件設定を通じて信頼できるジョブのみが使用できるようにしてください");m.put("This field is required", "このフィールドは必須です");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","このフィルターは現在のユーザーのLDAPエントリを決定するために使用されます。例: <i>(&(uid={0})(objectclass=person))</i>。この例では、<i>{0}</i>は現在のユーザーのログイン名を表します");@@ -4206,8 +4198,6 @@ public class Translation_ja extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","課題が最初に開かれたときにこのフィールドを含めるかどうか。含めない場合は、課題が課題遷移ルールを介して他の状態に遷移したときに後でこのフィールドを含めることができます");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "推定時間/消費時間を時間/分単位でのみ入力および表示するかどうか");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "ジョブコンテナにDockerソックをマウントしてジョブコマンドでDocker操作をサポートするかどうか<br><b class='text-danger'>警告</b>: 悪意のあるジョブがマウントされたDockerソックを操作することでOneDev全体を制御する可能性があります。このオプションを有効にする場合は、上記のジョブ要件を構成して、信頼できるジョブのみがエグゼキューターを使用できるようにする必要があります");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","次のページでタグマッピングを事前入力するかどうか。表示するタグが多すぎる場合はこれを無効にすることをお勧めします");m.put("Whether or not to require this dependency to be successful", "この依存関係が成功する必要があるかどうか");@@ -4363,6 +4353,7 @@ public class Translation_ja extends TranslationResourceBundle {m.put("issue:Number", "番号");m.put("issues", "課題");m.put("job", "ジョブ");+ m.put("key ID: ", "キーID:");m.put("lines", "行");m.put("link:Multiple", "複数");m.put("log", "ログ");@@ -4502,12 +4493,22 @@ public class Translation_ja extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "GPG署名の検証エラー");- m.put("Invalid GPG signature", "無効なGPG署名");- m.put("Looks like a GPG signature but without necessary data", "必要なデータがないGPG署名のようです");- m.put("Not a verified email of signing GPG key", "署名GPGキーの確認済みメールではありません");- m.put("Signed with an unknown GPG key ", "不明なGPGキーで署名されています");- m.put("key ID: ", "キーID:");+ m.put("Enable Html Report Publish", "HTMLレポート公開を有効化");+ m.put("Enable Site Publish", "サイト公開を有効化");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "HTMLレポート公開ステップを実行できるようにするにはこれを有効化してください。XSS攻撃を防ぐため、このエグゼキュータが信頼できるジョブでのみ使用されることを確認してください");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "エグゼキュータが定義されていません。ジョブは自動検出されたエグゼキュータを使用します");+ m.put("Optionally specify applicable jobs of this executor", "このエグゼキュータに適用可能なジョブを任意で指定してください");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "このジョブのエグゼキュータを任意で指定してください。空欄の場合、自動検出エグゼキュータを使用します");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "このジョブのエグゼキュータを任意で指定してください。空欄の場合、最初に適用可能なエグゼキュータを使用します");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "このエグゼキュータはOneDevサーバーのシェル機能を使用してビルドジョブを実行します。<br><b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブはOneDevサーバープロセスと同じ権限を持ちます。信頼できるジョブでのみ使用されることを確認してください");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "このエグゼキュータは<a href='/~administration/agents' target='_blank'>エージェント</a>を介してリモートマシンのシェル機能を使用してビルドジョブを実行します。<br><b class='text-danger'>警告</b>: このエグゼキュータで実行されるジョブはOneDevエージェントプロセスと同じ権限を持ちます。信頼できるジョブでのみ使用されることを確認してください");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "ジョブコマンドでのDocker操作をサポートするために、Dockerソケットをジョブコンテナにマウントするかどうか<br><b class='text-danger'>警告</b>: 悪意のあるジョブがマウントされたDockerソケットを操作することでOneDev全体を制御する可能性があります。このオプションを有効にする場合、このエグゼキュータが信頼できるジョブでのみ使用されることを確認してください");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.javaindex 93d4221b29..70b51a2b5f 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java@@ -1119,8 +1119,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "액세스 토큰이 소유자와 동일한 권한을 가진 경우 이를 활성화합니다");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","준비되었을 때(모든 리뷰어 승인, 모든 필수 작업 통과 등) 풀 리퀘스트를 자동으로 병합하도록 이 옵션을 활성화합니다");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "HTML 보고서 게시 단계를 실행할 수 있도록 허용하려면 이를 활성화합니다. XSS 공격을 방지하려면 이 실행자가 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","사이트 게시 단계를 실행할 수 있도록 허용하려면 이를 활성화합니다. OneDev는 프로젝트 사이트 파일을 그대로 제공합니다. XSS 공격을 방지하려면 이 실행자가 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "\"{0}\"의 커밋 메시지 유효성 검사 오류: {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","<a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>의 커밋 메시지 유효성 검사 오류: {2}");+ m.put("Error verifying GPG signature", "GPG 서명 확인 오류");m.put("Estimated Time", "예상 시간");m.put("Estimated Time Edit Bean", "예상 시간 편집 빈");m.put("Estimated Time Issue Field", "예상 시간 이슈 필드");@@ -1460,7 +1459,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Hours Per Day", "하루당 시간");m.put("How to Publish", "게시 방법");m.put("Html Report", "HTML 보고서");- m.put("Html Report Publish Enabled", "HTML 보고서 게시 활성화");m.put("Http Method", "Http 메서드");m.put("I didn't eat it. I swear!", "나는 그것을 먹지 않았어. 맹세해!");m.put("ID token was expired", "ID 토큰이 만료되었습니다");@@ -1582,6 +1580,7 @@ public class Translation_ko extends TranslationResourceBundle {"실행 중인 작업에 대한 대화형 웹 셸 액세스는 엔터프라이즈 기능입니다. <a href='https://onedev.io/pricing' target='_blank'>30일 무료 체험</a>");m.put("Internal Database", "내부 데이터베이스");m.put("Interpreter", "인터프리터");+ m.put("Invalid GPG signature", "유효하지 않은 GPG 서명");m.put("Invalid PCRE syntax", "잘못된 PCRE 구문");m.put("Invalid access token: {0}", "잘못된 액세스 토큰: {0}");m.put("Invalid credentials", "잘못된 자격 증명");@@ -1726,7 +1725,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Job Properties", "작업 속성들");m.put("Job Properties Bean", "작업 속성 빈");m.put("Job Property", "작업 속성");- m.put("Job Requirement", "작업 요구사항");m.put("Job Secret", "작업 비밀");m.put("Job Secret Edit Bean", "작업 비밀 편집 빈");m.put("Job Secrets", "작업 비밀들");@@ -1848,6 +1846,7 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","위 계정의 장기 새로 고침 토큰은 Office 365 메일 서버에 액세스하기 위한 액세스 토큰을 생성하는 데 사용됩니다. <b class='text-info'>팁: </b> 이 필드 오른쪽에 있는 버튼을 사용하여 Office 365 계정에 로그인하고 새로 고침 토큰을 생성할 수 있습니다. 테넌트 ID, 클라이언트 ID, 클라이언트 비밀 또는 사용자 주체 이름이 변경될 때마다 새로 고침 토큰을 다시 생성해야 합니다");m.put("Longest Duration First", "가장 긴 지속 시간 우선");+ m.put("Looks like a GPG signature but without necessary data", "필요한 데이터가 없는 GPG 서명처럼 보입니다");m.put("Low", "낮음");m.put("Low Severity", "낮은 심각도");m.put("MERGED", "병합됨");@@ -2064,7 +2063,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("No diffs", "차이 없음");m.put("No diffs to navigate", "탐색할 차이 없음");m.put("No directories to skip", "건너뛸 디렉터리 없음");- m.put("No executors defined. Jobs will use auto-discovered executor", "정의된 실행자가 없습니다. 작업은 자동 검색된 실행자를 사용합니다");m.put("No external authenticator", "외부 인증자 없음");m.put("No fields to prompt", "프롬프트할 필드 없음");m.put("No fields to remove", "제거할 필드 없음");@@ -2129,6 +2127,7 @@ public class Translation_ko extends TranslationResourceBundle {m.put("None", "없음");m.put("Not Active Since", "활성 상태가 아닌 이후");m.put("Not Used Since", "사용되지 않은 이후");+ m.put("Not a verified email of signing GPG key", "GPG 키 서명의 확인된 이메일이 아닙니다");m.put("Not a verified email of signing ssh key owner", "서명 ssh 키 소유자의 확인된 이메일이 아님");m.put("Not assigned", "할당되지 않음");m.put("Not authorized to create project under \"{0}\"", "\"{0}\" 아래에 프로젝트를 생성할 권한이 없습니다.");@@ -2294,8 +2293,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "선택적으로 위 이미지 실행을 위한 인수를 지정하세요.");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","선택적으로 <a href='https://docs.onedev.io/concepts#job-workspace'>작업 워크스페이스</a>로 종속 항목에서 검색할 아티팩트를 지정하세요. 게시된 아티팩트(아티팩트 게시 단계에서 게시된 것)만 검색할 수 있습니다. 아티팩트를 검색하지 않으려면 비워 두세요.");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "선택적으로 이 작업에 대한 권한이 있는 실행자를 지정하세요. 첫 번째 적용 가능한 실행자를 사용하려면 비워 두세요 (또는 실행자가 정의되지 않은 경우 자동 검색된 실행자를 사용하세요).");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","선택적으로 이 버튼을 누를 수 있는 권한이 있는 역할을 지정하세요. 지정하지 않으면 모든 사용자가 허용됩니다.");m.put("Optionally specify base query of the list", "선택적으로 목록의 기본 쿼리를 지정하세요.");@@ -2344,7 +2341,6 @@ public class Translation_ko extends TranslationResourceBundle {"선택적으로 이 전환에 적용 가능한 문제를 지정하세요. 모든 문제를 지정하려면 비워 두세요.");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","선택적으로 이 전환에 적용 가능한 문제를 지정하세요. 모든 문제를 지정하려면 비워 두세요.");- m.put("Optionally specify job requirement of this executor", "선택적으로 이 실행자의 작업 요구 사항을 지정하세요.");m.put("Optionally specify jobs allowed to use this script", "선택적으로 이 스크립트를 사용할 수 있는 작업을 지정하세요.");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","선택적으로 이 실행자를 사용하는 각 작업/서비스에 대한 메모리 제한을 지정하세요. 자세한 내용은 <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes 리소스 관리</a>를 참조하세요.");@@ -3185,6 +3181,7 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "태거의 GPG 키로 서명이 성공적으로 확인되었습니다");m.put("Signature verified successfully with tagger's SSH key", "태거의 SSH 키로 서명이 성공적으로 확인되었습니다");m.put("Signature verified successfully with trusted GPG key", "신뢰할 수 있는 GPG 키로 서명이 성공적으로 확인되었습니다");+ m.put("Signed with an unknown GPG key ", "알 수 없는 GPG 키로 서명됨");m.put("Signed with an unknown ssh key", "알 수 없는 ssh 키로 서명됨");m.put("Signer Email Addresses", "서명자 이메일 주소");m.put("Signing Key ID", "서명 키 ID");@@ -3194,7 +3191,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Single sign on via discord.com", "discord.com을 통한 싱글 사인온");m.put("Single sign on via twitch.tv", "twitch.tv를 통한 싱글 사인온");m.put("Site", "사이트");- m.put("Site Publish Enabled", "사이트 게시 활성화됨");m.put("Size", "크기");m.put("Size invalid", "크기가 유효하지 않음");m.put("Slack Notifications", "Slack 알림");@@ -3768,10 +3764,6 @@ public class Translation_ko extends TranslationResourceBundle {"이 실행자는 <a href='/~administration/agents' target='_blank'>에이전트</a>를 통해 원격 머신에서 Docker 컨테이너로 빌드 작업을 실행합니다");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","이 실행자는 Kubernetes 클러스터에서 Pod로 빌드 작업을 실행합니다. 에이전트가 필요하지 않습니다.<b class='text-danger'>참고:</b> 작업 Pod가 소스 및 아티팩트를 다운로드하기 위해 시스템 설정에서 서버 URL이 올바르게 지정되었는지 확인하세요");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "이 실행자는 OneDev 서버의 셸 기능으로 빌드 작업을 실행합니다.<br><b class='text-danger'>경고</b>: 이 실행자로 실행되는 작업은 OneDev 서버 프로세스와 동일한 권한을 가집니다. 작업 요구 사항 설정을 통해 신뢰할 수 있는 작업만 사용할 수 있도록 하세요");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "이 실행자는 <a href='/~administration/agents' target='_blank'>에이전트</a>를 통해 원격 머신의 셸 기능으로 빌드 작업을 실행합니다<br><b class='text-danger'>경고</b>: 이 실행자로 실행되는 작업은 해당 에이전트 프로세스와 동일한 권한을 가집니다. 작업 요구 사항 설정을 통해 신뢰할 수 있는 작업만 사용할 수 있도록 하세요");m.put("This field is required", "이 필드는 필수입니다");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","이 필터는 현재 사용자의 LDAP 항목을 결정하는 데 사용됩니다. 예: <i>(&(uid={0})(objectclass=person))</i>. 이 예에서 <i>{0}</i>는 현재 사용자의 로그인 이름을 나타냅니다.");@@ -4206,8 +4198,6 @@ public class Translation_ko extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","문제가 처음 열릴 때 이 필드를 포함할지 여부. 포함하지 않을 경우, 문제가 다른 상태로 전환될 때 문제 전환 규칙을 통해 나중에 이 필드를 포함할 수 있습니다");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "예상/소요 시간을 시간/분 단위로만 입력하고 표시할지 여부");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "작업 명령에서 Docker 작업을 지원하기 위해 작업 컨테이너에 Docker 소켓을 마운트할지 여부<br><b class='text-danger'>경고</b>: 악성 작업이 마운트된 Docker 소켓을 조작하여 전체 OneDev를 제어할 수 있습니다. 이 옵션이 활성화된 경우, 위의 작업 요구 사항을 구성하여 실행자가 신뢰할 수 있는 작업만 사용할 수 있도록 해야 합니다");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","다음 페이지에서 태그 매핑을 미리 채울지 여부. 표시할 태그가 너무 많을 경우 이 옵션을 비활성화할 수 있습니다");m.put("Whether or not to require this dependency to be successful", "이 종속성이 성공해야 하는지 여부");@@ -4363,6 +4353,7 @@ public class Translation_ko extends TranslationResourceBundle {m.put("issue:Number", "번호");m.put("issues", "이슈들");m.put("job", "작업");+ m.put("key ID: ", "키 ID:");m.put("lines", "라인");m.put("link:Multiple", "다중");m.put("log", "로그");@@ -4502,12 +4493,22 @@ public class Translation_ko extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "GPG 서명 확인 오류");- m.put("Invalid GPG signature", "유효하지 않은 GPG 서명");- m.put("Looks like a GPG signature but without necessary data", "필요한 데이터가 없는 GPG 서명처럼 보입니다");- m.put("Not a verified email of signing GPG key", "GPG 키 서명의 확인된 이메일이 아닙니다");- m.put("Signed with an unknown GPG key ", "알 수 없는 GPG 키로 서명됨");- m.put("key ID: ", "키 ID:");+ m.put("Enable Html Report Publish", "HTML 보고서 게시 활성화");+ m.put("Enable Site Publish", "사이트 게시 활성화");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "HTML 보고서 게시 단계를 실행할 수 있도록 활성화합니다. XSS 공격을 방지하려면 이 실행자가 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "정의된 실행자가 없습니다. 작업은 자동으로 검색된 실행자를 대신 사용합니다");+ m.put("Optionally specify applicable jobs of this executor", "선택적으로 이 실행자에 적용 가능한 작업을 지정합니다");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "선택적으로 이 작업에 대한 실행자를 지정합니다. 비워두면 자동 검색된 실행자를 사용합니다");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "선택적으로 이 작업에 대한 실행자를 지정합니다. 비워두면 첫 번째 적용 가능한 실행자를 사용합니다");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "이 실행자는 OneDev 서버의 셸 기능을 사용하여 빌드 작업을 실행합니다.<br><b class='text-danger'>경고</b>: 이 실행자를 사용하는 작업은 OneDev 서버 프로세스와 동일한 권한을 가집니다. 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "이 실행자는 <a href='/~administration/agents' target='_blank'>에이전트</a>를 통해 원격 머신의 셸 기능을 사용하여 빌드 작업을 실행합니다<br><b class='text-danger'>경고</b>: 이 실행자를 사용하는 작업은 OneDev 에이전트 프로세스와 동일한 권한을 가집니다. 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "작업 명령에서 도커 작업을 지원하기 위해 도커 소켓을 작업 컨테이너에 마운트할지 여부<br><b class='text-danger'>경고</b>: 악의적인 작업은 마운트된 도커 소켓을 조작하여 전체 OneDev를 제어할 수 있습니다. 이 옵션이 활성화된 경우 이 실행자가 신뢰할 수 있는 작업에서만 사용되도록 해야 합니다");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.javaindex f56db997e9..9d46e052f6 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java@@ -1119,8 +1119,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Enable this if the access token has same permissions as the owner", "Habilitar isto se o token de acesso tiver as mesmas permissões que o proprietário");m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)","Habilitar esta opção para mesclar automaticamente o pull request quando estiver pronto (todos os revisores aprovados, todos os trabalhos necessários concluídos, etc.)");- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",- "Habilitar isto para permitir a execução da etapa de publicação de relatório HTML. Para evitar ataques XSS, certifique-se de que este executor só possa ser usado por trabalhos confiáveis");m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs","Habilitar isto para permitir a execução da etapa de publicação de site. O OneDev servirá os arquivos do site do projeto como estão. Para evitar ataques XSS, certifique-se de que este executor só possa ser usado por trabalhos confiáveis");m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",@@ -1165,6 +1163,7 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "Erro ao validar mensagem de commit de \"{0}\": {1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","Erro ao validar mensagem de commit de <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}");+ m.put("Error verifying GPG signature", "Erro ao verificar assinatura GPG");m.put("Estimated Time", "Tempo Estimado");m.put("Estimated Time Edit Bean", "Editar Bean de Tempo Estimado");m.put("Estimated Time Issue Field", "Campo de Problema de Tempo Estimado");@@ -1460,7 +1459,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Hours Per Day", "Horas Por Dia");m.put("How to Publish", "Como Publicar");m.put("Html Report", "Relatório Html");- m.put("Html Report Publish Enabled", "Publicação de Relatório Html Habilitada");m.put("Http Method", "Método Http");m.put("I didn't eat it. I swear!", "Eu não comi. Eu juro!");m.put("ID token was expired", "Token de ID expirou");@@ -1582,6 +1580,7 @@ public class Translation_pt extends TranslationResourceBundle {"Acesso ao shell web interativo para trabalhos em execução é um recurso empresarial. <a href='https://onedev.io/pricing' target='_blank'>Experimente grátis</a> por 30 dias");m.put("Internal Database", "Banco de Dados Interno");m.put("Interpreter", "Interpretador");+ m.put("Invalid GPG signature", "Assinatura GPG inválida");m.put("Invalid PCRE syntax", "Sintaxe PCRE inválida");m.put("Invalid access token: {0}", "Token de acesso inválido: {0}");m.put("Invalid credentials", "Credenciais inválidas");@@ -1726,7 +1725,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Job Properties", "Propriedades de Job");m.put("Job Properties Bean", "Bean de Propriedades de Job");m.put("Job Property", "Propriedade de Job");- m.put("Job Requirement", "Requisito de Job");m.put("Job Secret", "Segredo de Job");m.put("Job Secret Edit Bean", "Editar Bean de Segredo de Job");m.put("Job Secrets", "Segredos de Job");@@ -1848,6 +1846,7 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","Token de atualização de longa duração da conta acima que será usado para gerar token de acesso ao servidor de email do Office 365. <b class='text-info'>DICAS: </b> você pode usar o botão no lado direito deste campo para fazer login na sua conta do Office 365 e gerar o token de atualização. Observe que sempre que o id do locatário, id do cliente, segredo do cliente ou nome principal do usuário for alterado, o token de atualização deve ser regenerado");m.put("Longest Duration First", "Maior Duração Primeiro");+ m.put("Looks like a GPG signature but without necessary data", "Parece uma assinatura GPG, mas sem os dados necessários");m.put("Low", "Baixo");m.put("Low Severity", "Baixa Severidade");m.put("MERGED", "FUNDIDO");@@ -2064,7 +2063,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("No diffs", "Sem diferenças");m.put("No diffs to navigate", "Sem diferenças para navegar");m.put("No directories to skip", "Sem diretórios para ignorar");- m.put("No executors defined. Jobs will use auto-discovered executor", "Nenhum executor definido. Os trabalhos usarão executor descoberto automaticamente");m.put("No external authenticator", "Sem autenticador externo");m.put("No fields to prompt", "Sem campos para solicitar");m.put("No fields to remove", "Sem campos para remover");@@ -2129,6 +2127,7 @@ public class Translation_pt extends TranslationResourceBundle {m.put("None", "Nenhum");m.put("Not Active Since", "Não ativo desde");m.put("Not Used Since", "Não usado desde");+ m.put("Not a verified email of signing GPG key", "Email não verificado da chave GPG de assinatura");m.put("Not a verified email of signing ssh key owner", "Não é um email verificado do proprietário da chave ssh de assinatura");m.put("Not assigned", "Não atribuído");m.put("Not authorized to create project under \"{0}\"", "Não autorizado a criar projeto em \"{0}\"");@@ -2294,8 +2293,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "Opcionalmente especifique argumentos para executar a imagem acima");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","Opcionalmente especifique artefatos para recuperar da dependência no <a href='https://docs.onedev.io/concepts#job-workspace'>espaço de trabalho do trabalho</a>. Apenas artefatos publicados (via etapa de publicação de artefatos) podem ser recuperados. Deixe vazio para não recuperar nenhum artefato");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "Opcionalmente especifique executor autorizado para este trabalho. Deixe vazio para usar o primeiro executor aplicável (ou use o executor descoberto automaticamente se nenhum executor for definido)");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","Opcionalmente especifique funções autorizadas para pressionar este botão. Se não especificado, todos os usuários são permitidos");m.put("Optionally specify base query of the list", "Opcionalmente especifique consulta base da lista");@@ -2344,7 +2341,6 @@ public class Translation_pt extends TranslationResourceBundle {"Opcionalmente especifique problemas aplicáveis para esta transição. Deixe vazio para todos os problemas");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","Opcionalmente especifique problemas aplicáveis para esta transição. Deixe vazio para todos os problemas.");- m.put("Optionally specify job requirement of this executor", "Opcionalmente especifique requisito de trabalho deste executor");m.put("Optionally specify jobs allowed to use this script", "Opcionalmente especifique trabalhos permitidos para usar este script");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","Opcionalmente especifique limite de memória para cada trabalho/serviço usando este executor. Verifique <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>gerenciamento de recursos do Kubernetes</a> para detalhes");@@ -3185,6 +3181,7 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "Assinatura verificada com sucesso com a chave GPG do etiquetador");m.put("Signature verified successfully with tagger's SSH key", "Assinatura verificada com sucesso com a chave SSH do etiquetador");m.put("Signature verified successfully with trusted GPG key", "Assinatura verificada com sucesso com a chave GPG confiável");+ m.put("Signed with an unknown GPG key ", "Assinado com uma chave GPG desconhecida");m.put("Signed with an unknown ssh key", "Assinado com uma chave ssh desconhecida");m.put("Signer Email Addresses", "Endereços de Email do Assinante");m.put("Signing Key ID", "ID da Chave de Assinatura");@@ -3194,7 +3191,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Single sign on via discord.com", "Login único via discord.com");m.put("Single sign on via twitch.tv", "Login único via twitch.tv");m.put("Site", "Site");- m.put("Site Publish Enabled", "Publicação do Site Ativada");m.put("Size", "Tamanho");m.put("Size invalid", "Tamanho inválido");m.put("Slack Notifications", "Notificações do Slack");@@ -3768,10 +3764,6 @@ public class Translation_pt extends TranslationResourceBundle {"Este executor executa trabalhos de build como contêineres Docker em máquinas remotas via <a href='/~administration/agents' target='_blank'>agentes</a>");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","Este executor executa trabalhos de build como pods em um cluster Kubernetes. Nenhum agente é necessário.<b class='text-danger'>Nota:</b> Certifique-se de que a URL do servidor está especificada corretamente nas configurações do sistema, pois os pods de trabalho precisam acessá-la para baixar o código-fonte e os artefatos");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "Este executor executa trabalhos de build com a funcionalidade de shell do servidor OneDev.<br><b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm as mesmas permissões do processo do servidor OneDev. Certifique-se de que ele só pode ser usado por trabalhos confiáveis via configuração de requisitos de trabalho");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "Este executor executa trabalhos de build com a funcionalidade de shell de máquinas remotas via <a href='/~administration/agents' target='_blank'>agentes</a><br><b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm as mesmas permissões do processo do agente correspondente. Certifique-se de que ele só pode ser usado por trabalhos confiáveis via configuração de requisitos de trabalho");m.put("This field is required", "Este campo é obrigatório");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","Este filtro é usado para determinar a entrada LDAP do usuário atual. Por exemplo: <i>(&(uid={0})(objectclass=person))</i>. Neste exemplo, <i>{0}</i> representa o nome de login do usuário atual.");@@ -4206,8 +4198,6 @@ public class Translation_pt extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","Se incluir este campo ao abrir a issue inicialmente ou não. Caso contrário, você pode incluir este campo mais tarde quando a issue for transicionada para outros estados via regra de transição de issue");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "Se inserir e exibir tempo estimado/gasto apenas em horas/minutos ou não");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "Se montar o docker sock no container de job para suportar operações docker nos comandos de job ou não<br><b class='text-danger'>AVISO</b>: Jobs maliciosos podem assumir o controle de todo o OneDev operando o docker sock montado. Você deve configurar o requisito de job acima para garantir que o executor só possa ser usado por jobs confiáveis se esta opção estiver habilitada");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","Se pré-preencher mapeamentos de tags na próxima página ou não. Você pode querer desabilitar isso se houver muitas tags para exibir");m.put("Whether or not to require this dependency to be successful", "Se exigir que esta dependência seja bem-sucedida ou não");@@ -4363,6 +4353,7 @@ public class Translation_pt extends TranslationResourceBundle {m.put("issue:Number", "Número");m.put("issues", "problemas");m.put("job", "tarefa");+ m.put("key ID: ", "ID da chave:");m.put("lines", "linhas");m.put("link:Multiple", "Múltiplo");m.put("log", "log");@@ -4502,12 +4493,22 @@ public class Translation_pt extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");- m.put("Error verifying GPG signature", "Erro ao verificar assinatura GPG");- m.put("Invalid GPG signature", "Assinatura GPG inválida");- m.put("Looks like a GPG signature but without necessary data", "Parece uma assinatura GPG, mas sem os dados necessários");- m.put("Not a verified email of signing GPG key", "Email não verificado da chave GPG de assinatura");- m.put("Signed with an unknown GPG key ", "Assinado com uma chave GPG desconhecida");- m.put("key ID: ", "ID da chave:");+ m.put("Enable Html Report Publish", "Habilitar Publicação de Relatório Html");+ m.put("Enable Site Publish", "Habilitar Publicação de Site");+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",+ "Habilite isso para permitir a execução da etapa de publicação de relatório html. Para evitar ataques XSS, certifique-se de que este executor só possa ser usado por trabalhos confiáveis");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "Nenhum executor definido. Os trabalhos usarão executores descobertos automaticamente");+ m.put("Optionally specify applicable jobs of this executor", "Opcionalmente, especifique os trabalhos aplicáveis deste executor");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "Opcionalmente, especifique o executor para este trabalho. Deixe vazio para usar o executor descoberto automaticamente");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "Opcionalmente, especifique o executor para este trabalho. Deixe vazio para usar o primeiro executor aplicável");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "Este executor executa trabalhos de construção com a funcionalidade de shell do servidor OneDev.<br><b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm as mesmas permissões que o processo do servidor OneDev. Certifique-se de que ele só possa ser usado por trabalhos confiáveis");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "Este executor executa trabalhos de construção com a funcionalidade de shell de máquinas remotas via <a href='/~administration/agents' target='_blank'>agentes</a><br><b class='text-danger'>AVISO</b>: Trabalhos executados com este executor têm as mesmas permissões que o processo do agente OneDev. Certifique-se de que ele só possa ser usado por trabalhos confiáveis");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "Se deve ou não montar o docker sock no contêiner do trabalho para suportar operações docker nos comandos do trabalho<br><b class='text-danger'>AVISO</b>: Trabalhos maliciosos podem assumir o controle de todo o OneDev operando o docker sock montado. Certifique-se de que este executor só possa ser usado por trabalhos confiáveis se esta opção estiver habilitada");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.javaindex 5dbfe3046b..786cec42fc 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java@@ -1176,6 +1176,7 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Error validating commit message of \"{0}\": {1}", "验证提交信息 \"{0}\" 时出错:{1}");m.put("Error validating commit message of <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a>: {2}","验证提交信息 <a href=\"{0}\" class='text-monospace font-size-sm'>{1}</a> 时出错:{2}");+ m.put("Error verifying GPG signature", "验证 GPG 签名时出错");m.put("Estimated Time", "预计时间");m.put("Estimated Time Edit Bean", "预计时间编辑 Bean");m.put("Estimated Time Issue Field", "预计时间工单字段");@@ -1471,7 +1472,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Hours Per Day", "每天小时数");m.put("How to Publish", "如何发布");m.put("Html Report", "HTML 报告");- m.put("Html Report Publish Enabled", "HTML 报告发布启用");m.put("Http Method", "Http方法");m.put("I didn't eat it. I swear!", "我没吃它。我发誓!");m.put("ID token was expired", "ID 令牌已过期");@@ -1593,6 +1593,7 @@ public class Translation_zh extends TranslationResourceBundle {"交互式 Web shell 访问运行中的任务是企业功能。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a> 30 天");m.put("Internal Database", "内部数据库");m.put("Interpreter", "解释器");+ m.put("Invalid GPG signature", "无效的 GPG 签名");m.put("Invalid PCRE syntax", "无效的 PCRE 语法");m.put("Invalid access token: {0}", "无效的访问令牌:{0}");m.put("Invalid credentials", "无效的凭据");@@ -1737,7 +1738,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Job Properties", "任务属性");m.put("Job Properties Bean", "任务属性Bean");m.put("Job Property", "任务属性");- m.put("Job Requirement", "任务需求");m.put("Job Secret", "任务密钥");m.put("Job Secret Edit Bean", "任务密钥编辑 Bean");m.put("Job Secrets", "任务密钥");@@ -1859,6 +1859,7 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Long-live refresh token of above account which will be used to generate access token to access office 365 mail server. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to login to your office 365 account and generate refresh token. Note that whenever tenant id, client id, client secret, or user principal name is changed, refresh token should be re-generated","用于生成访问 office 365 邮件服务器访问令牌的长寿命刷新令牌。<b class='text-info'>提示:</b>您可以在此字段右侧的按钮登录到您的 office 365 帐户并生成刷新令牌。请注意,每当 tenant id、client id、client secret 或用户主体名称发生变化时,刷新令牌应重新生成");m.put("Longest Duration First", "最长持续时间优先");+ m.put("Looks like a GPG signature but without necessary data", "看起来像 GPG 签名但缺少必要数据");m.put("Low", "低");m.put("Low Severity", "轻微");m.put("MERGED", "已合并");@@ -2075,7 +2076,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("No diffs", "没有差异");m.put("No diffs to navigate", "没有差异可导航");m.put("No directories to skip", "无要跳过的目录");- m.put("No executors defined. Jobs will use auto-discovered executor", "未定义执行器。作业将使用自动发现的执行器");m.put("No external authenticator", "无外部认证器");m.put("No fields to prompt", "无要提示的字段");m.put("No fields to remove", "无要删除的字段");@@ -2140,6 +2140,7 @@ public class Translation_zh extends TranslationResourceBundle {m.put("None", "无");m.put("Not Active Since", "不活跃起");m.put("Not Used Since", "未使用时间");+ m.put("Not a verified email of signing GPG key", "不是签署 GPG 密钥的已验证电子邮件");m.put("Not a verified email of signing ssh key owner", "不是签署 ssh 密钥所有者的验证邮箱");m.put("Not assigned", "未分配");m.put("Not authorized to create project under \"{0}\"", "无权限在 \"{0}\" 下创建项目");@@ -2305,8 +2306,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Optionally specify arguments to run above image", "可选择指定运行上述镜像的参数");m.put("Optionally specify artifacts to retrieve from the dependency into <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not retrieve any artifacts","可选择指定从依赖项拷贝到 <a href='https://docs.onedev.io/concepts#job-workspace'>任务工作区</a> 的制品。只能拷贝已发布的制品(通过制品发布步骤)。留空则不拷贝任何制品");- m.put("Optionally specify authorized executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if no executors are defined)",- "可选择指定此任务的授权执行器。留空则使用第一个适用的执行器(如果未定义执行器,则使用自动发现的执行器)");m.put("Optionally specify authorized roles to press this button. If not specified, all users are allowed","可选择指定允许按此按钮的授权角色。如果未指定,则允许所有用户");m.put("Optionally specify base query of the list", "可选择指定列表的基本查询");@@ -2355,7 +2354,6 @@ public class Translation_zh extends TranslationResourceBundle {"可选择指定适用于此转换的工单。留空则适用于所有工单");m.put("Optionally specify issues applicable for this transition. Leave empty for all issues. ","可选择指定适用于此转换的工单。留空则适用于所有工单。");- m.put("Optionally specify job requirement of this executor", "可选择指定此执行器的任务要求");m.put("Optionally specify jobs allowed to use this script", "可选择指定允许使用此脚本的任务");m.put("Optionally specify memory limit for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details","可选择为使用此执行器的每个任务/服务指定内存限制。详情请查看 <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes 资源管理</a>");@@ -3196,6 +3194,7 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Signature verified successfully with tagger's GPG key", "使用标记者的 GPG 密钥成功验证签名");m.put("Signature verified successfully with tagger's SSH key", "使用标记者的 SSH 密钥成功验证签名");m.put("Signature verified successfully with trusted GPG key", "使用可信 GPG 密钥成功验证签名");+ m.put("Signed with an unknown GPG key ", "使用未知的 GPG 密钥签名");m.put("Signed with an unknown ssh key", "使用未知的 ssh 密钥签名");m.put("Signer Email Addresses", "签署者邮箱地址");m.put("Signing Key ID", "签署密钥 ID");@@ -3205,7 +3204,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Single sign on via discord.com", "通过 discord.com 单点登录");m.put("Single sign on via twitch.tv", "通过 twitch.tv 单点登录");m.put("Site", "站点");- m.put("Site Publish Enabled", "站点发布已启用");m.put("Size", "大小");m.put("Size invalid", "大小无效");m.put("Slack Notifications", "Slack 通知");@@ -3779,10 +3777,6 @@ public class Translation_zh extends TranslationResourceBundle {"此执行器通过 <a href='/~administration/agents' target='_blank'>代理</a> 在远程机器上以 Docker 容器运行构建任务");m.put("This executor runs build jobs as pods in a kubernetes cluster. No any agents are required.<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system settings as job pods need to access it to download source and artifacts","此执行器在 Kubernetes 集群中以 Pod 形式运行构建任务,无需任何代理。<b class='text-danger'>注意:</b> 确保在系统设置中正确指定服务器 URL,因为任务 Pod 需要访问它以下载源代码和产物");- m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs via job requirement setting",- "此执行器使用 OneDev 服务器的 shell 设施运行构建任务。<br><b class='text-danger'>警告</b>:使用此执行器运行的任务具有与 OneDev 服务器进程相同的权限。确保通过任务要求设置仅允许受信任的任务使用");- m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting",- "此执行器通过 <a href='/~administration/agents' target='_blank'>代理</a> 使用远程机器的 shell 设施运行构建任务。<br><b class='text-danger'>警告</b>:使用此执行器运行的任务具有与相应代理进程相同的权限。确保通过任务要求设置仅允许受信任的任务使用");m.put("This field is required", "此字段是必填的");m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.","此过滤器用于确定当前用户的 LDAP 条目。例如:<i>(&(uid={0})(objectclass=person))</i>。在此示例中,<i>{0}</i> 表示当前用户的登录名");@@ -4217,8 +4211,6 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Whether or not to include this field when issue is initially opened. If not, you may include this field later when issue is transited to other states via issue transition rule","在工单首次打开时是否包含此字段。如果不包含,您可以在工单通过工单转换规则转换到其他状态时再包含此字段");m.put("Whether or not to input and display estimated/spent time in hours/minutes only", "是否仅以小时/分钟输入和显示估计/耗费时间");- m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. You should configure job requirement above to make sure the executor can only be used by trusted jobs if this option is enabled",- "是否将 Docker sock 挂载到任务容器中以支持任务命令中的 Docker 操作<br><b class='text-danger'>警告</b>:恶意任务通过操作挂载的 Docker sock 可以控制整个 OneDev。如果启用此选项,您应配置上述任务要求以确保执行器仅被受信任的任务使用");m.put("Whether or not to pre-populate tag mappings in next page. You may want to disable this if there are too many tags to display","是否在下一页预填充标签映射。如果要显示的标签过多,您可能希望禁用此选项");m.put("Whether or not to require this dependency to be successful", "是否要求此依赖成功");@@ -4374,6 +4366,7 @@ public class Translation_zh extends TranslationResourceBundle {m.put("issue:Number", "工单号");m.put("issues", "工单");m.put("job", "任务");+ m.put("key ID: ", "密钥 ID:");m.put("lines", "行");m.put("link:Multiple", "允许链接多个工单");m.put("log", "日志");@@ -4513,12 +4506,20 @@ public class Translation_zh extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("Error verifying GPG signature", "验证 GPG 签名时出错");- m.put("Invalid GPG signature", "无效的 GPG 签名");- m.put("Looks like a GPG signature but without necessary data", "看起来像 GPG 签名但缺少必要数据");- m.put("Not a verified email of signing GPG key", "不是签署 GPG 密钥的已验证电子邮件");- m.put("Signed with an unknown GPG key ", "使用未知的 GPG 密钥签名");- m.put("key ID: ", "密钥 ID:");+ m.put("Enable Html Report Publish", "启用 Html 报告发布");+ m.put("Enable Site Publish", "启用站点发布");+ m.put("No executors defined. Jobs will use auto-discovered executors instead", "未定义执行器。作业将使用自动发现的执行器");+ m.put("Optionally specify applicable jobs of this executor", "可选地指定此执行器适用的作业");+ m.put("Optionally specify executor for this job. Leave empty to use auto-discover executor",+ "可选地为此作业指定执行器。留空以使用自动发现的执行器");+ m.put("Optionally specify executor for this job. Leave empty to use first applicable executor",+ "可选地为此作业指定执行器。留空以使用第一个适用的执行器");+ m.put("This executor runs build jobs with OneDev server's shell facility.<br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev server process. Make sure it can only be used by trusted jobs",+ "此执行器使用 OneDev 服务器的 shell 功能运行构建作业。<br><b class='text-danger'>警告</b>:使用此执行器运行的作业具有与 OneDev 服务器进程相同的权限。请确保它仅能被可信的作业使用");+ m.put("This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br><b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. Make sure it can only be used by trusted jobs",+ "此执行器通过 <a href='/~administration/agents' target='_blank'>代理</a>使用远程机器的 shell 功能运行构建作业<br><b class='text-danger'>警告</b>:使用此执行器运行的作业具有与 OneDev 代理进程相同的权限。请确保它仅能被可信的作业使用");+ m.put("Whether or not to mount docker sock into job container to support docker operations in job commands<br><b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev by operating the mounted docker sock. Make sure this executor can only be used by trusted jobs if this option is enabled",+ "是否将 docker sock 挂载到作业容器中以支持作业命令中的 docker 操作<br><b class='text-danger'>警告</b>:恶意作业可以通过操作挂载的 docker sock 控制整个 OneDev。请确保如果启用此选项,此执行器仅能被可信的作业使用");}@Overridediff --git a/server-ee b/server-eeindex 5ec65adf6a..e9fa63e724 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 5ec65adf6a186e859a8bac0ec0bb9d4c8a8bcf65+Subproject commit e9fa63e72451b06d903ec1e88ce6c05855945b15diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.javaindex 0718814237..474e241258 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java@@ -23,6 +23,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.job.JobContext;import io.onedev.server.job.JobManager;import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.SessionManager;@Editable(order=1070, group= StepGroup.PUBLISH, name="Html Report")@@ -96,4 +97,9 @@ public class PublishHtmlReportStep extends PublishReportStep {return PublishHtmlReportStep.class.getName() + ":" + projectId + ":" + buildNumber;}+ @Override+ public boolean isApplicable(Build build, JobExecutor executor) {+ return executor.isHtmlReportPublishEnabled();+ }+}