diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 1c16d431d0d43083d75bdc2f4341dac662f4c511..4c3f3e7642360201c1877a8a515484a34764ed2d 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -17,13 +17,13 @@ jobs: id: release-drafter uses: release-drafter/release-drafter@v5.6.0 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.JENKINS_CHANGELOG_GENERATOR_TOKEN }} # Generates a YAML changelog file using https://github.com/jenkinsci/jenkins-core-changelog-generator - name: Generate YAML changelog draft id: jenkins-core-changelog-generator uses: jenkinsci/jenkins-core-changelog-generator@master env: - GITHUB_AUTH: github-actions:${{ secrets.GITHUB_TOKEN }} + GITHUB_AUTH: github-actions:${{ secrets.JENKINS_CHANGELOG_GENERATOR_TOKEN }} - name: Upload Changelog YAML uses: actions/upload-artifact@v1 with: diff --git a/core/src/main/java/hudson/model/AbstractCIBase.java b/core/src/main/java/hudson/model/AbstractCIBase.java index f6c11f0219d0a0d5f27ecf6df75d36fc3551f44a..d23a35d59f8484994871327fb3131a841b8959f3 100644 --- a/core/src/main/java/hudson/model/AbstractCIBase.java +++ b/core/src/main/java/hudson/model/AbstractCIBase.java @@ -89,17 +89,31 @@ public abstract class AbstractCIBase extends Node implements ItemGroup disabledAdministrativeMonitors = new HashSet<>(); - /*package*/ final CopyOnWriteArraySet disabledAdministrativeMonitors = new CopyOnWriteArraySet<>(); + /** + * Get the disabled administrative monitors + * + * @since TODO + */ + public Set getDisabledAdministrativeMonitors(){ + synchronized (this.disabledAdministrativeMonitors) { + return new HashSet<>(disabledAdministrativeMonitors); + } + } - @Restricted(NoExternalUse.class) - public CopyOnWriteArraySet getDisabledAdministrativeMonitors(){ - return disabledAdministrativeMonitors; + /** + * Set the disabled administrative monitors + * + * @since TODO + */ + public void setDisabledAdministrativeMonitors(Set disabledAdministrativeMonitors) { + synchronized (this.disabledAdministrativeMonitors) { + this.disabledAdministrativeMonitors.clear(); + this.disabledAdministrativeMonitors.addAll(disabledAdministrativeMonitors); + } } - + /* ================================================================================================================= * Implementation provided * ============================================================================================================== */ diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java index 4554809c5412e63b760a8fc1b34b595a37361d2a..b5246d2b5e45cf7cac998aa808629565a6964783 100644 --- a/core/src/main/java/hudson/model/AdministrativeMonitor.java +++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java @@ -118,8 +118,12 @@ public abstract class AdministrativeMonitor extends AbstractModelObject implemen public void disable(boolean value) throws IOException { AbstractCIBase jenkins = Jenkins.get(); Set set = jenkins.getDisabledAdministrativeMonitors(); - if(value) set.add(id); - else set.remove(id); + if (value) { + set.add(id); + } else { + set.remove(id); + } + jenkins.setDisabledAdministrativeMonitors(set); jenkins.save(); } diff --git a/core/src/main/java/jenkins/management/ShutdownLink.java b/core/src/main/java/jenkins/management/ShutdownLink.java index b19f59259110a99bc15b1b4c2a8f83568aa81703..4e0194f4726a4b766e28e4cf097b7239ba94625c 100644 --- a/core/src/main/java/jenkins/management/ShutdownLink.java +++ b/core/src/main/java/jenkins/management/ShutdownLink.java @@ -26,6 +26,7 @@ package jenkins.management; import hudson.Extension; import hudson.model.ManagementLink; +import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; @@ -61,6 +62,12 @@ public class ShutdownLink extends ManagementLink { return true; } + @Nonnull + @Override + public Permission getRequiredPermission() { + return Jenkins.MANAGE; + } + @Nonnull @Override public Category getCategory() { diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 851afcfeefb501493236334f7570280bbdd1dd70..094551db74ba4ecc8bddd3579b1132637d73fb98 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -3899,7 +3899,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve @RequirePOST public HttpRedirect doQuietDown(@QueryParameter boolean block, @QueryParameter int timeout) throws InterruptedException, IOException { synchronized (this) { - checkPermission(ADMINISTER); + checkPermission(MANAGE); isQuietingDown = true; } if (block) { @@ -3917,9 +3917,9 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve /** * Cancel previous quiet down Jenkins - preparation for a restart */ - @RequirePOST // TODO the cancel link needs to be updated accordingly + @RequirePOST public synchronized HttpRedirect doCancelQuietDown() { - checkPermission(ADMINISTER); + checkPermission(MANAGE); isQuietingDown = false; getQueue().scheduleMaintenance(); return new HttpRedirect("."); diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly b/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly deleted file mode 100644 index 6569c1dc2937c20ded3eed8a7725e8ab11977c22..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - -
-

