# HG changeset patch
# User Mike Becker <universe@uap-core.de>
# Date 1609946432 -3600
# Node ID 502a10e24b858fabf3d9215a07fd4002aa9674d0
# Parent  0097009152694cd5692183711cf1dd096d82779a
renames several resource keys

diff -r 009700915269 -r 502a10e24b85 src/main/resources/localization/strings.properties
--- a/src/main/resources/localization/strings.properties	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/resources/localization/strings.properties	Wed Jan 06 16:20:32 2021 +0100
@@ -22,32 +22,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 app.title=LightPIT
-browserLanguage = Browser language
-browserLanguageNotAvailable = Browser language not available.
 button.cancel=Cancel
 button.comment=Comment
 button.component.create=New Component
 button.component.edit=Edit Component
-button.user.create=Add Developer
 button.issue.all=All Issues
 button.issue.create.another=Create another Issue
 button.issue.create=New Issue
 button.issue.edit=Edit Issue
+button.language.submit = Switch language
 button.okay=OK
 button.project.create=New Project
+button.user.create=Add Developer
 button.version.create=New Version
 button.version.edit=Edit Version
 commit.redirect-link=If redirection does not work, click the following link:
 commit.success=Operation successful - you will be redirected in a second.
 component.color=Color
-component.description=Description
 component.lead=Lead
-component.name=Component
-component.ordinal=Ordering
-component.project=Project
 component=Component
 description=Description
-displayname=Developer
 error.code = Code
 error.code.401 = Authorization required
 error.code.403 = Access denied
@@ -59,7 +53,6 @@
 error.message = Server Message
 error.returnLink = Return to
 error.timestamp = Timestamp
-givenname=Given Name
 issue.affected-versions=Affected Versions
 issue.assignee=Assignee
 issue.category.Bug=Bug
@@ -70,12 +63,10 @@
 issue.category=Category
 issue.comments.anonauthor=Anonymous Author
 issue.comments=Comments
-issue.component=Component
 issue.created=Created
 issue.description=Description
 issue.eta=ETA
 issue.id=Issue ID
-issue.project=Project
 issue.resolved-versions=Target Versions
 issue.status.Done=Done
 issue.status.Duplicate=Duplicate
@@ -96,12 +87,11 @@
 issues.reported=Reported Issues
 issues.resolved=Assigned Issues
 issues=Issues
-lastname=Last Name
-mail=E-Mail
+language.browser = Browser language
+language.browser.unavailable = Browser language not available.
 menu.languages=Language
 menu.projects=Projects
 menu.users=Developer
-name=Name
 navmenu.all=all
 navmenu.components=Components
 navmenu.unassigned=unassigned
@@ -110,8 +100,8 @@
 no-users=No developers have been configured yet.
 node.tooltip=Name of the path node that will be used in URL construction.
 node=Node
+ordinal.tooltip=Use to override lexicographic ordering.
 ordinal=Ordering
-owner=Project Lead
 placeholder.auto-assignee.tooltip=Assigns the component lead, if available.
 placeholder.auto-assignee=Automatic
 placeholder.null-assignee=Unassigned
@@ -119,18 +109,21 @@
 placeholder.null-lead=Unassigned
 placeholder.null-owner=Unassigned
 progress=Overall Progress
-repoUrl=Repository
-submit = Switch language
-tooltip.ordinal=Use to override lexicographic ordering.
+project.name=Name
+project.owner=Project Lead
+project.repoUrl=Repository
+project=Project
+user.displayname=Developer
+user.givenname=Given Name
+user.lastname=Last Name
+user.mail=E-Mail
 username=User Name
 version.latest=Latest Version
-version.name=Version
 version.next=Next Version
-version.ordinal=Ordering
-version.project=Project
 version.status.Deprecated=Deprecated
 version.status.Future=Future
 version.status.LTS=LTS
 version.status.Released=Released
 version.status.Unreleased=Unreleased
 version.status=Status
+version=Version
diff -r 009700915269 -r 502a10e24b85 src/main/resources/localization/strings_de.properties
--- a/src/main/resources/localization/strings_de.properties	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/resources/localization/strings_de.properties	Wed Jan 06 16:20:32 2021 +0100
@@ -22,32 +22,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 app.title=LightPIT
-browserLanguage = Browsersprache
-browserLanguageNotAvailable = Browsersprache nicht verf\u00fcgbar.
 button.cancel=Abbrechen
 button.comment=Kommentieren
 button.component.create=Neue Komponente
 button.component.edit=Komponente Bearbeiten
-button.user.create=Neuer Entwickler
 button.issue.all=Alle Vorg\u00e4nge
 button.issue.create.another=Weiteren Vorgang erstellen
 button.issue.create=Neuer Vorgang
 button.issue.edit=Vorgang Bearbeiten
