continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r765833 - in /continuum/trunk/continuum-webapp/src/main: resources/localization/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/error/ webapp/WEB-INF/jsp/navigations/
Date Fri, 17 Apr 2009 01:54:31 GMT
Author: ctan
Date: Fri Apr 17 01:54:30 2009
New Revision: 765833

URL: http://svn.apache.org/viewvc?rev=765833&view=rev
Log:
[CONTINUUM-2095] Localization updates

merge -r 765831:765832 from 1.3.x branch

Modified:
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/releaseError.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Fri Apr 17 01:54:30 2009
@@ -66,6 +66,7 @@
 # ----------------------------------------------------------------------
 # Page: Menu
 # ----------------------------------------------------------------------
+menu.continuum = Continuum
 menu.continuum.about = About
 menu.continuum.showProjects = Show Projects
 menu.continuum.showProjectGroups = Show Project Groups
@@ -158,7 +159,6 @@
 groups.page.list.empty = Project Groups list is empty.
 groups.section.title = Project Group:
 groups.manage.label = Manage Group
-groups.confirmation.message = Are you sure you want to delete the project group "{0}"?
 groups.table.repositoryName = Local Repository
 
 # ----------------------------------------------------------------------
@@ -232,6 +232,13 @@
 project.in.checkout.queue.error = Cannot edit this project group. Projects that are members
of this project group are still being checked out from scm.
 
 # ----------------------------------------------------------------------
+# Page: Confirm Group Removal
+# ----------------------------------------------------------------------
+confirmGroupRemoval.page.title=Continuum - Project Group Removal
+confirmGroupRemoval.section.title=Project Group Removal
+confirmGroupRemoval.confirmation.message=Are you sure you want to delete the project group
"{0}"?
+
+# ----------------------------------------------------------------------
 # Page: Configuration
 # ----------------------------------------------------------------------
 configuration.page.title = Continuum - Configuration
@@ -718,6 +725,9 @@
 releasePerformFromScm.goals.label=Maven Arguments
 releasePerformFromScm.useReleaseProfile.label=Use Release Profile
 releasePerformFromScm.buildEnvironment.label=Build Environment
+releasePerformFromScm.page.title=Continuum - Perform Project Release
+releasePerformFromScm.section.title=Perform Project Release
+releasePerformFromScm.parameters.section.title=Release Perform Parameters
 
 # ----------------------------------------------------------------------
 # Page: User
@@ -1192,3 +1202,22 @@
 distributedBuild.releaseCleanup.error = Unable to cleanup release because build agent {0}
was either removed or disabled
 distributedBuild.releasePerform.input.error = Unable to get release plugin parameters because
build agent {0} was either removed or disabled
 distributedBuild.releasePerform.release.error = Unable to perform release because build agent
{0} was either removed or disabled
+
+# ----------------------------------------------------------------------
+# Page: Authorization Error
+# ----------------------------------------------------------------------
+authorizationError.page.title=Continuum - Authorization Error
+authorizationError.section.title=Authorization Error
+authorizationError.not.authorized=You are not authorized to access this page. Please contact
your administrator to be granted the appropriate permissions.
+
+# ----------------------------------------------------------------------
+# Page: Error Occured
+# ----------------------------------------------------------------------
+errorOccured.page.title=Continuum - Error Occured
+errorOccured.section.title=Error Occured
+
+# ----------------------------------------------------------------------
+# Page: Release Error
+# ----------------------------------------------------------------------
+releaseError.page.title=Continuum - Release Error
+releaseError.section.title=Release Error

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
Fri Apr 17 01:54:30 2009
@@ -147,7 +147,6 @@
 groups.page.list.empty = Die Liste der Projektgruppen ist leer.
 groups.section.title = Projektgruppe:
 groups.manage.label = Gruppe verwalten
-groups.confirmation.message = Soll die ''{0}'' Projektgruppe wirklich gel\u00F6scht werden
?
 groups.table.repositoryName = Lokales Repository
 
 # ----------------------------------------------------------------------
@@ -1118,3 +1117,17 @@
 deleteSchedule.page.title=Continuum - Zeitplan l\u00F6schen
 deleteSchedule.section.title=Zeitplan l\u00F6schen
 deleteSchedule.confirmation.message = Soll der ''{0}'' Zeitplan wirklich gel\u00F6scht werden