${%Checking Updates...}

- ${%Go back to update center} -
- - - - diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_bg.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_bg.properties deleted file mode 100644 index 2e06417a0b23e9298e1cfc813f36574b109260ba..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_bg.properties +++ /dev/null @@ -1,30 +0,0 @@ -# The MIT License -# -# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Go\ back\ to\ update\ center=\ - \u041a\u044a\u043c \u0441\u0430\u0439\u0442\u0430 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f -Update\ Center=\ - \u0421\u0430\u0439\u0442 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f -Done=\ - \u0413\u043e\u0442\u043e\u0432\u043e -Checking\ Updates...=\ - \u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u2026 diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_da.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_da.properties deleted file mode 100644 index 34d3267d4e0ff5be786fd646afbc03b34f57bf27..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_da.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Done=Udf\u00f8rt -Go\ back\ to\ update\ center=G\u00e5 tilbage til update center -Checking\ Updates...=Checker for opdateringer... diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_de.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_de.properties deleted file mode 100644 index aae8721d6ac628d4b409e802d294bb57f4c1bc08..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_de.properties +++ /dev/null @@ -1,4 +0,0 @@ -Checking\ Updates...=Suche nach Updates... -Go\ back\ to\ update\ center=Zurück zum Update-Center -Done=Fertig -Update\ Center=Update-Center diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_es.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_es.properties deleted file mode 100644 index e96d6134bc827aff8c7ea4336297167edc0c70fa..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_es.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Buscando actualizaciones ... -Go\ back\ to\ update\ center=Volver al centro de actualizaciones. -Done=Terminado -Update\ Center=Centro de actualizaciones diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_fi.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_fi.properties deleted file mode 100644 index ddf3c99854e366c2f35c712b6121c26968d53321..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_fi.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Tarkastetaan p\u00E4ivityksi\u00E4... -Done=Valmis -Go\ back\ to\ update\ center=Palaa takaisin liit\u00E4nn\u00E4isten hallintaan diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_fr.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_fr.properties deleted file mode 100644 index 00150f5638800563b3701717836de2fefb69da20..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_fr.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Recherche des mises ŕ jour... -Go\ back\ to\ update\ center=Retourner ŕ la page principale des mises ŕ jour -Done=Terminé diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_it.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_it.properties deleted file mode 100644 index 9bd80d3b77e17e5b17a1ee55d51704b7cbec8034..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_it.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Controllo aggiornamenti in corso... -Update\ Center=Centro aggiornamenti -Done=Fatto -Go\ back\ to\ update\ center=Torna al Centro aggiornamenti diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_ja.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_ja.properties deleted file mode 100644 index 214f2da2719e1e16d79b2cdd54803f7652c161fe..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_ja.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=\u66f4\u65b0\u3092\u30c1\u30a7\u30c3\u30af\u4e2d... -Go\ back\ to\ update\ center=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc\u3078\u623b\u308b -Done=\u5b8c\u4e86 -Update\ Center=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_lv.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_lv.properties deleted file mode 100644 index 77dc0089ea1ce03df2f6c66d50dd8140f8d505ec..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_lv.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=P\u0101rbauda atjaunin\u0101jumus -Done=Izpild\u012Bts -Go\ back\ to\ update\ center=Atgriezties Atjaunin\u0101jumu Centr\u0101 diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_nl.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_nl.properties deleted file mode 100644 index 6a68aa3c9ce2c618a92d19b796d7b708748e8c26..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_nl.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Wim Rosseel -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Zoekt actuele versies... -Go\ back\ to\ update\ center=Ga terug naar het actualisatiecentrum -Done=Klaar diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_pt_BR.properties deleted file mode 100644 index bd522482db49c3a855810ff0b92bde79bff397b3..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_pt_BR.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Procurando atualiza\u00e7\u00f5es... -Done=Feito -Go\ back\ to\ update\ center=Voltar \u00e0 central de atualiza\u00e7\u00f5es -Update\ Center=Central de atualiza\u00e7\u00f5es diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_pt_PT.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_pt_PT.properties deleted file mode 100644 index 555771d03ccf0a2e9cc9e833ee4c579e7066a172..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_pt_PT.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -Checking\ Updates...=Verificando por Atualiza\u00E7\u00F5es... -Done=Finalizado -Go\ back\ to\ update\ center=Voltar ao centro de atualiza\u00E7\u00E3o diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_ru.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_ru.properties deleted file mode 100644 index 6cee8c2dea7a097c857fb6e123becf36df39392f..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_ru.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439... -Done=\u041E\u043A\u043E\u043D\u0447\u0435\u043D\u0430 -Go\ back\ to\ update\ center=\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u0432 \u0446\u0435\u043D\u0442\u0440 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439 diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_sk.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_sk.properties deleted file mode 100644 index 63be8b2c77e91cbe894ef90e85e3647321db7915..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_sk.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -Checking\ Updates...=Kontrolujem aktualiz\u00E1cie... -Done=Hotovo -Go\ back\ to\ update\ center=Sp\u00E4\u0165 na str\u00E1nku aktualiz\u00E1ci\u00ED diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_sr.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_sr.properties deleted file mode 100644 index c970a3513f1334ab5911c1c8dc6bb77d877b78cc..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_sr.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is under the MIT License by authors - -Update\ Center=\u0426\u0435\u043D\u0442\u0430\u0440 \u0437\u0430 \u0410\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435 -Checking\ Updates...=\u041F\u0440\u043E\u0432\u0435\u0440\u0438 \u0430\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0430 -Done=\u0413\u043E\u0442\u043E\u0432\u043E -Go\ back\ to\ update\ center=\u041D\u0430\u0437\u0430\u0434 \u043A\u0430 \u0446\u0435\u043D\u0442\u0440\u0443 \u0437\u0430 \u0430\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435 diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_sv_SE.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_sv_SE.properties deleted file mode 100644 index a4bb9775242bbcba70003c9c4099cdc79686bbd7..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_sv_SE.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Checking\ Updates...=Letar efter uppdateringar... -Done=Avslutat diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates_zh_TW.properties b/core/src/main/resources/hudson/PluginManager/checkUpdates_zh_TW.properties deleted file mode 100644 index 91aa340d18dc075170765d2aa966a8115196827d..0000000000000000000000000000000000000000 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates_zh_TW.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd., -# and Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Update\ Center=\u66f4\u65b0\u4e2d\u5fc3 -Checking\ Updates...=\u6b63\u5728\u6aa2\u67e5\u66f4\u65b0... -Go\ back\ to\ update\ center=\u56de\u5230\u66f4\u65b0\u4e2d\u5fc3 -Done=\u5b8c\u6210 diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly index 770233322d7604bc79bf5eb45de40f9f85611834..776c4ed46a515d0274e5e8972465f67dfe9bc808 100644 --- a/core/src/main/resources/lib/hudson/queue.jelly +++ b/core/src/main/resources/lib/hudson/queue.jelly @@ -51,7 +51,7 @@ THE SOFTWARE. ${%Jenkins is going to shut down. No further builds will be performed.} - + (${%cancel}) diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index 7a4776a2f8b05d69eb0e7408012f54861058bfe1..9d737853dfbd48e4ded4bed6b70cf553eaeb07ac 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -230,23 +230,33 @@ THE SOFTWARE. -