+button.language.submit = Sprache ausw\u00e4hlen
 button.okay=OK
 button.project.create=Neues Projekt
+button.user.create=Neuer Entwickler
 button.version.create=Neue Version
 button.version.edit=Version Bearbeiten
 commit.redirect-link=Falls die Weiterleitung nicht klappt, klicken Sie bitte hier:
 commit.success=Operation erfolgreich - Sie werden jeden Moment weitergeleitet.
 component.color=Farbe
-component.description=Beschreibung
 component.lead=Leitung
-component.name=Komponente
-component.ordinal=Sequenznummer
-component.project=Projekt
 component=Komponente
 description=Beschreibung
-displayname=Entwickler
 error.code = Fehlercode
 error.code.401 = Authentifizierung erforderlich
 error.code.403 = Zugriff verboten
@@ -59,7 +53,6 @@
 error.message = Server Nachricht
 error.returnLink = Kehre zurück zu
 error.timestamp = Zeitstempel
-givenname=Vorname
 issue.affected-versions=Betroffene Versionen
 issue.assignee=Zugewiesen
 issue.category.Bug=Fehler
@@ -70,12 +63,10 @@
 issue.category=Kategorie
 issue.comments.anonauthor=Anonymer Autor
 issue.comments=Kommentare
-issue.component=Komponente
 issue.created=Erstellt
 issue.description=Beschreibung
 issue.eta=Zieldatum
 issue.id=Vorgangs-ID
-issue.project=Projekt
 issue.resolved-versions=Zielversionen
 issue.status.Done=Erledigt
 issue.status.Duplicate=Duplikat
@@ -96,12 +87,11 @@
 issues.reported=Er\u00f6ffnete Vorg\u00e4nge
 issues.resolved=Enthaltene Vorg\u00e4nge
 issues=Vorg\u00e4nge
-lastname=Nachname
-mail=E-Mail
+language.browser = Browsersprache
+language.browser.unavailable = Browsersprache nicht verf\u00fcgbar.
 menu.languages=Sprache
 menu.projects=Projekte
 menu.users=Entwickler
-name=Name
 navmenu.all=Alle
 navmenu.components=Komponenten
 navmenu.unassigned=Nicht Zugewiesen
@@ -110,8 +100,8 @@
 no-users=Bislang wurden keine Entwickler hinterlegt.
 node.tooltip=Name, der zur Konstruktion der URL genutzt werden soll.
 node=Pfadname
+ordinal.tooltip=Use to override lexicographic ordering.=\u00dcbersteuert die lexikographische Sortierung.
 ordinal=Sequenznummer
-owner=Projektleitung
 placeholder.auto-assignee.tooltip=Weist, wenn m\u00f6glich, den Vorgang dem Leiter der Komponente.
 placeholder.auto-assignee=Automatisch
 placeholder.null-assignee=Niemandem
@@ -119,18 +109,21 @@
 placeholder.null-lead=Niemand
 placeholder.null-owner=Nicht Zugewiesen
 progress=Gesamtfortschritt
-repoUrl=Repository
-submit = Sprache ausw\u00e4hlen
-tooltip.ordinal=\u00dcbersteuert die lexikographische Sortierung.
+project.name=Name
+project.owner=Projektleitung
+project.repoUrl=Repository
+project=Projekt
+user.displayname=Entwickler
+user.givenname=Vorname
+user.lastname=Nachname
+user.mail=E-Mail
 username=Benutzername
 version.latest=Neuste Version
-version.name=Version
 version.next=N\u00e4chste Version
-version.ordinal=Sequenznummer
-version.project=Projekt
 version.status.Deprecated=Veraltet
 version.status.Future=Geplant
 version.status.LTS=Langzeitsupport
 version.status.Released=Ver\u00f6ffentlicht
 version.status.Unreleased=Unver\u00f6ffentlicht
 version.status=Status 
+version=Version
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/component-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/component-form.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/component-form.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -40,14 +40,14 @@
         </colgroup>
         <tbody>
         <tr>
-            <th><fmt:message key="component.project"/></th>
+            <th><fmt:message key="project"/></th>
             <td>
                 <c:out value="${project.name}" />
                 <input type="hidden" name="pid" value="${project.id}" />
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="component.name"/></th>
+            <th><fmt:message key="component"/></th>
             <td><input name="name" type="text" maxlength="20" required value="<c:out value="${component.name}"/>" /></td>
         </tr>
         <tr title="<fmt:message key="node.tooltip"/>">
@@ -71,14 +71,14 @@
                 </select>
             </td>
         </tr>