?
+confirmGroupRemoval.page.title=Continuum - Projektgruppe l\u00F6schen
+confirmGroupRemoval.section.title=Projektgruppe l\u00F6schen
+confirmGroupRemoval.confirmation.message=Soll die ''{0}'' Projektgruppe wirklich gel\u00F6scht
werden ?
+releasePerformFromScm.page.title=Continuum - Projekt ver\u00F6ffentlichen
+releasePerformFromScm.section.title=Projekt ver\u00F6ffentlichen
+releasePerformFromScm.parameters.section.title=Parameter
+authorizationError.page.title=Continuum - Autorisierungs-Fehler
+authorizationError.section.title=Autorisierungs-Fehler
+authorizationError.not.authorized=Autorisierung fehlgeschlagen. Bitte kontaktieren Sie Ihren
Administrator, um entsprechende Berechtigungen zugewiesen zu bekommen.
+errorOccured.page.title=Continuum - Fehler
+errorOccured.section.title=Fehler
+menu.continuum=Continuum
+releaseError.page.title=Continuum - Ver\u00F6ffentlichung fehlgeschlagen
+releaseError.section.title=Ver\u00F6ffentlichung fehlgeschlagen

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp Fri
Apr 17 01:54:30 2009
@@ -22,11 +22,11 @@
 <html>
   <s:i18n name="localization.Continuum">
     <head>
-        <title>Project Group Removal</title>
+        <title><s:text name="confirmGroupRemoval.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3>Project Group Removal</h3>
+        <h3><s:text name="confirmGroupRemoval.section.title"/></h3>
         <div class="axial">
         <s:form action="removeProjectGroup" method="post">
           <s:hidden name="projectGroupId"/>
@@ -36,7 +36,7 @@
           <div class="warningmessage">
             <p>
               <strong>
-                <s:text name="groups.confirmation.message">
+                <s:text name="confirmGroupRemoval.confirmation.message">
                   <s:param><s:property value="%{name}"/></s:param>
                 </s:text>
               </strong>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
Fri Apr 17 01:54:30 2009
@@ -21,23 +21,23 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
+<s:i18n name="localization.Continuum">
 <head>
-  <title>Authorization Error</title>
+  <title><s:text name="authorizationError.page.title"/></title>
 </head>
 
 <body>
   <div id="h3">
-    <h3>Authorization Error</h3>
+    <h3><s:text name="authorizationError.section.title"/></h3>
     <div class="errors">
       <s:if test="hasActionErrors()">
         <s:actionerror/>
       </s:if>
-
       <s:else>
-        You are not authorized to access this page.
-        Please contact your administrator to be granted the appropriate permissions.
+        <s:text name="authorizationError.not.authorized"/>
       </s:else>
     </div>
   </div>
 </body>
+</s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp Fri Apr 17
01:54:30 2009
@@ -21,8 +21,9 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
+<s:i18n name="localization.Continuum">
 <head>
-  <title>Error Occurred</title>
+  <title><s:text name="errorOccured.page.title"/></title>
   <s:head />
   <script language=javascript type='text/javascript'>
     <!--
@@ -58,7 +59,7 @@
 
 <body>
   <div id="h3">
-    <h3>Error Occurred</h3>
+    <h3><s:text name="errorOccured.section.title"/></h3>
 
     <div class="errormessage">
       <s:property value="exception"/>
@@ -71,4 +72,5 @@
     </div>
   </div>
 </body>
+</s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/releaseError.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/releaseError.jsp?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/releaseError.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/releaseError.jsp Fri
Apr 17 01:54:30 2009
@@ -21,13 +21,14 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
+<s:i18n name="localization.Continuum">
 <head>
-  <title>Release Error</title>
+  <title><s:text name="releaseError.page.title"/></title>
 </head>
 
 <body>
   <div id="h3">
-    <h3>Release Error</h3>
+    <h3><s:text name="releaseError.section.title"/></h3>
     <div class="errors">
       <c:if test="${!empty actionErrors}">
         <div class="errormessage">
@@ -39,5 +40,5 @@
     </div>
   </div>
 </body>
+</s:i18n>
 </html>
-  
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Fri
Apr 17 01:54:30 2009
@@ -25,7 +25,7 @@
 <s:i18n name="localization.Continuum">
 <div id="navcolumn">
   <div id="projectmenu" class="toolgroup">
-    <div class="label">Continuum</div>
+    <div class="label"><s:text name="menu.continuum"/></div>
     <div>
       <div class="body">
         <s:url id="aboutUrl" action="about" namespace="/" includeParams="none"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp?rev=765833&r1=765832&r2=765833&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
Fri Apr 17 01:54:30 2009
@@ -22,12 +22,12 @@
 <html>
   <s:i18n name="localization.Continuum">
     <head>
-        <title><s:text name="releaseProject.page.title"/></title>
+        <title><s:text name="releasePerformFromScm.page.title"/></title>
     </head>
     <body>
-      <h2>Perform Project Release</h2>
+      <h2><s:text name="releasePerformFromScm.section.title"/></h2>
       <s:form action="releasePerformFromScm" method="post" validate="true">
-        <h3>Release Perform Parameters</h3>
+        <h3><s:text name="releasePerformFromScm.parameters.section.title"/></h3>
         <s:hidden name="projectId"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">



Mime
View raw message