From aae1682158e8ff565331ad03895411f1afad5918 Mon Sep 17 00:00:00 2001 From: dty Date: Wed, 8 Jul 2009 20:11:20 +0000 Subject: [PATCH] Added ability to exclude commits by author and revision property when polling for changes to trigger a build. These are specific to Subversion. Moved Subversion related resource strings out of core into the Subversion plugin. Fixed copyright headers. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19538 71c3de6d-444a-0410-be80-ed276b4c234a --- .../resources/hudson/scm/Messages.properties | 14 --------- .../hudson/scm/Messages_de.properties | 22 +++----------- .../hudson/scm/Messages_fr.properties | 30 +++++-------------- .../hudson/scm/Messages_ja.properties | 14 --------- .../hudson/scm/Messages_nl.properties | 9 ------ .../hudson/scm/Messages_pt_BR.properties | 10 ------- .../hudson/scm/Messages_ru.properties | 14 ++------- .../hudson/scm/Messages_tr.properties | 10 ------- .../main/resources/lib/form/textarea.jelly | 2 +- war/pom.xml | 4 +-- 10 files changed, 17 insertions(+), 112 deletions(-) diff --git a/core/src/main/resources/hudson/scm/Messages.properties b/core/src/main/resources/hudson/scm/Messages.properties index 3a34103b80..8af6b6591c 100644 --- a/core/src/main/resources/hudson/scm/Messages.properties +++ b/core/src/main/resources/hudson/scm/Messages.properties @@ -25,20 +25,6 @@ SCM.Permissions.Title=SCM SCM.TagPermission.Description=\ This permission allows users to create a new tag in the source code repository \ for a given build. - -SubversionSCM.ClockOutOfSync=\ - WARNING: clock of the subversion server appears to be out of sync. This can result in inconsistent check out behavior. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0} is at revision {1} -SubversionSCM.pollChanges.changedFrom=\ - \ \ (changed from {0}) - -SubversionUpdateEventHandler.FetchExternal=\ - Fetching ''{0}'' at {1} into ''{2}'' -SubversionTagAction.DisplayName.HasNoTag=Tag this build -SubversionTagAction.DisplayName.HasATag=Subversion tag -SubversionTagAction.DisplayName.HasTags=Subversion tags -SubversionTagAction.Tooltip=Tagged CVSSCM.TagginXasY=Tagging {0} as {1} CVSSCM.FailedToMarkForKeep=Failed to mark {0} for keep diff --git a/core/src/main/resources/hudson/scm/Messages_de.properties b/core/src/main/resources/hudson/scm/Messages_de.properties index abcb26817a..945cfb095f 100644 --- a/core/src/main/resources/hudson/scm/Messages_de.properties +++ b/core/src/main/resources/hudson/scm/Messages_de.properties @@ -25,30 +25,16 @@ SCM.Permissions.Title=SCM SCM.TagPermission.Description=\ Dieses Recht erlaubt, einen Build im Source Code Repository mit einem Tag zu kennzeichnen. -SubversionSCM.ClockOutOfSync=\ - WARNUNG: Die Uhr des Subversion-Servers scheint nicht synchronisiert zu sein. Dies kann zu inkonsistentem Verhalten beim Check-Out f\u00fchren. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0} liegt in Revision {1} vor -SubversionSCM.pollChanges.changedFrom=\ - \ \ (Änderungen zu Revision {0}) - -SubversionUpdateEventHandler.FetchExternal=\ - Hole ''{0}'' aus Revision {1} in Datei ''{2}'' -SubversionTagAction.DisplayName.HasNoTag=Markiere ("tagge") diesen Build -SubversionTagAction.DisplayName.HasATag=Subversion Tag -SubversionTagAction.DisplayName.HasTags=Subversion Tags -SubversionTagAction.Tooltip=Markiert ("getagged") - CVSSCM.TagginXasY=Markiere ("tagge") {0} als {1} CVSSCM.FailedToMarkForKeep={0} konnte nicht markiert werden, um beibehalten zu werden ("failed to mark for keep"). CVSSCM.ExpandingWorkspaceArchive=Entpacke das Archiv des Arbeitsbereichs nach {0} CVSSCM.HeadIsNotBranch=Technisch gesprochen ist HEAD kein Zweig in CVS. Lassen Sie dieses Feld frei, um den Trunk zu bauen. -CVSSCM.InvalidCvsroot=Ungültige CVSROOT-Angabe. +CVSSCM.InvalidCvsroot=Ung\u00FCltige CVSROOT-Angabe. CVSSCM.MissingCvsroot=CVSROOT muss angegeben werden. CVSSCM.NoSuchJobExists=Dieser Job existiert nicht: {0} -CVSSCM.NoValidTagNameGivenFor=Der Tag-Name {1} ist ungültig für {0}. -CVSSCM.PasswordNotSet=Das Passwort für CVSROOT scheint nicht gesetzt zu sein. -CVSSCM.TagContainsIllegalChar=Der Tag-Name enthält ungültiges Zeichen ''{0}''. +CVSSCM.NoValidTagNameGivenFor=Der Tag-Name {1} ist ung\u00FCltig f\u00FCr {0}. +CVSSCM.PasswordNotSet=Das Passwort f\u00FCr CVSROOT scheint nicht gesetzt zu sein. +CVSSCM.TagContainsIllegalChar=Der Tag-Name enth\u00E4lt ung\u00FCltiges Zeichen ''{0}''. CVSSCM.TagIsEmpty=Der Tag-Name ist leer. CVSSCM.TagNeedsToStartWithAlphabet=Der Tag-Name muss mit einem Buchstaben beginnen. CVSSCM.TagThisBuild=Diesen Build markieren ("taggen"). diff --git a/core/src/main/resources/hudson/scm/Messages_fr.properties b/core/src/main/resources/hudson/scm/Messages_fr.properties index 7b5b1fad2f..307753b263 100644 --- a/core/src/main/resources/hudson/scm/Messages_fr.properties +++ b/core/src/main/resources/hudson/scm/Messages_fr.properties @@ -23,37 +23,23 @@ NullSCM.DisplayName=Aucune SCM.Permissions.Title=Gestion de version SCM.TagPermission.Description=\ - Cette option permet aux utilisateurs de créer un nouveau tag dans l''outil de gestion de code source \ - pour un build donné. - -SubversionSCM.ClockOutOfSync=\ - AVERTISSEMENT: l''horloge du serveur subversion semble désynchronisée. Cela peut provoquer des comportements incohérents lors de la récupération des fichiers. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0} est en révision {1} -SubversionSCM.pollChanges.changedFrom=\ - \ \ (a changé depuis la {0}) - -SubversionUpdateEventHandler.FetchExternal=\ - Récupération de ''{0}'' en rev {1} vers ''{2}'' -SubversionTagAction.DisplayName.HasNoTag=Tagguer ce build -SubversionTagAction.DisplayName.HasATag=Tag Subversion -SubversionTagAction.DisplayName.HasTags=Tags Subversion -SubversionTagAction.Tooltip=Taggué + Cette option permet aux utilisateurs de cr\u00C3\u00A9er un nouveau tag dans l''outil de gestion de code source \ + pour un build donn\u00C3\u00A9. CVSSCM.TagginXasY=Application du tag {1} sur {0} CVSSCM.FailedToMarkForKeep=Echec lors du marquage de {0} en vue de le conserver -CVSSCM.ExpandingWorkspaceArchive=décompressage de l''archive de répertoire de travail dans {0} +CVSSCM.ExpandingWorkspaceArchive=d\u00C3\u00A9compressage de l''archive de r\u00C3\u00A9pertoire de travail dans {0} CVSSCM.HeadIsNotBranch=Techniquement, HEAD n''est pas une branche dans CVS. Laissez ce champ vide pour builder le tronc. CVSSCM.InvalidCvsroot=String CVSROOT invalide CVSSCM.MissingCvsroot=CVSROOT est obligatoire CVSSCM.NoValidTagNameGivenFor=Nom de tag non valide pour {0} : {1} -CVSSCM.PasswordNotSet=Ce CVSROOT ne semble pas avoir de mot de passe spécifié. -CVSSCM.TagContainsIllegalChar=Ce tag contient des caractères illégaux ''{0}'' +CVSSCM.PasswordNotSet=Ce CVSROOT ne semble pas avoir de mot de passe sp\u00C3\u00A9cifi\u00C3\u00A9. +CVSSCM.TagContainsIllegalChar=Ce tag contient des caract\u00C3\u00A8res ill\u00C3\u00A9gaux ''{0}'' CVSSCM.TagIsEmpty=Ce tag est vide -CVSSCM.TagNeedsToStartWithAlphabet=Le libellé du tag doit commencer avec un caractère alphabétique +CVSSCM.TagNeedsToStartWithAlphabet=Le libell\u00C3\u00A9 du tag doit commencer avec un caract\u00C3\u00A8re alphab\u00C3\u00A9tique CVSSCM.TagThisBuild=Tagguer ce build -CVSSCM.TaggingFailed=échec de l''application du tag +CVSSCM.TaggingFailed=\u00C3\u00A9chec de l''application du tag CVSSCM.TaggingWorkspace=application du tag sur le workspace CVSSCM.DisplayName2=Tags CVS CVSSCM.DisplayName1=Tag CVS -CVSSCM.WorkspaceInconsistent=Le répertoire de travail n''est pas cohérent avec la configuration. Un nouveau build est demandé: {0} +CVSSCM.WorkspaceInconsistent=Le r\u00C3\u00A9pertoire de travail n''est pas coh\u00C3\u00A9rent avec la configuration. Un nouveau build est demand\u00C3\u00A9: {0} diff --git a/core/src/main/resources/hudson/scm/Messages_ja.properties b/core/src/main/resources/hudson/scm/Messages_ja.properties index eabfc2d892..7840c04ac8 100644 --- a/core/src/main/resources/hudson/scm/Messages_ja.properties +++ b/core/src/main/resources/hudson/scm/Messages_ja.properties @@ -25,20 +25,6 @@ SCM.Permissions.Title=SCM SCM.TagPermission.Description=\ \u3053\u306E\u30D1\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u306F\u3001\u30D3\u30EB\u30C9\u304C\u4F7F\u7528\u3059\u308B\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u30EA\u30DD\u30B8\u30C8\u30EA\u3078\u306E\u65B0\u898F\u30BF\u30B0\u306E\u4F5C\u6210\u3092\u8A31\u53EF\u3057\u307E\u3059\u3002 -SubversionSCM.ClockOutOfSync=\ - \u8B66\u544A: Subversion\u30B5\u30FC\u30D0\u306E\u30AF\u30ED\u30C3\u30AF\u3068Hudson\u306E\u30AF\u30ED\u30C3\u30AF\u304C\u305A\u308C\u3066\u3044\u308B\u3088\u3046\u3067\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u30C1\u30A7\u30C3\u30AF\u30A2\u30A6\u30C8\u52D5\u4F5C\u306B\u652F\u969C\u304C\u51FA\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0}\u306F\u30EA\u30D3\u30B8\u30E7\u30F3{1} -SubversionSCM.pollChanges.changedFrom=\ - \ \ (\u524D\u56DE\u306F{0}) - -SubversionUpdateEventHandler.FetchExternal=\ - ''{0}''\u306E\u30EA\u30D3\u30B8\u30E7\u30F3{1}\u3092''{2}''\u3078\u53D6\u5F97\u4E2D -SubversionTagAction.DisplayName.HasNoTag=\u30BF\u30B0\u8A2D\u5B9A -SubversionTagAction.DisplayName.HasATag=\u30BF\u30B0\u53C2\u7167 -SubversionTagAction.DisplayName.HasTags=\u30BF\u30B0\u53C2\u7167 -SubversionTagAction.Tooltip=\u30BF\u30B0 - CVSSCM.TagginXasY={0}\u3092{1}\u3068\u3057\u3066\u30BF\u30B0\u3092\u8A2D\u5B9A CVSSCM.FailedToMarkForKeep={0}\u306E\u8A18\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F CVSSCM.ExpandingWorkspaceArchive=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u30A2\u30FC\u30AB\u30A4\u30D6\u3092{0}\u306B\u5C55\u958B\u4E2D diff --git a/core/src/main/resources/hudson/scm/Messages_nl.properties b/core/src/main/resources/hudson/scm/Messages_nl.properties index 729c75439a..a9192edf3f 100644 --- a/core/src/main/resources/hudson/scm/Messages_nl.properties +++ b/core/src/main/resources/hudson/scm/Messages_nl.properties @@ -23,15 +23,6 @@ NullSCM.DisplayName=Geen SCM.Permissions.Title=SCM -SubversionSCM.ClockOutOfSync=\ - WAARSCHUWING: De klok van de subversion server is niet gesynchronizeerd. Dit kan resulteren in inconsistent gedrag bij het uitchecken. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0} heeft revisie {1} -SubversionSCM.pollChanges.changedFrom=\ - \ \ (veranderd van {0}) - -SubversionUpdateEventHandler.FetchExternal=\ - Ophalen van ''{0}'' met revisie {1} naar ''{2}'' CVSSCM.TagginXasY=Label {0} als {1} CVSSCM.FailedToMarkForKeep={0} kon niet gemarkeerd worden om te behouden CVSSCM.ExpandingWorkspaceArchive=expanding the workspace archive into {0} diff --git a/core/src/main/resources/hudson/scm/Messages_pt_BR.properties b/core/src/main/resources/hudson/scm/Messages_pt_BR.properties index 8471a97e09..fabb149f06 100644 --- a/core/src/main/resources/hudson/scm/Messages_pt_BR.properties +++ b/core/src/main/resources/hudson/scm/Messages_pt_BR.properties @@ -22,13 +22,3 @@ NullSCM.DisplayName=Nenhum SCM.Permissions.Title=SCM - -SubversionSCM.ClockOutOfSync=\ - ATEN\u00C7\u00C3O: rel\u00F3gio do servidor subversion parece estar fora de sincronismo. Isto pode resultar em check out inconsistente. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0} est\u00E1 na revis\u00E3o {1} -SubversionSCM.pollChanges.changedFrom=\ - \ \ (mudado de {0}) - -SubversionUpdateEventHandler.FetchExternal=\ - Baixando ''{0}'' de {1} para ''{2}'' \ No newline at end of file diff --git a/core/src/main/resources/hudson/scm/Messages_ru.properties b/core/src/main/resources/hudson/scm/Messages_ru.properties index fe3f70105a..a1ba94059b 100644 --- a/core/src/main/resources/hudson/scm/Messages_ru.properties +++ b/core/src/main/resources/hudson/scm/Messages_ru.properties @@ -20,15 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -NullSCM.DisplayName=\u041d\u0435\u0442 -SCM.Permissions.Title=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044f \u0432\u0435\u0440\u0441\u0438\u0439 - -SubversionSCM.ClockOutOfSync=\ - \u0412\u041d\u0418\u041c\u0410\u041d\u0418\u0415: \u043f\u043e\u043a\u0430\u0437\u0430\u043d\u0438\u0435 \u0447\u0430\u0441\u043e\u0432 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 subversion \u043f\u043e\u0445\u043e\u0436\u0435 \u043d\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u044b. \u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u043f\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u043f\u0440\u0438 checkout. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0} \u0432 \u0440\u0435\u0432\u0438\u0437\u0438\u0438 {1} -SubversionSCM.pollChanges.changedFrom=\ - \ \ (\u0438\u0437\u043c\u0435\u043d\u0438\u043b\u043e\u0441\u044c \u0441 {0}) - -SubversionUpdateEventHandler.FetchExternal=\ - \u041f\u043e\u043b\u0443\u0447\u0435\u043d\u043e ''{0}'' \u0432 {1} \u0432 ''{2}'' \ No newline at end of file +NullSCM.DisplayName=\u041D\u0435\u0442 +SCM.Permissions.Title=\u0421\u0438\u0441\u0442\u0435\u043C\u0430 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044F \u0432\u0435\u0440\u0441\u0438\u0439 diff --git a/core/src/main/resources/hudson/scm/Messages_tr.properties b/core/src/main/resources/hudson/scm/Messages_tr.properties index 4024f25d7c..0b389380ac 100644 --- a/core/src/main/resources/hudson/scm/Messages_tr.properties +++ b/core/src/main/resources/hudson/scm/Messages_tr.properties @@ -22,13 +22,3 @@ NullSCM.DisplayName=Hi\u0231birisi SCM.Permissions.Title=SCM - -SubversionSCM.ClockOutOfSync=\ - UYARI: Subversion sunucusunun saati ile senkronizasyon sorunu var. Bu durum tutars\u0131z checkout davran\u0131\u015flar\u0131 olu\u015fmas\u0131na sebep olabilir. -SubversionSCM.pollChanges.remoteRevisionAt=\ - {0}, revizyon {1} \u00fczerinde -SubversionSCM.pollChanges.changedFrom=\ - \ \ ({0}''dan de\u011fi\u015fti) - -SubversionUpdateEventHandler.FetchExternal=\ - {1}''deki ''{0}'', ''{2}''ye al\u0131n\u0131yor \ No newline at end of file diff --git a/core/src/main/resources/lib/form/textarea.jelly b/core/src/main/resources/lib/form/textarea.jelly index 97eac68118..c845c99ffc 100644 --- a/core/src/main/resources/lib/form/textarea.jelly +++ b/core/src/main/resources/lib/form/textarea.jelly @@ -1,7 +1,7 @@ - + -- GitLab