-        <tr title="<fmt:message key="tooltip.ordinal" />">
-            <th><fmt:message key="component.ordinal"/></th>
+        <tr title="<fmt:message key="ordinal.tooltip" />">
+            <th><fmt:message key="ordinal"/></th>
             <td>
                 <input name="ordinal" type="number" value="${component.ordinal}"/>
             </td>
         </tr>
         <tr>
-            <th class="vtop"><fmt:message key="component.description"/></th>
+            <th class="vtop"><fmt:message key="description"/></th>
             <td>
                 <textarea name="description" rows="5"><c:out value="${component.description}"/></textarea>
             </td>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/components.jsp
--- a/src/main/webapp/WEB-INF/jsp/components.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/components.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -62,8 +62,8 @@
     </tr>
     <tr>
         <th></th>
-        <th><fmt:message key="component.name"/></th>
-        <th><fmt:message key="component.description"/></th>
+        <th><fmt:message key="component"/></th>
+        <th><fmt:message key="description"/></th>
         <th class="hcenter"><fmt:message key="issues.open" /></th>
         <th class="hcenter"><fmt:message key="issues.active" /></th>
         <th class="hcenter"><fmt:message key="issues.done" /></th>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/issue-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -46,7 +46,7 @@
         </tr>
         </c:if>
         <tr>
-            <th><fmt:message key="issue.project"/></th>
+            <th><fmt:message key="project"/></th>
             <td>
                 <c:choose>
                     <c:when test="${not empty issue.project}">
@@ -80,7 +80,7 @@
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="issue.component"/></th>
+            <th><fmt:message key="component"/></th>
             <td>
                 <select name="component">
                     <option value="-1"><fmt:message key="placeholder.null-component"/></option>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/issue-view.jsp
--- a/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -44,7 +44,7 @@
     </tr>
     </c:if>
     <tr>
-        <th><fmt:message key="issue.project"/></th>
+        <th><fmt:message key="project"/></th>
         <td>
             <c:out value="${issue.project.name}" />
         </td>
@@ -64,7 +64,7 @@
         </td>
     </tr>
     <tr>
-        <th><fmt:message key="issue.component"/></th>
+        <th><fmt:message key="component"/></th>
         <td>
             <c:if test="${not empty issue.component}">
                 <c:out value="${issue.component.name}"/>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/language.jsp
--- a/src/main/webapp/WEB-INF/jsp/language.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/language.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -38,11 +38,11 @@
                 ${l.displayLanguage}
             (${l.getDisplayLanguage(viewmodel.currentLanguage)}
             <c:if test="${not empty viewmodel.browserLanguage and l.language eq viewmodel.browserLanguage.language}"><c:set
-                    var="browserLanguagePresent" value="true"/>&nbsp;-&nbsp;<fmt:message key="browserLanguage"/></c:if>)
+                    var="browserLanguagePresent" value="true"/>&nbsp;-&nbsp;<fmt:message key="language.browser"/></c:if>)
         </label>
     </c:forEach>
     <c:if test="${not browserLanguagePresent}">
-        <span class="blNA"><fmt:message key="browserLanguageNotAvailable"/></span>
+        <span class="blNA"><fmt:message key="language.browser.unavailable"/></span>
     </c:if>
-    <input type="submit" value="<fmt:message key="submit" />"/>
+    <input type="submit" value="<fmt:message key="button.language.submit" />"/>
 </form>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/project-details.jsp
--- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -82,7 +82,7 @@
     <c:otherwise>
         <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
         <h2>
-            <fmt:message key="version.name" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
+            <fmt:message key="version" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
         </h2>
 
         <h3><fmt:message key="issues.resolved"/> </h3>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/project-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/project-form.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/project-form.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -39,7 +39,7 @@
         </colgroup>
         <tbody>
         <tr>
-            <th><fmt:message key="name"/></th>
+            <th><fmt:message key="project.name"/></th>
             <td><input name="name" type="text" maxlength="20" required value="<c:out value="${project.name}"/>" /></td>
         </tr>
         <tr title="<fmt:message key="node.tooltip"/>">
@@ -51,11 +51,11 @@
             <td><input type="text" name="description" maxlength="200" value="<c:out value="${project.description}"/>" /></td>
         </tr>
         <tr>
-            <th><fmt:message key="repoUrl"/></th>
+            <th><fmt:message key="project.repoUrl"/></th>
             <td><input name="repoUrl" type="url" maxlength="50" value="<c:out value="${project.repoUrl}"/>" /></td>
         </tr>
         <tr>
-            <th><fmt:message key="owner"/></th>
+            <th><fmt:message key="project.owner"/></th>
             <td>
                 <select name="owner">
                     <option value="-1"><fmt:message key="placeholder.null-owner"/></option>
@@ -67,7 +67,7 @@
                 </select>
             </td>
         </tr>
-        <tr title="<fmt:message key="tooltip.ordinal" />">
+        <tr title="<fmt:message key="ordinal.tooltip" />">
             <th><fmt:message key="ordinal"/></th>
             <td>
                 <input name="ordinal" type="number" value="${project.ordinal}"/>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/projects.jsp
--- a/src/main/webapp/WEB-INF/jsp/projects.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/projects.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -55,8 +55,8 @@
         <thead>
         <tr>
             <th></th>
-            <th><fmt:message key="name"/></th>
-            <th><fmt:message key="repoUrl"/></th>
+            <th><fmt:message key="project.name"/></th>
+            <th><fmt:message key="project.repoUrl"/></th>
             <th class="hcenter"><fmt:message key="version.latest"/></th>
             <th class="hcenter"><fmt:message key="version.next"/></th>
             <th class="hcenter"><fmt:message key="issues.open"/></th>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/user-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/user-form.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/user-form.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -44,15 +44,15 @@
                        <c:if test="${user.id ge 0}">readonly</c:if> /></td>
         </tr>
         <tr>
-            <th><fmt:message key="givenname"/></th>
+            <th><fmt:message key="user.givenname"/></th>
             <td><input name="givenname" type="text" maxlength="50" value="<c:out value="${user.givenname}"/>" /></td>
         </tr>
         <tr>
-            <th><fmt:message key="lastname"/></th>
+            <th><fmt:message key="user.lastname"/></th>
             <td><input name="lastname" type="text" maxlength="50" value="<c:out value="${user.lastname}"/>" /></td>
         </tr>
         <tr>
-            <th><fmt:message key="mail"/></th>
+            <th><fmt:message key="user.mail"/></th>
             <td><input name="mail" type="email" maxlength="50" value="<c:out value="${user.mail}"/>" /></td>
         </tr>
         </tbody>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/users.jsp
--- a/src/main/webapp/WEB-INF/jsp/users.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/users.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -45,7 +45,7 @@
         <thead>
         <tr>
             <th></th>
-            <th><fmt:message key="displayname"/></th>
+            <th><fmt:message key="user.displayname"/></th>
         </tr>
         </thead>
         <tbody>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/version-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/version-form.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -40,14 +40,14 @@
         </colgroup>
         <tbody>
         <tr>
-            <th><fmt:message key="version.project"/></th>
+            <th><fmt:message key="project"/></th>
             <td>
                 <c:out value="${project.name}" />
                 <input type="hidden" name="pid" value="${project.id}" />
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="version.name"/></th>
+            <th><fmt:message key="version"/></th>
             <td><input name="name" type="text" maxlength="20" required value="<c:out value="${version.name}"/>" /></td>
         </tr>
         <tr title="<fmt:message key="node.tooltip"/>">
@@ -66,8 +66,8 @@
                 </select>
             </td>
         </tr>
-        <tr title="<fmt:message key="tooltip.ordinal" />">
-            <th><fmt:message key="version.ordinal"/></th>
+        <tr title="<fmt:message key="ordinal.tooltip" />">
+            <th><fmt:message key="ordinal"/></th>
             <td>
                 <input name="ordinal" type="number" value="${version.ordinal}"/>
             </td>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jsp/versions.jsp
--- a/src/main/webapp/WEB-INF/jsp/versions.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/versions.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -66,7 +66,7 @@
     </tr>
     <tr>
         <th></th>
-        <th><fmt:message key="version.name"/></th>
+        <th><fmt:message key="version"/></th>
         <th class="hcenter"><fmt:message key="issues.open" /></th>
         <th class="hcenter"><fmt:message key="issues.active" /></th>
         <th class="hcenter"><fmt:message key="issues.done" /></th>
diff -r 009700915269 -r 502a10e24b85 src/main/webapp/WEB-INF/jspf/project-header.jspf
--- a/src/main/webapp/WEB-INF/jspf/project-header.jspf	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jspf/project-header.jspf	Wed Jan 06 16:20:32 2021 +0100
@@ -4,17 +4,17 @@
 --%>
 <div class="table project-attributes">
     <div class="row">
-        <div class="caption"><fmt:message key="name"/>:</div>
+        <div class="caption"><fmt:message key="project.name"/>:</div>
         <div><c:out value="${project.name}"/></div>
         <div class="caption"><fmt:message key="description"/>:</div>
         <div><c:out value="${project.description}"/></div>
     </div>
     <div class="row">
-        <div class="caption"><fmt:message key="owner"/>:</div>
+        <div class="caption"><fmt:message key="project.owner"/>:</div>
         <div>
             <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if>
         </div>
-        <div class="caption"><fmt:message key="repoUrl"/>:</div>
+        <div class="caption"><fmt:message key="project.repoUrl"/>:</div>
         <div>
             <c:if test="${not empty project.repoUrl}">
                 <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out