(MARTON Jozsef)

- Parameterised i18n keys, for much easier and more flexible translation


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1195 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/jsp/browse/authors.jsp

@@ -120,7 +120,7 @@
                                 <%--<span class="browseBarLabel">or enter first few letters:&nbsp;</span>--%>
 								<span class="browseBarLabel"><fmt:message key="jsp.browse.authors.enter"/>&nbsp;</span>
 								<%--<input type="text" name="starts_with">&nbsp;<input type="submit" value="Go!">--%>
-                                <input type="text" name="starts_with">&nbsp;<input type="submit" value="<fmt:message key="jsp.browse.authors.go"/>">
+                                <input type="text" name="starts_with">&nbsp;<input type="submit" value="<fmt:message key="jsp.browse.general.go"/>">
                             </td>
                         </tr>
                     </table>
@@ -131,7 +131,11 @@
         <BR />
 
         <%--<P align=center>Showing authors <%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.</P>--%>
-        <P align=center><fmt:message key="jsp.browse.authors.show"/> <%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> <fmt:message key="jsp.browse.authors.of"/> <%= browseInfo.getTotal() %>.</P>
+        <P align=center><fmt:message key="jsp.browse.authors.show">
+            <fmt:param><%= browseInfo.getOverallPosition() + 1 %></fmt:param>
+            <fmt:param><%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %></fmt:param>
+            <fmt:param><%= browseInfo.getTotal() %></fmt:param>
+        </fmt:message></P>
 
         <%-- Previous page/Next page --%>
         <table align=center border=0 width=70%>
@@ -143,7 +147,7 @@
 %>
 
                     <%-- <A HREF="browse-author?<%= prevQuery %>">Previous page</A> --%>
-					<A HREF="browse-author?<%= prevQuery %>"><fmt:message key="jsp.browse.authors.previous"/></A>
+					<A HREF="browse-author?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></A>
 <%
     }
 %>
@@ -154,7 +158,7 @@
     {
 %>
 		            <%-- <A HREF="browse-author?<%= nextQuery %>">Next page</A> --%>
-                    <A HREF="browse-author?<%= nextQuery %>"><fmt:message key="jsp.browse.authors.next"/></A>
+                    <A HREF="browse-author?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></A>
 <%
     }
 %>
@@ -194,7 +198,7 @@
     {
 %>
                     <%-- <A HREF="browse-author?<%= prevQuery %>">Previous page</A> --%>
-				    <A HREF="browse-author?<%= prevQuery %>"><fmt:message key="jsp.browse.authors.previous"/></A>
+				    <A HREF="browse-author?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></A>
 <%
     }
 %>
@@ -205,7 +209,7 @@
     {
 %>
 		            <%-- <A HREF="browse-author?<%= nextQuery %>">Next page</A> --%>
-                    <A HREF="browse-author?<%= nextQuery %>"><fmt:message key="jsp.browse.authors.next"/></A>
+                    <A HREF="browse-author?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></A>
 <%
     }
 %>

dspace/jsp/browse/items-by-author.jsp

@@ -118,7 +118,9 @@
     </table>
 
     <%-- <P align=center>Showing <%= browseInfo.getResultCount() %> items.</P> --%>
-	<P align=center><fmt:message key="jsp.browse.items-by-author.show"/> <%= browseInfo.getResultCount() %> <fmt:message key="jsp.browse.items-by-author.items"/></P>
+	<P align=center><fmt:message key="jsp.browse.items-by-author.show">
+        <fmt:param><%= browseInfo.getResultCount() %></fmt:param>
+    <fmt:message></P>
 
 
     <%-- The items --%>

dspace/jsp/browse/items-by-date.jsp

@@ -148,7 +148,7 @@
                             </td>
                             <td class="browseBar" rowspan=2>
 							    <%-- <input type=submit value="Go"> --%>
-                                <input type=submit value="<fmt:message key="jsp.browse.items-by-date.go"/>">
+                                <input type=submit value="<fmt:message key="jsp.browse.general.go"/>">
                             </td>
                         </tr>
                         <tr>
@@ -212,7 +212,11 @@
     <BR>
 
     <%-- <P align=center>Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.</P> --%>
-	<P align=center><fmt:message key="jsp.browse.items-by-date.show"/> <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> <fmt:message key="jsp.browse.items-by-date.of"/> <%= browseInfo.getTotal() %>.</P>
+	<P align=center><fmt:message key="jsp.browse.items-by-date.show">
+        <fmt:param><%= browseInfo.getOverallPosition()+1 %></fmt:param>
+        <fmt:param><%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %></fmt:param>
+        <fmt:param><%= browseInfo.getTotal() %></fmt:param>
+    </fmt:message></P>
 
     <%-- Previous page/Next page --%>
     <table align=center border=0 width=70%>
@@ -223,7 +227,7 @@
     {
 %>
                 <%-- <A HREF="browse-date?<%= prevQuery %>">Previous page</A> --%>
-                <A HREF="browse-date?<%= prevQuery %>"><fmt:message key="jsp.browse.items-by-date.previous"/></A>
+                <A HREF="browse-date?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></A>
 <%
     }
 %>
@@ -234,7 +238,7 @@
     {
 %>
                 <%-- <A HREF="browse-date?<%= nextQuery %>">Next page</A> --%>
-				<A HREF="browse-date?<%= nextQuery %>"><fmt:message key="jsp.browse.items-by-date.next"/></A>
+				<A HREF="browse-date?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></A>
 <%
     }
 %>
@@ -262,7 +266,7 @@
     {
 %>
                 <%-- <A HREF="browse-date?<%= prevQuery %>">Previous page</A> --%>
-				<A HREF="browse-date?<%= prevQuery %>"><fmt:message key="jsp.browse.items-by-date.previous"/></A>
+				<A HREF="browse-date?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></A>
 <%
     }
 %>
@@ -273,7 +277,7 @@
     {
 %>
                 <%-- <A HREF="browse-date?<%= nextQuery %>">Next page</A> --%>
-				<A HREF="browse-date?<%= nextQuery %>"><fmt:message key="jsp.browse.items-by-date.next"/></A>
+				<A HREF="browse-date?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></A>
 <%
     }
 %>

dspace/jsp/browse/items-by-title.jsp

@@ -113,7 +113,7 @@
                                     <%-- <span class="browseBarLabel">or enter first few letters:&nbsp;</span> --%>
     								<span class="browseBarLabel"><fmt:message key="jsp.browse.items-by-title.enter"/>&nbsp;</span>
                                     <%-- <input type="text" name="starts_with"/>&nbsp;<input type="submit" value="Go!"> --%>
-    								<input type="text" name="starts_with"/>&nbsp;<input type="submit" value="<fmt:message key="jsp.browse.items-by-title.go"/>">
+    								<input type="text" name="starts_with"/>&nbsp;<input type="submit" value="<fmt:message key="jsp.browse.general.go"/>">
                                 </td>
                             </tr>
                         </table>
@@ -127,8 +127,11 @@
     <P align=center>
         <%-- Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %>
         of <%= browseInfo.getTotal() %>. --%>
-		<fmt:message key="jsp.browse.items-by-title.show"/> <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %>
+		<fmt:message key="jsp.browse.items-by-title.show">
-        <fmt:message key="jsp.browse.items-by-title.of"/> <%= browseInfo.getTotal() %>.
+            <fmt:param><%= browseInfo.getOverallPosition()+1 %></fmt:param>
+            <fmt:param><%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %></fmt:param>
+            <fmt:param><%= browseInfo.getTotal() %></fmt:param>
+        </fmt:message>
     </P>
 
     <%-- Previous page/Next page --%>
@@ -140,7 +143,7 @@
     {
 %>
                 <%-- <A HREF="browse-title?<%= prevQuery %>">Previous page</A> --%>
-				<A HREF="browse-title?<%= prevQuery %>"><fmt:message key="jsp.browse.items-by-title.previous"/></A>
+				<A HREF="browse-title?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></A>
 <%
     }
 %>
@@ -151,7 +154,7 @@
     {
 %>
                 <%-- <A HREF="browse-title?<%= nextQuery %>">Next page</A> --%>
-				<A HREF="browse-title?<%= nextQuery %>"><fmt:message key="jsp.browse.items-by-title.next"/></A>
+				<A HREF="browse-title?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></A>
 <%
     }
 %>
@@ -178,7 +181,7 @@
     {
 %>
                 <%-- <A HREF="browse-title?<%= prevQuery %>">Previous page</A> --%>
-				<A HREF="browse-title?<%= prevQuery %>"><fmt:message key="jsp.browse.items-by-title.previous"/></A>
+				<A HREF="browse-title?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></A>
 <%
     }
 %>
@@ -189,7 +192,7 @@
     {
 %>
                 <%-- <A HREF="browse-title?<%= nextQuery %>">Next page</A> --%>
-				<A HREF="browse-title?<%= nextQuery %>"><fmt:message key="jsp.browse.items-by-title.next"/></A>
+				<A HREF="browse-title?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></A>
 <%
     }
 %>

dspace/jsp/browse/no-results.jsp

@@ -78,27 +78,31 @@
 
 <dspace:layout titlekey="jsp.browse.no-results.title">
 
-    <H1><fmt:message key="jsp.browse.no-results.no1"/></H1>
+    <H1><fmt:message key="jsp.browse.no-results.title"/></H1>
 
 
-<P><fmt:message key="jsp.browse.no-results.no2"/> 
+<P>
     <%
 	    if (collection != null)
 	    {
    %>
-            	<fmt:message key="jsp.browse.no-results.col"/> "<%= collection.getMetadata("name")%>".
+            	<fmt:message key="jsp.browse.no-results.col">
+                    <fmt:param><%= collection.getMetadata("name")%></fmt:param>
+                </fmt:message>
    <%
 	    }
 	    else if (community != null)
 	    {
    %>
-   		<fmt:message key="jsp.browse.no-results.com"/> "<%= community.getMetadata("name")%>".
+   		<fmt:message key="jsp.browse.no-results.com">
+            <fmt:param><%= community.getMetadata("name")%></fmt:param>
+        </fmt:message>
    <%
  	    }
  	    else
  	    {
    %>
-   		<fmt:message key="jsp.no-results.browse.genericScope"/>
+   		<fmt:message key="jsp.browse.no-results.genericScope"/>
    <%
    	    }
    %>

dspace/jsp/collection-home.jsp

@@ -148,8 +148,8 @@
           <table>
             <tr>
               <td class="standard">
-				<small><strong><fmt:message key="jsp.collection-home.location1"/></strong></small>&nbsp;<select name="location">
+				<small><strong><fmt:message key="jsp.general.location"/></strong></small>&nbsp;<select name="location">
-				  <option value="/"><fmt:message key="jsp.collection-home.location2"/></option>
+				  <option value="/"><fmt:message key="jsp.general.genericScope"/></option>
                   <option selected value="<%= community.getHandle() %>"><%= communityName %></option>
                   <option selected value="<%= collection.getHandle() %>/"><%= name %></option>
                 </select>
@@ -157,12 +157,12 @@
             </tr>
             <tr>
               <td class="standard" align=center>
-				<small><fmt:message key="jsp.collection-home.searchfor"/>&nbsp;</small><input type="text" name="query">&nbsp;<input type="submit" name="submit_search" value="<fmt:message key="jsp.collection-home.go"/>">
+				<small><fmt:message key="jsp.general.searchfor"/>&nbsp;</small><input type="text" name="query">&nbsp;<input type="submit" name="submit_search" value="<fmt:message key="jsp.general.go"/>">
               </td>
             </tr>
             <tr>
               <td align=center class="standard">
-                <small><fmt:message key="jsp.collection-home.orbrowse"/>&nbsp;</small><input type="submit" name="submit_titles" value="<fmt:message key="jsp.collection-home.titles.button"/>">&nbsp;<input type="submit" name="submit_authors" value="<fmt:message key="jsp.collection-home.authors.button"/>">&nbsp;<input type="submit" name="submit_dates" value="<fmt:message key="jsp.collection-home.date.button"/>">
+                <small><fmt:message key="jsp.general.orbrowse"/>&nbsp;</small><input type="submit" name="submit_titles" value="<fmt:message key="jsp.general.titles.button"/>">&nbsp;<input type="submit" name="submit_authors" value="<fmt:message key="jsp.general.authors.button"/>">&nbsp;<input type="submit" name="submit_dates" value="<fmt:message key="jsp.general.date.button"/>">
 			  </td>
             </tr>
           </table>
@@ -245,7 +245,7 @@
                   <input type="hidden" name="community_id" value="<%= community.getID() %>">
                   <input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_EDIT_COLLECTION %>">
                   <%--<input type="submit" value="Edit...">--%>
-				  <input type="submit" value="<fmt:message key="jsp.collection-home.edit.button"/>">
+				  <input type="submit" value="<fmt:message key="jsp.general.edit.button"/>">
                 </form>
               </td>
             </tr>

dspace/jsp/community-home.jsp

@@ -126,9 +126,9 @@
             <tr>
               <td class="standard">
                 <%--<small><strong>In:</strong></small>&nbsp;<select name="location">--%>
-				<small><strong><fmt:message key="jsp.community-home.location1"/></strong></small>&nbsp;<select name="location">
+				<small><strong><fmt:message key="jsp.general.location"/></strong></small>&nbsp;<select name="location">
                   <%--<option value="/">All of DSpace</option>--%>
-				  <option value="/"><fmt:message key="jsp.community-home.location2"/></option>
+				  <option value="/"><fmt:message key="jsp.general.genericScope"/></option>
                   <option selected value="<%= community.getHandle() %>"><%= name %></option>
 <%
     for (int i = 0; i < collections.length; i++)
@@ -151,12 +151,12 @@
             </tr>
             <tr>
               <td class="standard" align=center>
-                <small><fmt:message key="jsp.community-home.searchfor"/>&nbsp;</small><input type="text" name="query">&nbsp;<input type="submit" name="submit_search" value="<fmt:message key="jsp.community-home.go.button"/>"> 
+                <small><fmt:message key="jsp.general.searchfor"/>&nbsp;</small><input type="text" name="query">&nbsp;<input type="submit" name="submit_search" value="<fmt:message key="jsp.general.go"/>"> 
 			  </td>
             </tr>
             <tr>
               <td align=center class="standard">
-                <small><fmt:message key="jsp.community-home.orbrowse"/>&nbsp;</small><input type="submit" name="submit_titles" value="<fmt:message key="jsp.community-home.titles.button"/>">&nbsp;<input type="submit" name="submit_authors" value="<fmt:message key="jsp.community-home.authors.button"/>">&nbsp;<input type="submit" name="submit_dates" value="<fmt:message key="jsp.community-home.date.button"/>">
+                <small><fmt:message key="jsp.general.orbrowse"/>&nbsp;</small><input type="submit" name="submit_titles" value="<fmt:message key="jsp.general.titles.button"/>">&nbsp;<input type="submit" name="submit_authors" value="<fmt:message key="jsp.general.authors.button"/>">&nbsp;<input type="submit" name="submit_dates" value="<fmt:message key="jsp.general.date.button"/>">
 			  </td>
             </tr>
           </table>
@@ -289,7 +289,7 @@
 		          <input type="hidden" name="community_id" value="<%= community.getID() %>">
 		          <input type="hidden" name="action" value="<%=EditCommunitiesServlet.START_EDIT_COMMUNITY%>">
                   <%--<input type="submit" value="Edit...">--%>
-				  <input type="submit" value="<fmt:message key="jsp.community-home.edit.button"/>">
+				  <input type="submit" value="<fmt:message key="jsp.general.edit.button"/>">
                 </form>
              <% } %>
              <% if(add_button) { %>

dspace/jsp/components/contact-info.jsp

@@ -50,7 +50,9 @@
 
 <center>
 
-  <P><%= ConfigurationManager.getProperty("dspace.name") %> - <fmt:message key="jsp.components.contact-info.details"/></p>
+  <P><fmt:message key="jsp.components.contact-info.details">
+    <fmt:param><%= ConfigurationManager.getProperty("dspace.name") %></fmt:param>
+  </fmt:message></p>
 
     <table>
         <tr>

dspace/jsp/components/login-form.jsp

@@ -49,7 +49,7 @@
   <tr>
     <td class="evenRowEvenCol">
       <%-- <p><strong>New user? <a href="<%= request.getContextPath() %>/register">Click here to register</a>.</strong></p> --%>
-      <p><strong><fmt:message key="jsp.components.login-form.new"/> <a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.click"/></a>.</strong></p>
+      <p><strong><a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.newuser"/></a></strong></p>
       <%-- <p>Please enter your e-mail address and password into the form below.</p> --%>
 	  <p><fmt:message key="jsp.components.login-form.enter"/></p>
       <form method=POST action="<%= request.getContextPath() %>/password-login">
@@ -73,6 +73,6 @@
         </table>
       </form>
       <%-- <p>Have you <a href="<%= request.getContextPath() %>/forgot">forgotten your password</a>?</p></td> --%>
-	  <p><fmt:message key="jsp.components.login-form.have"/> <a href="<%= request.getContextPath() %>/forgot"><fmt:message key="jsp.components.login-form.forgot"/></a><fmt:message key="jsp.components.login-form.question"/></p></td>
+	  <p><a href="<%= request.getContextPath() %>/forgot"><fmt:message key="jsp.components.login-form.forgot"/></a></p></td>
   </tr>
 </table>

dspace/jsp/display-item.jsp

@@ -123,7 +123,7 @@
                 <form method=GET action="<%= request.getContextPath() %>/tools/edit-item">
                     <input type="hidden" name="item_id" value="<%= item.getID() %>">
                     <%--<input type="submit" name="submit" value="Edit...">--%>
-                    <input type="submit" name="submit" value="<fmt:message key="jsp.display-item.edit.button"/>">
+                    <input type="submit" name="submit" value="<fmt:message key="jsp.general.edit.button"/>">
                 </form>
             </td>
 <%      } %>

dspace/jsp/dspace-admin/authorize-advanced.jsp

@@ -124,7 +124,7 @@
 
         <tr>     
             <%-- <td>Group:</td> --%>
-            <td><fmt:message key="jsp.dspace-admin.authorize-advanced.group"/></td>
+            <td><fmt:message key="jsp.dspace-admin.general.group-colon"/></td>
             <td>
                 <select size="10" name="group_id">
                     <%  for(int i = 0; i < groups.length; i++ ) { %>
@@ -136,7 +136,7 @@
         </tr>
 
         <%-- <tr><td>Action:</td> --%>
-        <tr><td><fmt:message key="jsp.dspace-admin.authorize-advanced.action"/></td>
+        <tr><td><fmt:message key="jsp.dspace-admin.general.action-colon"/></td>
             <td>
                 <select name="action_id">
                     <%  for( int i = 0; i < Constants.actionText.length; i++ ) { %>

dspace/jsp/dspace-admin/authorize-collection-edit.jsp

@@ -92,7 +92,11 @@
     <tr>
       <td align=left>
         <%-- <h1>Policies for Collection "<%= collection.getMetadata("name") %>" (hdl:<%= collection.getHandle() %>, DB ID <%= collection.getID() %>)</h1> --%>
-		<h1><fmt:message key="jsp.dspace-admin.authorize-collection-edit.policies"/><%= collection.getMetadata("name") %>" (hdl:<%= collection.getHandle() %>, DB ID <%= collection.getID() %>)</h1>
+		<h1><fmt:message key="jsp.dspace-admin.authorize-collection-edit.policies">
+            <fmt:param><%= collection.getMetadata("name") %></fmt:param>
+            <fmt:param>hdl:<%= collection.getHandle() %></fmt:param>
+            <fmt:param><%= collection.getID() %></fmt:param>
+        </fmt:message></h1>
       </td>
       <td align="right" class="standard">
         <dspace:popup page="/help/site-admin.html#collectionpolicies"><fmt:message key="jsp.help"/></dspace:popup>
@@ -106,7 +110,7 @@
         <form action="<%= request.getContextPath() %>/dspace-admin/authorize" method=POST>
             <input type="hidden" name="collection_id" value="<%=collection.getID()%>" >
             <%-- <input type="submit" name="submit_collection_add_policy" value="Add New"> --%>
-            <input type="submit" name="submit_collection_add_policy" value="<fmt:message key="jsp.dspace-admin.authorize-collection-edit.add"/>">
+            <input type="submit" name="submit_collection_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>">
         </form>
     </p>
 
@@ -115,9 +119,9 @@
         <tr>
             <th class="oddRowOddCol"><strong>ID</strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Action</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-collection-edit.action"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
             <%-- <th class="oddRowOddCol"><strong>Group</strong></th> --%>
-            <th class="oddRowOddCol"><strong><fmt:message key="jsp.dspace-admin.authorize-collection-edit.group"/></strong></th>
+            <th class="oddRowOddCol"><strong><fmt:message key="jsp.dspace-admin.general.group"/></strong></th>
             <th class="oddRowEvenCol">&nbsp;</th>
             <th class="oddRowOddCol">&nbsp;</th>
         </tr>
@@ -143,11 +147,11 @@
                     <input type="hidden" name="policy_id"     value="<%= rp.getID() %>">
                     <input type="hidden" name="collection_id" value="<%= collection.getID() %>">
                     <%-- <input type="submit" name="submit_collection_edit_policy" value="Edit"> --%>
-                    <input type="submit" name="submit_collection_edit_policy" value="<fmt:message key="jsp.dspace-admin.authorize-collection-edit.edit"/>">
+                    <input type="submit" name="submit_collection_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowOddCol">
                     <%-- <input type="submit" name="submit_collection_delete_policy" value="Delete"> --%>
-                    <input type="submit" name="submit_collection_delete_policy" value="<fmt:message key="jsp.dspace-admin.authorize-collection-edit.delete"/>">
+                    <input type="submit" name="submit_collection_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/dspace-admin/authorize-community-edit.jsp

@@ -88,7 +88,11 @@
     <tr>
       <td align=left>
     <%-- <h1>Policies for Community "<%= community.getMetadata("name") %>" (hdl:<%= community.getHandle() %>, DB ID <%=community.getID()%>)</h1> --%>
-	<h1><fmt:message key="jsp.dspace-admin.authorize-community-edit.policies"/><%= community.getMetadata("name") %>" (hdl:<%= community.getHandle() %>, DB ID <%=community.getID()%>)</h1>
+	<h1><fmt:message key="jsp.dspace-admin.authorize-community-edit.policies">
+        <fmt:param><%= community.getMetadata("name") %></fmt:param>
+        <fmt:param>hdl:<%= community.getHandle() %></fmt:param>
+        <fmt:param><%=community.getID()%></fmt:param>
+    </fmt:message></h1>
       </td>
       <td align="right" class="standard">
         <dspace:popup page="/help/site-admin.html#communitypolicies"><fmt:message key="jsp.help"/></dspace:popup>
@@ -100,7 +104,7 @@
         <form action="<%= request.getContextPath() %>/dspace-admin/authorize" method=POST>
             <input type="hidden" name="community_id" value="<%=community.getID()%>" >
             <%-- <input type="submit" name="submit_community_add_policy" value="Add New"> --%>
-            <input type="submit" name="submit_community_add_policy" value="<fmt:message key="jsp.dspace-admin.authorize-community-edit.add"/>">
+            <input type="submit" name="submit_community_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>">
         </form>
     </p>
 
@@ -109,9 +113,9 @@
         <tr>
             <th class="oddRowOddCol"><strong>ID</strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Action</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-community-edit.action"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
             <%-- <th class="oddRowOddCol"><strong>Group</strong></th> --%>
-            <th class="oddRowOddCol"><strong><fmt:message key="jsp.dspace-admin.authorize-community-edit.group"/></strong></th>
+            <th class="oddRowOddCol"><strong><fmt:message key="jsp.dspace-admin.general.group"/></strong></th>
             <th class="oddRowEvenCol">&nbsp;</th>
             <th class="oddRowOddCol">&nbsp;</th>
         </tr>
@@ -137,11 +141,11 @@
                     <input type="hidden" name="policy_id"     value="<%= rp.getID() %>">
                     <input type="hidden" name="community_id" value="<%= community.getID() %>">
                     <%-- <input type="submit" name="submit_community_edit_policy" value="Edit"> --%>
-                    <input type="submit" name="submit_community_edit_policy" value="<fmt:message key="jsp.dspace-admin.authorize-community-edit.edit"/>">
+                    <input type="submit" name="submit_community_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowOddCol">
                     <%-- <input type="submit" name="submit_community_delete_policy" value="Delete"> --%>
-                    <input type="submit" name="submit_community_delete_policy" value="<fmt:message key="jsp.dspace-admin.authorize-community-edit.delete"/>">
+                    <input type="submit" name="submit_community_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/dspace-admin/authorize-item-edit.jsp

@@ -110,7 +110,10 @@
     <tr>
       <td align=left>
     <%-- <h1>Policies for Item <%= item.getHandle() %> (ID=<%= item.getID() %>)</h1> --%>
-	<h1><fmt:message key="jsp.dspace-admin.authorize-item-edit.policies"/> <%= item.getHandle() %> (ID=<%= item.getID() %>)</h1>
+	<h1><fmt:message key="jsp.dspace-admin.authorize-item-edit.policies">
+        <fmt:param><%= item.getHandle() %></fmt:param>
+        <fmt:param><%= item.getID() %></fmt:param>
+    </fmt:message></h1>
       </td>
       <td align="right" class="standard">
         <%-- <dspace:popup page="/help/site-admin.html#itempolicies">Help...</dspace:popup> --%>
@@ -141,7 +144,7 @@
         <form method=POST>
             <input type="hidden" name="item_id" value="<%=item.getID()%>" >
             <%-- <input type="submit" name="submit_item_add_policy" value="Add New Policy"> --%>
-            <input type="submit" name="submit_item_add_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.add"/>">
+            <input type="submit" name="submit_item_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>">
         </form>
     </p>
 
@@ -150,11 +153,11 @@
         <tr>
             <th class="oddRowOddCol"><strong>ID</strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Action</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.action"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
             <%-- <th class="oddRowOddCol"><strong>EPerson</strong></th> --%>
             <th class="oddRowOddCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.eperson"/></strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Group</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.group"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.group"/></strong></th>
             <th class="oddRowOddCol">&nbsp;</th>
             <th class="oddRowEvenCol">&nbsp;</th>
         </tr>
@@ -183,11 +186,11 @@
                     <input type="hidden" name="policy_id"     value="<%= rp.getID() %>">
                     <input type="hidden" name="item_id"       value="<%= item.getID() %>">
                     <%-- <input type="submit" name="submit_item_edit_policy" value="Edit"> --%>
-                    <input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.edit"/>">
+                    <input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_item_delete_policy" value="Delete"> --%>
-                    <input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.delete"/>">
+                    <input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                 </td>
             </tr>
         </form>
@@ -207,14 +210,16 @@
 
 %>                
         <%-- <H3>Bundle <%=myBun.getID()%> Policies</H3> --%>
-        <H3><fmt:message key="jsp.dspace-admin.authorize-item-edit.bundle"/> <%=myBun.getID()%></H3>
+        <H3><fmt:message key="jsp.dspace-admin.authorize-item-edit.bundle">
+            <fmt:param><%=myBun.getID()%></fmt:param>
+        </fmt:message></H3>
 
         <P align="center">
             <form method=POST>
                 <input type="hidden" name="item_id"   value="<%=item.getID()%>" >
                 <input type="hidden" name="bundle_id" value="<%=myBun.getID()%>" >
                 <%-- <input type="submit" name="submit_bundle_add_policy" value="Add New Policy"> --%>
-                <input type="submit" name="submit_bundle_add_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.add"/>">
+                <input type="submit" name="submit_bundle_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>">
             </form>
         </P>
         
@@ -223,10 +228,10 @@
         <tr>
             <th class="oddRowOddCol"><strong>ID</strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Action</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.action"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
             <th class="oddRowOddCol"><strong>EPerson</strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Group</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.group"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.group"/></strong></th>
             <th class="oddRowOddCol">&nbsp;</th>
             <th class="oddRowEvenCol">&nbsp;</th>
         </tr>
@@ -256,11 +261,11 @@
                     <input type="hidden" name="item_id"       value="<%= item.getID() %>">
                     <input type="hidden" name="bundle_id"     value="<%= myBun.getID() %>">
                     <%-- <input type="submit" name="submit_item_edit_policy" value="Edit"> --%>
-                    <input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.edit"/>">
+                    <input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_item_delete_policy" value="Delete"> --%>
-                    <input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.delete"/>">
+                    <input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                 </td>
             </tr>
         </form>
@@ -283,23 +288,26 @@
             // display bitstream's policies
 %>                        
             <%-- <P>Bitstream <%=myBits.getID()%> (<%=myBits.getName()%>)</P> --%>
-            <P><fmt:message key="jsp.dspace-admin.authorize-item-edit.bit"/> <%=myBits.getID()%> (<%=myBits.getName()%>)</P>
+            <P><fmt:message key="jsp.dspace-admin.authorize-item-edit.bitstream">
+                <fmt:param><%=myBits.getID()%></fmt:param>
+                <fmt:param><%=myBits.getName()%></fmt:param>
+            </fmt:message></P>
             <P align="center">
                 <FORM method=POST>
                     <input type="hidden" name="item_id"      value="<%=item.getID()%>">
                     <input type="hidden" name="bitstream_id" value="<%=myBits.getID()%>" >
                     <%-- <input type="submit" name="submit_bitstream_add_policy" value="Add New Policy"> --%>
-                    <input type="submit" name="submit_bitstream_add_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.add"/>">
+                    <input type="submit" name="submit_bitstream_add_policy" value="<fmt:message key="jsp.dspace-admin.general.addpolicy"/>">
                 </FORM>
             </P>
             <table class="miscTable" align="center">
             <tr>
                 <th class="oddRowOddCol"><strong>ID</strong></th>
                 <%-- <th class="oddRowEvenCol"><strong>Action</strong></th> --%>
-                <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.action"/></strong></th>
+                <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.action"/></strong></th>
-                <th class="oddRowOddCol"><strong>EPerson</strong></th>
+                <th class="oddRowOddCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.eperson" /></strong></th>
                 <%-- <th class="oddRowEvenCol"><strong>Group</strong></th> --%>
-                <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.authorize-item-edit.group"/></strong></th>
+                <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.general.group"/></strong></th>
                 <th class="oddRowOddCol">&nbsp;</th>
                 <th class="oddRowEvenCol">&nbsp;</th>
             </tr>
@@ -329,11 +337,11 @@
                     <input type="hidden" name="item_id"       value="<%= item.getID()   %>">
                     <input type="hidden" name="bitstream_id"  value="<%= myBits.getID() %>">
                     <%-- <input type="submit" name="submit_item_edit_policy" value="Edit"> --%>
-                    <input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.edit"/>">
+                    <input type="submit" name="submit_item_edit_policy" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_item_delete_policy" value="Delete"> --%>
-                    <input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.authorize-item-edit.delete"/>">
+                    <input type="submit" name="submit_item_delete_policy" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/dspace-admin/authorize-policy-edit.jsp

@@ -97,7 +97,9 @@
     <tr>
       <td align=left>
         <%-- <h1>Edit Policy for <%= edit_title %>:</h1> --%>
-        <h1><fmt:message key="jsp.dspace-admin.authorize-policy-edit.heading"/> <%= edit_title %>:</h1>
+        <h1><fmt:message key="jsp.dspace-admin.authorize-policy-edit.heading">
+            <fmt:param><%= edit_title %></fmt:param>
+        </fmt:message></h1>
       </td>
       <td align="right" class="standard">
         <dspace:popup page="/help/site-admin.html#authorize"><fmt:message key="jsp.help"/></dspace:popup>
@@ -111,7 +113,7 @@
     <table class="miscTable" align="center">
         <tr>     
             <%-- <td>Group:</td> --%>
-            <td><fmt:message key="jsp.dspace-admin.authorize-policy-edit.group"/></td>
+            <td><fmt:message key="jsp.dspace-admin.general.group-colon"/></td>
             <td>
                 <select size="15" name="group_id">
                     <%  for(int i = 0; i < groups.length; i++ ) { %>
@@ -124,7 +126,7 @@
         </tr>
 
         <%-- <tr><td>Action:</td> --%>
-        <tr><td><fmt:message key="jsp.dspace-admin.authorize-policy-edit.action"/></td>
+        <tr><td><fmt:message key="jsp.dspace-admin.general.action-colon"/></td>
             <td><input type="hidden" name="<%=id_name%>" value="<%=id%>">
                 <input type="hidden" name="policy_id" value="<%=policy.getID()%>" >
                 <select name="action_id">
@@ -152,11 +154,11 @@
             <tr>
                 <td align="left">
                     <%-- <input type="submit" name="submit_save_policy" value="Save Policy"> --%>
-                    <input type="submit" name="submit_save_policy" value="<fmt:message key="jsp.dspace-admin.authorize-policy-edit.save"/>">
+                    <input type="submit" name="submit_save_policy" value="<fmt:message key="jsp.dspace-admin.general.save"/>">
                 </td>
                 <td align="right">
                     <%-- <input type="submit" name="submit_cancel_policy" value="Cancel"> --%>
-                    <input type="submit" name="submit_cancel_policy" value="<fmt:message key="jsp.dspace-admin.authorize-policy-edit.cancel"/>">
+                    <input type="submit" name="submit_cancel_policy" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                 </td>
             </tr>
         </table>

dspace/jsp/dspace-admin/collection-select.jsp

@@ -92,11 +92,11 @@
             <tr>
                 <td align="left">
                     <%-- <input type="submit" name="submit_collection_select" value="Edit Policies"> --%>
-                    <input type="submit" name="submit_collection_select" value="<fmt:message key="jsp.dspace-admin.collection-select.edit"/>">
+                    <input type="submit" name="submit_collection_select" value="<fmt:message key="jsp.dspace-admin.general.editpolicy"/>">
                 </td>
                 <td align="right">
                     <%-- <input type="submit" name="submit_collection_select_cancel" value="Cancel"> --%>
-                    <input type="submit" name="submit_collection_select_cancel" value="<fmt:message key="jsp.dspace-admin.collection-select.cancel"/>">
+                    <input type="submit" name="submit_collection_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                 </td>
             </tr>
         </table>

dspace/jsp/dspace-admin/community-select.jsp

@@ -95,11 +95,11 @@
             <tr>
                 <td align="left">
                     <%-- <input type="submit" name="submit_community_select" value="Edit Policies"> --%>
-                    <input type="submit" name="submit_community_select" value="<fmt:message key="jsp.dspace-admin.community-select.edit"/>">
+                    <input type="submit" name="submit_community_select" value="<fmt:message key="jsp.dspace-admin.general.editpolicy"/>">
                 </td>
                 <td align="right">
                     <%-- <input type="submit" name="submit_community_select_cancel" value="Cancel"> --%>
-                    <input type="submit" name="submit_community_select_cancel" value="<fmt:message key="jsp.dspace-admin.community-select.cancel"/>">
+                    <input type="submit" name="submit_community_select_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                 </td>
             </tr>
         </table>

dspace/jsp/dspace-admin/confirm-delete-dctype.jsp

@@ -68,12 +68,15 @@
                parentlink="/dspace-admin">
 
     <%-- <H1>Delete Dublin Core Format: <code><%= typeName %></code></H1> --%>
-    <H1><fmt:message key="jsp.dspace-admin.confirm-delete-dctype.heading"/> <code><%= typeName %></code></H1>
+    <H1><fmt:message key="jsp.dspace-admin.confirm-delete-dctype.heading">
+        <fmt:param><%= typeName %></fmt:param>
+    </fmt:message></H1>
     
     <%-- <P>Are you sure the format <strong><%= typeName %></strong>
     should be deleted?</P> --%>
-    <P><fmt:message key="jsp.dspace-admin.confirm-delete-dctype.confirm1"/> <strong><%= typeName %></strong>
+    <P><fmt:message key="jsp.dspace-admin.confirm-delete-dctype.confirm">
-    <fmt:message key="jsp.dspace-admin.confirm-delete-dctype.confirm2"/></P>
+        <fmt:param><%= typeName %></fmt:param>
+    </fmt:message></P>
     
     <%-- <P>This will result in an error if any DC values have this type.</P> --%>
     <P><fmt:message key="jsp.dspace-admin.confirm-delete-dctype.warning"/></P>
@@ -86,11 +89,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
-                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.confirm-delete-dctype.delete"/>">
+                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.confirm-delete-dctype.cancel"/>">
+                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/confirm-delete-eperson.jsp

@@ -65,7 +65,10 @@
                parentlink="/dspace-admin">
 
     <%-- <H1>Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)</H1> --%>
-    <H1><fmt:message key="jsp.dspace-admin.confirm-delete-eperson.heading"/> <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)</H1>
+    <H1><fmt:message key="jsp.dspace-admin.confirm-delete-eperson.heading">
+        <fmt:param><%= eperson.getFullName() %></fmt:param>
+        <fmt:param><%= eperson.getEmail() %></fmt:param>
+    </fmt:message></H1>
     
     <%-- <P>Are you sure this e-person should be deleted?</P> --%>
     <P><fmt:message key="jsp.dspace-admin.confirm-delete-eperson.confirm"/></P>
@@ -78,11 +81,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
-                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.confirm-delete-eperson.delete"/>">
+                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.confirm-delete-eperson.cancel"/>">
+                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/confirm-delete-format.jsp

@@ -65,12 +65,15 @@
                parentlink="/dspace-admin">
 
     <%-- <H1>Delete Bitstream Format: <%= format.getID() %></H1> --%>
-    <H1><fmt:message key="jsp.dspace-admin.confirm-delete-format.heading"/> <%= format.getID() %></H1>
+    <H1><fmt:message key="jsp.dspace-admin.confirm-delete-format.heading">
+        <fmt:param><%= format.getID() %></fmt:param>
+    </fmt:message></H1>
     
     <%-- <P>Are you sure the format <strong><%= format.getShortDescription() %></strong>
     should be deleted?</P> --%>
-    <P><fmt:message key="jsp.dspace-admin.confirm-delete-format.confirm1"/> <strong><%= format.getShortDescription() %></strong>
+    <P><fmt:message key="jsp.dspace-admin.confirm-delete-format.confirm">
-    <fmt:message key="jsp.dspace-admin.confirm-delete-format.confirm2"/></P>
+        <fmt:param><%= format.getShortDescription() %></fmt:param>
+    </fmt:message></P>
     
     <%-- <P>Any existing bitstreams of this format will be reverted to the
     <em>unknown</em> bitstream format.</P> --%>
@@ -84,11 +87,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
-                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.confirm-delete-format.delete"/>">
+                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.confirm-delete-format.cancel"/>">
+                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/eperson-browse.jsp

@@ -105,21 +105,25 @@
                parentlink="/dspace-admin">
 
     <%-- <h1>Browse EPeople <%=firstEPerson%>-<%=lastEPerson%> of <%=epeople.length%></h1> --%>
-    <h1><fmt:message key="jsp.dspace-admin.eperson-browse.heading1"/> <%=firstEPerson%>-<%=lastEPerson%> <fmt:message key="jsp.dspace-admin.eperson-browse.of"/> <%=epeople.length%></h1>
+    <h1><fmt:message key="jsp.dspace-admin.eperson-browse.heading">
+        <fmt:param><%=firstEPerson%></fmt:param>
+        <fmt:param><%=lastEPerson%></fmt:param>
+        <fmt:param><%=epeople.length%></fmt:param>
+    </fmt:message></h1>
 
     <table class="miscTable" align="center">
         <tr>
             <th class="oddRowOddCol"> <strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=id">ID</A></strong></th>
             <%-- <th class="oddRowEvenCol"><strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=email">E-mail Address</A></strong></th> --%>
-            <th class="oddRowEvenCol"><strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=email"><fmt:message key="jsp.dspace-admin.eperson-browse.address"/></A></strong></th>
+            <th class="oddRowEvenCol"><strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=email"><fmt:message key="jsp.dspace-admin.eperson-browse.email"/></A></strong></th>
             <%-- <th class="oddRowOddCol"> <strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=lastname">Last Name</A></strong></th> --%>
-            <th class="oddRowOddCol"> <strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=lastname"><fmt:message key="jsp.dspace-admin.eperson-browse.name1"/></A></strong></th>
+            <th class="oddRowOddCol"> <strong><A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople?submit_browse=1&sortby=lastname"><fmt:message key="jsp.dspace-admin.eperson.general.firstname"/></A></strong></th>
             <%-- <th class="oddRowEvenCol"><strong>First Name</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.eperson-browse.name2"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.eperson.general.lastname"/></strong></th>
             <%-- <th class="oddRowOddCol"> <strong>Can Log In?</strong></th> --%>
-            <th class="oddRowOddCol"> <strong><fmt:message key="jsp.dspace-admin.eperson-browse.can"/></strong></th>
+            <th class="oddRowOddCol"> <strong><fmt:message key="jsp.dspace-admin.eperson-browse.canlogin"/></strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Must Use Cert?</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.eperson-browse.must"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.eperson-browse.mustusecert"/></strong></th>
             <%-- <th class="oddRowOddCol"> <strong>Self Registered</strong></th> --%>
             <th class="oddRowOddCol"> <strong><fmt:message key="jsp.dspace-admin.eperson-browse.self"/></strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Telephone</strong></th> --%>
@@ -165,11 +169,11 @@
                     <input type="hidden" name="sortby" value="<%= request.getParameter("sortby") %>">
 <%      } %>
                     <%-- <input type="submit" name="submit_edit" value="Edit..."> --%>
-                    <input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.eperson-browse.edit"/>">
+                    <input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_delete" value="Delete..."> --%>
-                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.eperson-browse.delete"/>">
+                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/dspace-admin/eperson-confirm-delete.jsp

@@ -64,7 +64,10 @@
                parentlink="/dspace-admin">
 
     <%-- <H1>Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)</H1> --%>
-    <H1><fmt:message key="jsp.dspace-admin.eperson-confirm-delete.heading"/> <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)</H1>
+    <H1><fmt:message key="jsp.dspace-admin.eperson-confirm-delete.heading">
+        <fmt:param><%= eperson.getFullName() %></fmt:param>
+        <fmt:param><%= eperson.getEmail() %></fmt:param>
+    </fmt:message></H1>
     
     <%-- <P>Are you sure this e-person should be deleted?</P> --%>
     <P><fmt:message key="jsp.dspace-admin.eperson-confirm-delete.confirm"/></P>
@@ -77,11 +80,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit_confirm_delete" value="Delete"> --%>
-                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.eperson-confirm-delete.delete"/>">
+                        <input type="submit" name="submit_confirm_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.eperson-confirm-delete.cancel"/>">
+                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/eperson-deletion-error.jsp

@@ -46,6 +46,9 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
+    prefix="fmt" %>
+
 <%@ page isErrorPage="true" %>
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
@@ -61,16 +64,19 @@
   
 %>
 
-<dspace:layout title="EPerson deletion error"
+<dspace:layout titlekey="jsp.dspace-admin.eperson-deletion-error.title"
                navbar="admin"
                locbar="link"
-               parentlink="/dspace-admin"
+               parenttitlekey="jsp.administer"
-               parenttitle="Administer">
+               parentlink="/dspace-admin">
 
-    <H1>Cannot Delete EPerson</H1>
+    <H1><fmt:message key="jsp.dspace-admin.eperson-deletion-error.heading" /></H1>
 
-    <P>The EPerson <%=fullName%> cannot be deleted because a reference to it
+    <%-- <P>The EPerson <%=fullName%> cannot be deleted because a reference to it
-     exists in the following table(s):</P>
+     exists in the following table(s):</P> --%>
+    <P><fmt:message key="jsp.dspace-admin.eperson-deletion-error.errormsg">
+        <fmt:param><%=fullName%></fmt:param>
+    </fmt:message></P>
 
      <UL>
      <% while(tableIt.hasNext())
@@ -90,7 +96,7 @@
     <p>&nbsp;</p>
 
     <P align=center>
-        <A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople">Return to the Administer EPeople page</A>
+        <A HREF="<%= request.getContextPath() %>/dspace-admin/edit-epeople"><fmt:message key="jsp.dspace-admin.confirm-delete-format.returntoedit" /></A>
     </P>
 	
 

dspace/jsp/dspace-admin/eperson-edit.jsp

@@ -89,7 +89,9 @@
     <tr>
       <td align=left>
         <%-- <h1>Edit EPerson <%= eperson.getEmail() %>:</h1> --%>
-        <h1><fmt:message key="jsp.dspace-admin.eperson-edit.heading"/> <%= eperson.getEmail() %>:</h1>
+        <h1><fmt:message key="jsp.dspace-admin.eperson-edit.heading">
+            <fmt:param><%= eperson.getEmail() %></fmt:param>
+        </fmt:message></h1>
       </td>
       <td align="right" class="standard">
         <dspace:popup page="/help/site-admin.html#epeople"><fmt:message key="jsp.help"/></dspace:popup>
@@ -111,7 +113,7 @@
 
         <tr>
             <%-- <td>Last Name:</td> --%>
-            <td><fmt:message key="jsp.dspace-admin.eperson-edit.name1"/></td>
+            <td><fmt:message key="jsp.dspace-admin.eperson.general.firstname"/></td>
             <td>
                 <input name="lastname" size="24" value="<%=lastName == null ? "" : lastName%>">
             </td>
@@ -119,7 +121,7 @@
 
         <tr>
             <%-- <td>First Name:</td> --%>
-            <td><fmt:message key="jsp.dspace-admin.eperson-edit.name2"/></td>
+            <td><fmt:message key="jsp.dspace-admin.eperson.general.lastname"/></td>
             <td>
                 <input name="firstname" size="24" value="<%=firstName == null ? "" : firstName%>">
             </td>
@@ -166,11 +168,11 @@
             <tr>
                 <td align="left">
                     <%-- <input type="submit" name="submit_save" value="Save Edits"> --%>
-                    <input type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.eperson-edit.save"/>">
+                    <input type="submit" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>">
                 </td>
                 <td align="right">
                     <%-- <input type="submit" name="submit_delete" value="Delete EPerson..."> --%>
-                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.eperson-edit.delete"/>">
+                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete"/>">
                 </td>
             </tr>
         </table>

dspace/jsp/dspace-admin/eperson-main.jsp

@@ -98,11 +98,11 @@
                 </td>
                 <td>
                 	<%-- then&nbsp;<input type="submit" name="submit_edit" value="Edit..." onclick="javascript:finishEPerson();"> --%>
-                	<fmt:message key="jsp.dspace-admin.eperson-main.then"/>&nbsp;<input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.eperson-main.edit"/>" onclick="javascript:finishEPerson();">
+                	<fmt:message key="jsp.dspace-admin.eperson-main.then"/>&nbsp;<input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>" onclick="javascript:finishEPerson();">
                 </td>
                 <td>
                 	<%-- <input type="submit" name="submit_delete" value="Delete..." onclick="javascript:finishEPerson();"> --%>
-                	<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.eperson-main.delete"/>" onclick="javascript:finishEPerson();">
+                	<input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>" onclick="javascript:finishEPerson();">
                 </td>
             </tr>
         </table>

dspace/jsp/dspace-admin/group-eperson-select.jsp

@@ -74,7 +74,9 @@
                nocache="true">
 
     <%-- <h1>Select EPerson to Add to Group <%= group.getID() %></h1> --%>
-    <h1><fmt:message key="jsp.dspace-admin.group-eperson-select.heading"/> <%= group.getID() %></h1>
+    <h1><fmt:message key="jsp.dspace-admin.group-eperson-select.heading">
+        <fmt:param><%= group.getID() %></fmt:param>
+    </fmt:message></h1>
 
     <form method=POST>
 
@@ -103,7 +105,7 @@
                 </td>
                 <td align="right">
                     <%-- <input type="submit" name="submit_add_eperson_cancel" value="Cancel"> --%>
-                    <input type="submit" name="submit_add_eperson_cancel" value="<fmt:message key="jsp.dspace-admin.group-eperson-select.cancel"/>">
+                    <input type="submit" name="submit_add_eperson_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                 </td>
             </tr>
         </table>

dspace/jsp/dspace-admin/item-select.jsp

@@ -71,8 +71,9 @@
     <%-- <P><strong>The ID you entered isn't a valid item ID.</strong>  If you're trying to
     edit a community or collection, you need to use the
     <A HREF="<%= request.getContextPath() %>/dspace-admin/edit-communities">communities/collections admin page.</A></P> --%>
-    <P><fmt:message key="jsp.dspace-admin.item-select.text1"/>
+    <P><fmt:message key="jsp.dspace-admin.item-select.text">
-    <A HREF="<%= request.getContextPath() %>/dspace-admin/edit-communities"><fmt:message key="jsp.dspace-admin.item-select.text2"/></A></P>
+        <fmt:param><%= request.getContextPath() %>/dspace-admin/edit-communities</fmt:param>
+    </fmt:message></P>
 <%  } %>
 
     <%-- <P>Enter the Handle or internal item ID of the item you wish to select. --%>

dspace/jsp/dspace-admin/list-communities.jsp

@@ -73,7 +73,7 @@
                parentlink="/dspace-admin">
 
     <%-- <H1>Edit Communities and Collections</H1> --%>
-    <H1><fmt:message key="jsp.dspace-admin.list-communities.heading"/></H1>
+    <H1><fmt:message key="jsp.dspace-admin.list-communities.title"/></H1>
     
     <form method=POST>
         <input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_CREATE_COMMUNITY %>">

dspace/jsp/dspace-admin/list-dc-types.jsp

@@ -72,7 +72,7 @@
     <tr>
       <td align=left>
        <%-- <h1>Dublin Core Type Registry</h1> --%>
-        <h1><fmt:message key="jsp.dspace-admin.list-dc-types.heading"/></h1>
+        <h1><fmt:message key="jsp.dspace-admin.list-dc-types.title"/></h1>
       </td>
       <td align="right" class="standard">
         <dspace:popup page="/help/site-admin.html#dublincore"><fmt:message key="jsp.help"/></dspace:popup>
@@ -84,7 +84,7 @@
         Note: Adding a new element to the DC Registry does not add a corresponding input field to the submit forms!
     </p> --%>
     <p align="center">
-        <fmt:message key="jsp.dspace-admin.list-dc-types.note1"/>
+        <fmt:message key="jsp.dspace-admin.list-dc-types.note"/>
     </p>
 
     <table class="miscTable" align="center">
@@ -120,11 +120,11 @@
                 <td class="<%= row %>RowOddCol">
                     <input type="hidden" name="dc_type_id" value="<%= types[i].getID() %>">
                     <%-- <input type="submit" name="submit_update" value="Update"> --%>
-                    <input type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.list-dc-types.update"/>">
+                    <input type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>">
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_delete" value="Delete..."> --%>
-                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.list-dc-types.delete"/>">
+                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>">
                 </td>
             </tr>
         </form>
@@ -136,10 +136,10 @@
         
     <P align="center">
         <%-- Note: Adding a new element to the DC Registry does not add a corresponding input field to the submit forms!<br><br> --%>
-        <fmt:message key="jsp.dspace-admin.list-dc-types.note2"/><br><br>
+        <fmt:message key="jsp.dspace-admin.list-dc-types.note"/><br><br>
         <form method=POST>
             <%-- <input type="submit" name="submit_add" value="Add New"> --%>
-            <input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.list-dc-types.add"/>">
+            <input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.addnew"/>">
         </form>
     </p>
 </dspace:layout>

dspace/jsp/dspace-admin/list-formats.jsp

@@ -72,7 +72,7 @@
                parentlink="/dspace-admin">
 
     <%-- <h1>Bitstream Format Registry</h1> --%>
-    <h1><fmt:message key="jsp.dspace-admin.list-formats.heading"/></h1>
+    <h1><fmt:message key="jsp.dspace-admin.list-formats.title"/></h1>
 
     <%-- <P><strong>Extensions</strong> are comma-separated lists of filename
     extensions used to automatically identify the formats of uploaded files.
@@ -162,14 +162,14 @@
                 <td class="<%= row %>RowEvenCol">
                     <input type="hidden" name="format_id" value="<%= formats[i].getID() %>">
                     <%-- <input type="submit" name="submit_update" value="Update"> --%>
-                    <input type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.list-formats.update"/>">
+                    <input type="submit" name="submit_update" value="<fmt:message key="jsp.dspace-admin.general.update"/>">
                 </td>
                 <td class="<%= row %>RowOddCol">
                     <%
                       if (BitstreamFormat.findUnknown(context).getID() != formats[i].getID()) {
                     %>
                     <%-- <input type="submit" name="submit_delete" value="Delete..."> --%>
-                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.list-formats.delete"/>">
+                    <input type="submit" name="submit_delete" value="<fmt:message key="jsp.dspace-admin.general.delete-w-confirm"/>">
                     <% 
                       } 
                     %>
@@ -185,7 +185,7 @@
     <P align="center">
         <form method=POST>
             <%-- <input type="submit" name="submit_add" value="Add New"> --%>
-            <input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.list-formats.add"/>">
+            <input type="submit" name="submit_add" value="<fmt:message key="jsp.dspace-admin.general.addnew"/>">
         </form>
     </p>
 </dspace:layout>

dspace/jsp/dspace-admin/news-edit.jsp

@@ -73,16 +73,16 @@
 
     <%-- <p>Add or edit text in the box below to have it appear
     in the <strong><%= positionStr%></strong> of the DSpace home page.</p> --%>
-    <p><fmt:message key="jsp.dspace-admin.news-edit.text1"/><strong>
+    <p>
 <% if (position.intValue() == Constants.NEWS_TOP)
    { %>
-    <fmt:message key="jsp.dspace-admin.news-edit.positionStr.top"/>
+    <fmt:message key="jsp.dspace-admin.news-edit.text.topbox"/>
 <% }
    else
    { %>
-    <fmt:message key="jsp.dspace-admin.news-edit.positionStr.side"/>
+    <fmt:message key="jsp.dspace-admin.news-edit.text.sidebar"/>
 <% } %>
-    </strong> <fmt:message key="jsp.dspace-admin.news-edit.text2"/></p>
+    </p>
 
     <%-- <p>You may format the text using HTML tags, but please note that the HTML will not be validated here.</p> --%>
     <p><fmt:message key="jsp.dspace-admin.news-edit.text3"/></p>
@@ -99,9 +99,9 @@
                     <td colspan="2" align="center">
                     <input type="HIDDEN" name="position" value='<%= position.intValue()%>'>
                     <%-- <input type="SUBMIT" name="submit_save" value="Save"> --%>
-                    <input type="SUBMIT" name="submit_save" value="<fmt:message key="jsp.dspace-admin.news-edit.save"/>">
+                    <input type="SUBMIT" name="submit_save" value="<fmt:message key="jsp.dspace-admin.general.save"/>">
                     <%-- <input type="SUBMIT" name="cancel" value="Cancel"> --%>
-                    <input type="SUBMIT" name="cancel" value="<fmt:message key="jsp.dspace-admin.news-edit.cancel"/>">
+                    <input type="SUBMIT" name="cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/news-main.jsp

@@ -86,22 +86,22 @@
         <form action="<%= request.getContextPath() %>/dspace-admin/news-edit" method="POST">
             <tr>
                 <%-- <td class="oddRowOddCol">Top News</td> --%>
-                <td class="oddRowOddCol"><fmt:message key="jsp.dspace-admin.news-main.news1"/></td>
+                <td class="oddRowOddCol"><fmt:message key="jsp.dspace-admin.news-main.news.top"/></td>
                 <td class="oddRowEvenCol">
                     <input type="hidden" name="position" value=<%= Constants.NEWS_TOP %>>
                     <%-- <input type="submit" name="submit_edit" value="Edit..."> --%>
-                    <input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.news-main.edit"/>">
+                    <input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
             </tr>
         </form>
         <form action="<%= request.getContextPath() %>/dspace-admin/news-edit" method="POST">
             <tr>
                 <%-- <td class="evenRowOddCol">Sidebar News</td> --%>
-                <td class="evenRowOddCol"><fmt:message key="jsp.dspace-admin.news-main.news2"/></td>
+                <td class="evenRowOddCol"><fmt:message key="jsp.dspace-admin.news-main.news.sidebar"/></td>
                 <td class="evenRowEvenCol">
                     <input type="hidden" name="position" value=<%= Constants.NEWS_SIDE %>>
                     <%-- <input type="submit" name="submit_edit" value="Edit..."> --%>
-                    <input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.news-main.edit"/>">
+                    <input type="submit" name="submit_edit" value="<fmt:message key="jsp.dspace-admin.general.edit"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/dspace-admin/upload-logo.jsp

@@ -71,7 +71,7 @@
                nocache="true">
 
     <%-- <H1>Upload Logo</H1> --%>
-    <H1><fmt:message key="jsp.dspace-admin.upload-logo.heading"/></H1>
+    <H1><fmt:message key="jsp.dspace-admin.upload-logo.title"/></H1>
     
     <%-- <P>Select the logo to upload for
 	<%= (collection != null ? "collection <strong>" + collection.getMetadata("name") + "</strong>"
@@ -79,16 +79,20 @@
     </P> --%>
     
     
-    	<P><fmt:message key ="upload-logo.select"/> 
+    	<P>
     	    <%
 	    	if (collection != null){
 	    %>
-	    		<fmt:message key="jsp.dspace-admin.upload-logo.col"/> <strong><%= collection.getMetadata("name")%></strong>
+	    		<fmt:message key="jsp.dspace-admin.upload-logo.select.col">
+                    <fmt:param><%= collection.getMetadata("name")%></fmt:param>
+                </fmt:message>
 	    <%	
 	    	}
 	    	else{
 	    %>
-	    		<fmt:message key="jsp.dspace-admin.upload-logo.com"/> <strong><%= community.getMetadata("name")%></strong>
+	    		<fmt:message key="jsp.dspace-admin.upload-logo.select.com">
+                    <fmt:param><%= community.getMetadata("name")%></fmt:param>
+                </fmt:message>
 	    <%
 	    	}
 	    %>
@@ -105,6 +109,6 @@
 <%  } %>
 
         <%-- <P align=center><input type="submit" name="submit" value="Upload"></P> --%>
-        <P align=center><input type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.upload-logo.upload"/>"></P>
+        <P align=center><input type="submit" name="submit" value="<fmt:message key="jsp.dspace-admin.general.upload"/>"></P>
     </form>
 </dspace:layout>

dspace/jsp/dspace-admin/wizard-basicinfo.jsp

@@ -67,7 +67,7 @@
     <tr>
       <td>
         <%-- <H1>Describe the Collection</H1> --%>
-        <H1><fmt:message key="jsp.dspace-admin.wizard-basicinfo.heading"/></H1>
+        <H1><fmt:message key="jsp.dspace-admin.wizard-basicinfo.title"/></H1>
       </td>
       <td class="standard" align=right>
         <dspace:popup page="/help/site-admin.html#wizard_description"><fmt:message key="jsp.help"/></dspace:popup>
@@ -203,7 +203,7 @@
                     </td>
                     <td>
                         <%-- <input type=submit name="submit_next" value="Next &gt;"> --%>
-                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.wizard-basicinfo.next"/>">
+                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>">
                    </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/wizard-default-item.jsp

@@ -136,7 +136,7 @@
                     </td>
                     <td>
                         <%-- <input type=submit name="submit_next" value="Next &gt;"> --%>
-                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.wizard-default-item.next"/>">
+                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/wizard-permissions.jsp

@@ -210,7 +210,7 @@ other collections to this collection (subject to authorization from that collect
                     </td>
                     <td>
                         <%-- <input type=submit name="submit_next" value="Next &gt;" onclick="javascript:finishEPerson();"> --%>
-                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.wizard-permissions.next"/>" onclick="javascript:finishEPerson();">
+                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>" onclick="javascript:finishEPerson();">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/wizard-questions.jsp

@@ -68,7 +68,7 @@
     <%-- <H1>Describe the Collection</H1> --%>
     
 
-<H1><fmt:message key="jsp.dspace-admin.wizard-questions.heading"/></H1>
+<H1><fmt:message key="jsp.dspace-admin.wizard-questions.title"/></H1>
 
     <form action="<%= request.getContextPath() %>/tools/collection-wizard" method=post>
 
@@ -207,7 +207,7 @@
                         
                     </td>
                     <td>
-                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.wizard-questions.next"/>">
+                        <input type=submit name="submit_next" value="<fmt:message key="jsp.dspace-admin.general.next.button"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/workflow-abort-confirm.jsp

@@ -68,18 +68,26 @@
 
     <%-- <H1>Delete Workflow: <%= workflow.getID() %></H1> --%>
     
-<H1><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.heading"/> <%= workflow.getID() %></H1>
+<H1><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.heading">
+    <fmt:param><%= workflow.getID() %></fmt:param>
+</fmt:message></H1>
     
     <%-- <P>Are you sure you want to abort this workflow?  It will return to the user's personal workspace</P> --%>
     <P><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.warning"/></P>
     
     <UL>
         <%-- <LI>Collection: <%= workflow.getCollection().getMetadata("name") %></LI> --%>
-        <LI><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.collection"/> <%= workflow.getCollection().getMetadata("name") %></LI>
+        <LI><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.collection">
+            <fmt:param><%= workflow.getCollection().getMetadata("name") %></fmt:param>
+        </fmt:message></LI>
         <%-- <LI>Submitter: <%= WorkflowManager.getSubmitterName(workflow) %></LI> --%>
-        <LI><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.submitter"/> <%= WorkflowManager.getSubmitterName(workflow) %></LI>
+        <LI><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.submitter">
+            <fmt:param><%= WorkflowManager.getSubmitterName(workflow) %></fmt:param>
+        </fmt:message></LI>
         <%-- <LI>Title: <%= WorkflowManager.getItemTitle(workflow) %></LI> --%>
-        <LI><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.title"/> <%= WorkflowManager.getItemTitle(workflow) %></LI>
+        <LI><fmt:message key="jsp.dspace-admin.workflow-abort-confirm.item-title">
+            <fmt:param><%= WorkflowManager.getItemTitle(workflow) %></fmt:param>
+        </fmt:message></LI>
     </UL>
     
     <form method=POST>
@@ -90,11 +98,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit_abort_confirm" value="Abort"> --%>
-                        <input type="submit" name="submit_abort_confirm" value="<fmt:message key="jsp.dspace-admin.workflow-abort-confirm.abort"/>">
+                        <input type="submit" name="submit_abort_confirm" value="<fmt:message key="jsp.dspace-admin.general.abort"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.workflow-abort-confirm.cancel"/>">
+                        <input type="submit" name="submit_cancel" value="<fmt:message key="jsp.dspace-admin.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/dspace-admin/workflow-list.jsp

@@ -92,7 +92,7 @@
             <%-- <th class="oddRowOddCol"> <strong>Submitter</strong></th> --%>
             <th class="oddRowOddCol"> <strong><fmt:message key="jsp.dspace-admin.workflow-list.submitter"/></strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Title</strong></th> --%>
-            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.workflow-list.title"/></strong></th>
+            <th class="oddRowEvenCol"><strong><fmt:message key="jsp.dspace-admin.workflow-list.item-title"/></strong></th>
             <th class="oddRowOddCol">&nbsp;</th>
         </tr>
 
@@ -116,7 +116,7 @@
                 <td class="<%= row %>RowOddCol">
                     <input type="hidden" name="workflow_id" value="<%= workflows[i].getID() %>">
                     <%-- <input type="submit" name="submit_abort" value="Abort..."> --%>
-                    <input type="submit" name="submit_abort" value="<fmt:message key="jsp.dspace-admin.workflow-list.abort"/>">
+                    <input type="submit" name="submit_abort" value="<fmt:message key="jsp.dspace-admin.general.abort-w-confirm"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/error/404.jsp

@@ -54,7 +54,7 @@
 <dspace:layout titlekey="jsp.error.404.title">
 
     <%-- <H1>Error: Document Not Found</H1> --%>
-    <H1><fmt:message key="jsp.error.404.heading"/></H1>
+    <H1><fmt:message key="jsp.error.404.title"/></H1>
     <%-- <P>The document you are trying to access has not been found on the server.</P> --%>
     <P><fmt:message key="jsp.error.404.text1"/></P>
     <UL>
@@ -63,8 +63,9 @@
         the link and try again.  If you still get this error, then try going
         to the <A HREF="<%= request.getContextPath() %>/">DSpace home page</A>
         and looking for what you want from there.</P></LI> --%>
-		<LI><P><fmt:message key="jsp.error.404.text2a"/> <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.error.404.text2b"/></A>
+		<LI><P><fmt:message key="jsp.error.404.text2">
-        <fmt:message key="jsp.error.404.text2c"/></P></LI>
+            <fmt:param><%= request.getContextPath() %>/</fmt:param>
+        </fmt:message></P></LI>
         <%-- <LI><P>If you got to this error by clicking in a link on the DSpace site,
         please let us know so we can fix it!</P></LI> --%>
 		<LI><P><fmt:message key="jsp.error.404.text3"/></P></LI>
@@ -74,7 +75,7 @@
 
     <P align=center>
         <%-- <A HREF="<%= request.getContextPath() %>/">Go to the DSpace home page</A> --%>
-        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.error.404.go"/></A>
+        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A>
     </P>
 
 </dspace:layout>

dspace/jsp/error/authorize.jsp

@@ -54,7 +54,7 @@
 <dspace:layout titlekey="jsp.error.authorize.title">
 
     <%-- <h1>Authorization Required</h1> --%>
-    <h1><fmt:message key="jsp.error.authorize.heading"/></h1>
+    <h1><fmt:message key="jsp.error.authorize.title"/></h1>
 
     <%-- <P>You do not have permission to perform the action you just attempted.</P> --%>
     <P><fmt:message key="jsp.error.authorize.text1"/></P>
@@ -67,7 +67,7 @@
 
     <P align=center>
         <%-- <A HREF="<%= request.getContextPath() %>/">Go to the DSpace home page</A> --%>
-        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.error.authorize.go"/></A>
+        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A>
     </P>
 	
 </dspace:layout>

dspace/jsp/error/integrity.jsp

@@ -89,7 +89,7 @@
 
     <P align=center>
         <%-- <A HREF="<%= request.getContextPath() %>/">Go to the DSpace home page</A> --%>
-        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.error.integrity.go"/></A>
+        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A>
     </P>
 	
 

dspace/jsp/error/internal.jsp

@@ -56,7 +56,7 @@
 <dspace:layout titlekey="jsp.error.internal.title">
 
     <%-- <H1>Internal System Error</H1> --%>
-    <H1><fmt:message key="jsp.error.internal.heading"/></H1>
+    <H1><fmt:message key="jsp.error.internal.title"/></H1>
 
     <%-- <P>Oops!  The system has experienced an internal error.  This is our fault,
     please pardon our dust during these early stages of the DSpace system!</P> --%>
@@ -70,7 +70,7 @@
 
     <P align=center>
         <%-- <A HREF="<%= request.getContextPath() %>/">Go to the DSpace home page</A> --%>
-        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.error.internal.go"/></A>
+        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A>
     </P>
         <!--
     <%

dspace/jsp/error/invalid-id.jsp

@@ -87,13 +87,15 @@
 <dspace:layout locbar="off" titlekey="jsp.error.invalid-id.title">
 
     <%-- <H1>Invalid Identifier</H1> --%>
-    <H1><fmt:message key="jsp.error.invalid-id.heading"/></H1>
+    <H1><fmt:message key="jsp.error.invalid-id.title"/></H1>
 
     <%-- <P>The identifier <%= badID %> does not correspond to a valid
     <%= typeString %> in DSpace.  This may be because of one of the following
     reasons:</P> --%>
-	<P><fmt:message key="jsp.error.invalid-id.text1a"/> <%= badID %> <fmt:message key="jsp.error.invalid-id.text1b"/>
+	<P><fmt:message key="jsp.error.invalid-id.text1">
-    <fmt:message key="constants.object"/> <fmt:message key="jsp.error.invalid-id.text1c"/></P>
+        <fmt:param><%= badID %></fmt:param>
+        <fmt:param><% =typeString %></fmt:param>
+    </fmt:message></P>
 
     <UL>
         <%-- <LI>The URL of the current page is incorrect - if you followed a link
@@ -111,7 +113,7 @@
 
     <P align=center>
         <%-- <A HREF="<%= request.getContextPath() %>/">Go to the DSpace home page</A> --%>
-        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.error.invalid-id.go"/></A>
+        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A>
     </P>
 	
 

dspace/jsp/error/require-certificate.jsp

@@ -54,7 +54,7 @@
 <dspace:layout titlekey="jsp.error.require-certificate.title">
 
     <%-- <h1>Certificate Required</h1> --%>
-    <h1><fmt:message key="jsp.error.require-certificate.heading"/></h1>
+    <h1><fmt:message key="jsp.error.require-certificate.title"/></h1>
 
     <%-- <P>The configuration of this DSpace site means that you need a valid
     Web certificate to log in.  If you are having problems with this,

dspace/jsp/feedback/acknowledge.jsp

@@ -52,7 +52,7 @@
 <dspace:layout titlekey="jsp.feedback.acknowledge.title">
 
     <%-- <h1>Thank you for your comments!</h1> --%>
-    <h1><fmt:message key="jsp.feedback.acknowledge.heading"/></h1>
+    <h1><fmt:message key="jsp.feedback.acknowledge.title"/></h1>
 
     <%-- <p>Your comments have been received.</p> --%>
     <p><fmt:message key="jsp.feedback.acknowledge.text"/></p>

dspace/jsp/feedback/form.jsp

@@ -77,7 +77,7 @@
 <dspace:layout titlekey="jsp.feedback.form.title">
 
     <%-- <H1>Feedback Form</H1> --%>
-    <H1><fmt:message key="jsp.feedback.form.heading"/></H1>
+    <H1><fmt:message key="jsp.feedback.form.title"/></H1>
     
     <%-- <p>Thanks for taking the time to share your feedback about the
     DSpace system. Your comments are appreciated!</p> --%>

dspace/jsp/help/formats.jsp

@@ -95,21 +95,21 @@
 <head>
 <title>
 	<fmt:message key="jsp.help.formats.title"/></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" href="../styles.css.jsp" type="text/css"/>
 </head>
 <body class="help">
 
 <%-- <h2 align="center"><a name="top">DSpace Supported Formats</a></h2> --%>
-<h2 align="center"><a name="top"><fmt:message key="jsp.help.formats.heading"/></a></h2>
+<h2 align="center"><a name="top"><fmt:message key="jsp.help.formats.title"/></a></h2>
 <p align="right"><a href="index.html"><fmt:message key="jsp.help.formats.return"/></a></p>
 
 <%-- <h5><a href="#policy">Format Support Policy</a></h5> --%>
-<h5><a href="#policy"><fmt:message key="jsp.help.formats.format1"/></a></h5>
+<h5><a href="#policy"><fmt:message key="jsp.help.formats.policy"/></a></h5>
 <%-- <h5><a href="#formats">Format Support Levels</a></h5> --%>
-<h5><a href="#formats"><fmt:message key="jsp.help.formats.format2"/></a></h5>
+<h5><a href="#formats"><fmt:message key="jsp.help.formats.support-levels"/></a></h5>
 <%-- <h5><a href="#notlisted">What To Do If Your Format Isn't Listed</a></h5> --%>
-<h5><a href="#notlisted"><fmt:message key="jsp.help.formats.format3"/></a></h5>
+<h5><a href="#notlisted"><fmt:message key="jsp.help.formats.whattodo"/></a></h5>
 <p>&nbsp;</p>
 <table>
     <tr>
@@ -125,7 +125,7 @@
 <table>
     <tr>
     <%-- <td class="leftAlign"><a name="formats"></a><strong>FORMAT SUPPORT LEVELS</strong></td> --%>
-    <td class="leftAlign"><a name="formats"></a><strong><fmt:message key="jsp.help.formats.levels"/></strong></td>
+    <td class="leftAlign"><a name="formats"></a><strong><fmt:message key="jsp.help.formats.support-levels"/></strong></td>
     <%-- <td class="rightAlign"><a href="#top" align="right">top</a></td> --%>
     <td class="rightAlign"><a href="#top" align="right"><fmt:message key="jsp.help.formats.top"/></a></td>
     </tr>
@@ -167,23 +167,20 @@
                 <td><%= formats[i].getMIMEType() %></td>
                 <td>
                 <%
-                    String support = "";
-                    
                     if(formats[i].getSupportLevel() == 2)
                     {
-                        support = "supported";
+                            %><fmt:message key="jsp.help.formats.support.supported" /><%
                         
                     }
                     else if(formats[i].getSupportLevel() == 1)
                     {
-                        support = "known";
+                            %><fmt:message key="jsp.help.formats.support.known" /><%
                     }
                     else
                     {
-                        support = "unknown";
+                            %><fmt:message key="jsp.help.formats.support.unknown" /><%
                     }
                   %>
-                  <%= support%>
                 </td>
         </tr>
 <%
@@ -194,7 +191,7 @@
 <table>
     <tr>
     <%-- <td class="leftAlign"><a name="notlisted"></a><strong>WHAT TO DO IF YOUR FORMAT ISN'T LISTED</strong></td> --%>
-    <td class="leftAlign"><a name="notlisted"></a><strong><fmt:message key="jsp.help.formats.what"/></strong></td>
+    <td class="leftAlign"><a name="notlisted"></a><strong><fmt:message key="jsp.help.formats.whattodo"/></strong></td>
     <%-- <td class="rightAlign"><a href="#top" align="right">top</a></td> --%>
     <td class="rightAlign"><a href="#top" align="right"><fmt:message key="jsp.help.formats.top"/></a></td>
     </tr>

dspace/jsp/home.jsp

@@ -81,7 +81,7 @@
                 <td class="oddRowEvenCol">
                   <H3><fmt:message key="jsp.home.search1"/></H3>
                       <P><fmt:message key="jsp.home.search2"/></P>
-                      <P><input type=text name=query size=20>&nbsp;<input type=submit name=submit value="<fmt:message key="jsp.home.search.button"/>"></P>
+                      <P><input type=text name=query size=20>&nbsp;<input type=submit name=submit value="<fmt:message key="jsp.general.search.button"/>"></P>
                 </td>
             </tr>
         </table>

dspace/jsp/layout/navbar-default.jsp

@@ -87,7 +87,9 @@
     if (user != null)
     {
 %>
-  <P class="loggedIn"><fmt:message key="jsp.layout.navbar-default.logged"/> <%= navbarEmail %>
+  <P class="loggedIn"><fmt:message key="jsp.layout.navbar-default.loggedin">
+      <fmt:param><%= navbarEmail %></fmt:param>
+  </fmt:message>
     (<A HREF="<%= request.getContextPath() %>/logout"><fmt:message key="jsp.layout.navbar-default.logout"/></A>)</P>
 <%
     }
@@ -138,7 +140,7 @@
       <img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/community-list" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
     </td>
     <td nowrap class="navigationBarItem">
-      <a href="<%= request.getContextPath() %>/community-list"><fmt:message key="jsp.layout.navbar-default.communities"/><br />&amp;&nbsp;<fmt:message key="jsp.layout.navbar-default.collections"/></a>
+      <a href="<%= request.getContextPath() %>/community-list"><fmt:message key="jsp.layout.navbar-default.communities-collections"/></a>
     </td>
   </tr>
 
@@ -191,7 +193,8 @@
       <img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/mydspace" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16">
     </td>
     <td nowrap class="navigationBarItem">
-      <a href="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.layout.navbar-default.users"/>
+      <a href="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.layout.navbar-default.users"/></a><br>
+      <fmt:message key="jsp.layout.navbar-default.users-authorized" />
     </td>
   </tr>
 

dspace/jsp/login/incorrect.jsp

@@ -69,7 +69,9 @@
     </table>
 
     <%-- <P align=center><strong>The e-mail address and password you supplied were not valid.  Please try again, or have you <A HREF="<%= request.getContextPath() %>/forgot">forgotten your password</A>?</strong></P> --%>
-    <P align=center><strong><fmt:message key="jsp.login.incorrect.texta"/> <A HREF="<%= request.getContextPath() %>/forgot"><fmt:message key="jsp.login.incorrect.textb"/></A><fmt:message key="jsp.login.incorrect.textc"/></strong></P>
+    <P align=center><strong><fmt:message key="jsp.login.incorrect.text">
+        <fmt:param><%= request.getContextPath() %>/forgot</fmt:param>
+    </fmt:message></strong></P>
 
     <dspace:include page="/components/login-form.jsp" />
 </dspace:layout>

dspace/jsp/login/logged-out.jsp

@@ -52,10 +52,10 @@
 <dspace:layout locbar="nolink" titlekey="jsp.login.logged-out.title">
 
     <%-- <H1>Logged Out</H1> --%>
-    <H1><fmt:message key="jsp.login.logged-out.heading"/></H1>
+    <H1><fmt:message key="jsp.login.logged-out.title"/></H1>
 
     <%-- <P>Thank you for remembering to log out!</P> --%>
     <P><fmt:message key="jsp.login.logged-out.thank"/></P>
     <%-- <P><A HREF="<%= request.getContextPath() %>/">Go to DSpace Home</A></P> --%>
-    <P><A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.login.logged-out.go"/></A></P>
+    <P><A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A></P>
 </dspace:layout>

dspace/jsp/login/not-in-records.jsp

@@ -53,14 +53,15 @@
 <dspace:layout titlekey="jsp.login.not-in-records.title">
 
     <%-- <h1>No User Record Available</h1> --%>
-    <h1><fmt:message key="jsp.login.not-in-records.heading"/></h1>
+    <h1><fmt:message key="jsp.login.not-in-records.title"/></h1>
 
     <%-- <P>You have a valid Web certficate, but the DSpace system does not have a
     record of you.  You will need to <A HREF="<%= request.getContextPath() %>/register">
     register with DSpace</A> before using those areas of the system that
     require a user account.</P> --%>
-    <P><fmt:message key="jsp.login.not-in-records.texta"/> <A HREF="<%= request.getContextPath() %>/register">
+    <P><fmt:message key="jsp.login.not-in-records.text">
-    <fmt:message key="jsp.login.not-in-records.textb"/></A> <fmt:message key="jsp.login.not-in-records.textc"/></P>
+        <fmt:param><%= request.getContextPath() %>/register</fmt:param>
+    </fmt:message></P>
 
     <%-- <P><A HREF="<%= request.getContextPath() %>/register">Register wth DSpace</A></P> --%>
     <P><A HREF="<%= request.getContextPath() %>/register"><fmt:message key="jsp.login.not-in-records.register"/></A></P>

dspace/jsp/mydspace/main.jsp

@@ -283,7 +283,8 @@
 
     <H2><fmt:message key="jsp.mydspace.main.heading4"/></H2>
 
-    <p>This section is for use in the continued authoring of your document.</p>
+    <%-- <p>This section is for use in the continued authoring of your document.</p> --%>
+    <p><fmt:message key="jsp.mydspace.main.text4" /></p>
 
     <table class=miscTable align=center>
         <tr>
@@ -300,7 +301,8 @@
 %>
         <tr>
             <th colspan="5">
-                Authoring
+                <%-- Authoring --%>
+                <fmt:message key="jsp.mydspace.main.authoring" />
             </th>
         </tr>
 <%
@@ -330,7 +332,7 @@
             <td class="<%= row %>RowOddCol">
                 <input type="hidden" name="step" value="<%= MyDSpaceServlet.MAIN_PAGE %>"/>
                 <input type="hidden" name="workspace_id" value="<%= workspaceItems[i].getID() %>"/>
-                <input type="submit" name="submit_delete" value="Remove"/>
+                <input type="submit" name="submit_delete" value="<fmt:message key="jsp.mydspace.general.remove" />"/>
             </td>
             </form>
         </tr>
@@ -346,7 +348,7 @@
 %>
         <tr>
             <th colspan="5">
-                Supervising
+                <fmt:message key="jsp.mydspace.main.supervising" />
             </th>
         </tr>
 <%

dspace/jsp/mydspace/own-submissions.jsp

@@ -96,7 +96,9 @@
         {
 %>
     <%-- <P>There are <strong><%= items.length %></strong> items in the main archive that were submitted by you.</P> --%>
-	<P><fmt:message key="jsp.mydspace.own-submissions.text4"/> <strong><%= items.length %></strong> <fmt:message key="jsp.mydspace.own-submissions.text5"/></P>
+	<P><fmt:message key="jsp.mydspace.own-submissions.text4">
+        <fmt:param><%= items.length %></fmt:param>
+    </fmt:message></P>
 <%
         }
 %>
@@ -106,5 +108,5 @@
 %>
 
     <%-- <P align=center><A HREF="<%= request.getContextPath() %>/mydspace">Back to My DSpace</A></P> --%>
-	<P align=center><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.own-submissions.link"/></A></P>
+	<P align=center><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.general.backto-mydspace"/></A></P>
 </dspace:layout>

dspace/jsp/mydspace/perform-task.jsp

@@ -84,8 +84,9 @@
     Please review the item, check that it meets the criteria for entry into
     the collection.  After reviewing the item, please approve or reject the
     item using the controls at the bottom of the page.</P> --%>
-	<P><fmt:message key="jsp.mydspace.perform-task.text1"/> <strong><%= collection.getMetadata("name") %></strong>
+	<P><fmt:message key="jsp.mydspace.perform-task.text1">
-	.  <fmt:message key="jsp.mydspace.perform-task.text2"/></P>
+        <fmt:param><%= collection.getMetadata("name") %></fmt:param>
+    </fmt:message></P>
 <%
     }
     else if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP2)
@@ -96,8 +97,9 @@
     the collection.  After reviewing the item, you may edit the metadata with the
     item, and then approve or reject the item using the controls at the bottom of
     the page.</P> --%>
-	<P><fmt:message key="jsp.mydspace.perform-task.text1"/> <strong><%= collection.getMetadata("name") %></strong>
+	<P><fmt:message key="jsp.mydspace.perform-task.text3">
-	.  <fmt:message key="jsp.mydspace.perform-task.text3"/></P>
+        <fmt:param><%= collection.getMetadata("name") %></fmt:param>
+	</fmt:message></P>
 <%
     }
     else if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP3)
@@ -108,8 +110,9 @@
     necessary edits of the metadata to conform with the standards of the collection,
     and then commit the item to the archive using the controls at the bottom
     of the page.</P> --%>
-	<P><fmt:message key="jsp.mydspace.perform-task.text4"/>
+	<P><fmt:message key="jsp.mydspace.perform-task.text4">
-    <strong><%= collection.getMetadata("name") %></strong>.  <fmt:message key="jsp.mydspace.perform-task.text5"/></P>
+        <fmt:param><%= collection.getMetadata("name") %></fmt:param>
+    </fmt:message></P>
 <%
     }
 %>
@@ -136,7 +139,7 @@
                 </td>
                 <td class="<%= row %>RowEvenCol" valign=middle>
                     <%-- <input type="submit" name="submit_approve" value="Approve"> --%>
-					<input type="submit" name="submit_approve" value="<fmt:message key="jsp.mydspace.perform-task.approve.button"/>">
+					<input type="submit" name="submit_approve" value="<fmt:message key="jsp.mydspace.general.approve"/>">
                 </td>
             </tr>
 <%
@@ -174,7 +177,7 @@
                 </td>
                 <td class="<%= row %>RowEvenCol" valign=middle>
                     <%-- <input type=submit name=submit_reject value="Reject" /> --%>
-					<input type=submit name=submit_reject value="<fmt:message key="jsp.mydspace.perform-task.reject.button"/>"/>
+					<input type=submit name=submit_reject value="<fmt:message key="jsp.mydspace.general.reject"/>"/>
                 </td>
             </tr>
 <%

dspace/jsp/mydspace/preview-task.jsp

@@ -82,8 +82,9 @@
     <%-- <P>The following item has been submitted to collection
     <strong><%= collection.getMetadata("name") %></strong>.  In order to
     accept the task of reviewing this item, please click "Accept This Task" below.</P> --%>
-	<P><fmt:message key="jsp.mydspace.preview-task.text1"/> 
+	<P><fmt:message key="jsp.mydspace.preview-task.text1"> 
-    <strong><%= collection.getMetadata("name") %>.  </strong><fmt:message key="jsp.mydspace.preview-task.text2"/></P>
+        <mft:param value="<%= collection.getMetadata("name") %>" />
+    </fmt:message></P>
 <%
     }
     else if(workflowItem.getState() == WorkflowManager.WFSTATE_STEP2POOL)
@@ -92,8 +93,9 @@
     <%-- <P>The following item has been submitted to collection
     <strong><%= collection.getMetadata("name") %></strong>.  In order to
     accept the task of checking this item, please click "Accept This Task" below.</P> --%>
-	<P><fmt:message key="jsp.mydspace.preview-task.text1"/> 
+	<P><fmt:message key="jsp.mydspace.preview-task.text3"> 
-    <strong><%= collection.getMetadata("name") %>.  </strong><fmt:message key="jsp.mydspace.preview-task.text3"/></P>
+        <fmt:param><%= collection.getMetadata("name") %></fmt:param>
+    </fmt:message></P>
 <%
     }
     else if(workflowItem.getState() == WorkflowManager.WFSTATE_STEP3POOL)
@@ -102,8 +104,9 @@
     <%-- <P>The following item has been accepted for inclusion in collection
     <strong><%= collection.getMetadata("name") %></strong>.  In order to
     accept the task of the final edit of this item, please click "Accept This Task" below.</P> --%>
-	<P><fmt:message key="jsp.mydspace.preview-task.text4"/> 
+	<P><fmt:message key="jsp.mydspace.preview-task.text4"> 
-    <strong><%= collection.getMetadata("name") %>.  </strong><fmt:message key="jsp.mydspace.preview-task.text5"/></P>
+        <fmt:param><%= collection.getMetadata("name") %></fmt:param>
+    </fmt:message></P>
 <%
     }
 %>
@@ -121,7 +124,7 @@
                 </td>
                 <td align=right>
                     <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-					<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.mydspace.preview-task.cancel.button"/>">
+					<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.mydspace.general.cancel"/>">
                 </td>
             </tr>
         </table>

dspace/jsp/mydspace/subscriptions.jsp

@@ -156,6 +156,6 @@
 
     <%-- <P align="center"><A HREF="<%= request.getContextPath() %>/mydspace">Go to
     My DSpace </A></P> --%>
-	<P align="center"><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.subscriptions.link"/> </A></P>
+	<P align="center"><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.general.goto-mydspace"/> </A></P>
 
 </dspace:layout>

dspace/jsp/mydspace/task-complete.jsp

@@ -53,15 +53,15 @@
 <dspace:layout locbar="link"
                parentlink="/mydspace"
                parenttitlekey="jsp.mydspace"
-               title="task-complete.title">
+               title="jsp.mydspace.task-complete.title">
 
 <%-- <H1>Thank You</H1> --%>
-<H1><fmt:message key="jsp.mydspace.task-complete.heading"/></H1>
+<H1><fmt:message key="jsp.mydspace.task-complete.title"/></H1>
 
     <%-- <P>The task is complete, and notification has been sent to the appropriate people.</P> --%>
     <P><fmt:message key="jsp.mydspace.task-complete.text1"/></P>
  
     <%-- <P align=center><A HREF="<%= request.getContextPath() %>/mydspace">Return to My DSpace </A></P> --%>
-    <P align=center><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.task-complete.return.link"/> </A></P>
+    <P align=center><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.general.returnto-mydspace"/> </A></P>
  
 </dspace:layout>

dspace/jsp/register/already-registered.jsp

@@ -62,7 +62,9 @@
 
     <%-- <P><strong>You can <a href="<%= request.getContextPath() %>/forgot"> set
     a new password if you've forgotten it</A>.</P> --%>
-	<P><strong><fmt:message key="jsp.register.already-registered.info2"/> <a href="<%= request.getContextPath() %>/forgot"> <fmt:message key="jsp.register.already-registered.info3"/></A>.</P>
+	<P><fmt:message key="jsp.register.already-registered.info2">
+        <fmt:param><%= request.getContextPath() %>/forgot</fmt:param>
+    </fmt:message></P>
 
     <%-- <P>If you're having trouble logging in, please contact us.</P> --%>
 	<P><fmt:message key="jsp.register.already-registered.info4"/></P>

dspace/jsp/register/inactive-account.jsp

@@ -59,8 +59,9 @@
     Perhaps you haven't yet <A HREF="<%= request.getContextPath() %>/register">
     registered</A>.  Please feel free to contact the site administrators
     with any queries.</P> --%>
-	<P><fmt:message key="jsp.register.inactive-account.info1"/> <A HREF="<%= request.getContextPath() %>/register">
+	<P><fmt:message key="jsp.register.inactive-account.info">
-    .  <fmt:message key="jsp.register.inactive-account.link"/></A><fmt:message key="jsp.register.inactive-account.info2"/></P>
+        <fmt:param><%= request.getContextPath() %>/register</fmt:param>
+    </fmt:message></P>
     
     <dspace:include page="/components/contact-info.jsp" />
 </dspace:layout>

dspace/jsp/register/new-password.jsp

@@ -73,10 +73,12 @@
 <dspace:layout titlekey="jsp.register.new-password.title" nocache="true">
 
     <%-- <h1>Enter a New Password</H1> --%>
-	<h1><fmt:message key="jsp.register.new-password.heading"/></H1>
+	<h1><fmt:message key="jsp.register.new-password.title"/></H1>
     
     <!-- <P>Hello <%= eperson.getFullName() %>,</P> -->
-	<P><fmt:message key="jsp.register.new-password.hello"/> <%= eperson.getFullName() %>,</P>
+	<P><fmt:message key="jsp.register.new-password.hello">
+        <fmt:param><%= eperson.getFullName() %></fmt:param>
+    </fmt:message></P>
     
 <%
     if (passwordProblem)

dspace/jsp/register/profile-updated.jsp

@@ -70,18 +70,17 @@
     <%= (passwordUpdated ? "and password have" : "has") %>
     been updated.</P> --%>
     
-	<P><fmt:message key="jsp.register.profile-updated.info1"/> 
+	<P>
-	
 <% if(passwordUpdated)
    { %>
-    <fmt:message key="jsp.register.profile-updated.passwordUpd"/>
+    <fmt:message key="jsp.register.profile-updated.info1"/>
 <% }
    else
    { %>
-    <fmt:message key="jsp.register.profile-updated.passwordNotUpd"/>
+    <fmt:message key="jsp.register.profile-updated.info2"/>
 <% } %>
-    <fmt:message key="jsp.register.profile-updated.info2"/></P>
+    </P>
 
     <%-- <P><A HREF="<%= request.getContextPath() %>/">Return to DSpace Home</A></P> --%>
-	<P><A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.register.profile-updated.return.link"/></A></P>
+	<P><A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.register.general.return-home"/></A></P>
 </dspace:layout>

dspace/jsp/register/registered.jsp

@@ -68,12 +68,14 @@
 	<H1><fmt:message key="jsp.register.registered.title"/></H1>
     
     <%-- <P>Thank you <%= eperson.getFirstName() %>,</P> --%>
-	<P><fmt:message key="jsp.register.registered.thank"/> <%= eperson.getFirstName() %>,</P>
+	<P><fmt:message key="jsp.register.registered.thank">
+        <fmt:param><%= eperson.getFirstName() %></fmt:param>
+    </fmt:message></P>
 
     <%-- <P>You're now registered to use the DSpace system.  You can subscribe to
     collections to receive e-mail updates about new items.</P> --%>
 	<P><fmt:message key="jsp.register.registered.info"/></P>
     
     <%-- <P><A HREF="<%= request.getContextPath() %>/">Return to DSpace Home</A></P> --%>
-	<P><A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.register.registered.return.link"/></A></P>
+	<P><A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.register.general.return-home"/></A></P>
 </dspace:layout>

dspace/jsp/search/advanced.jsp

@@ -83,7 +83,7 @@
       	<p><strong><fmt:message key="jsp.search.advanced.search"/></strong>&nbsp;
 		<select name="location">
 			<%-- <option selected value="/">All of DSpace</option> --%>
-			<option selected value="/"><fmt:message key="jsp.search.advanced.all"/></option>
+			<option selected value="/"><fmt:message key="jsp.general.genericScope"/></option>
 <%
         for (int i = 0; i < communityArray.length; i++)
         {
@@ -106,22 +106,22 @@
 
                   <select name="field1">
                     <%-- <option value="ANY" <%= field1.equals("ANY") ? "selected" : "" %>>Keyword</option> --%>
-                    <option value="ANY" <%= field1.equals("ANY") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.keyword"/></option>
+                    <option value="ANY" <%= field1.equals("ANY") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.keyword"/></option>
 		    <%-- <option value="author" <%= field1.equals("author") ? "selected" : "" %>>Author</option> --%>
-                    <option value="author" <%= field1.equals("author") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.author"/></option>
+                    <option value="author" <%= field1.equals("author") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.author"/></option>
                     <%-- <option value="title" <%= field1.equals("title") ? "selected" : "" %>>Title</option> --%>
-                    <option value="title" <%= field1.equals("title") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.title"/></option>
+                    <option value="title" <%= field1.equals("title") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.title"/></option>
                     <%-- <option value="keyword" <%= field1.equals("keyword") ? "selected" : "" %>>Subject</option> --%>
-                    <option value="keyword" <%= field1.equals("keyword") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.subject"/></option>
+                    <option value="keyword" <%= field1.equals("keyword") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.subject"/></option>
                     <%-- <option value="abstract" <%= field1.equals("abstract") ? "selected" : "" %>>Abstract</option --%>
-                    <option value="abstract" <%= field1.equals("abstract") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.abstract"/></option>
+                    <option value="abstract" <%= field1.equals("abstract") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.abstract"/></option>
                     <%-- <option value="series" <%= field1.equals("series") ? "selected" : "" %>>Series</option> --%>
-                    <option value="series" <%= field1.equals("series") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.series"/></option>
+                    <option value="series" <%= field1.equals("series") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.series"/></option>
                     <%-- <option value="sponsor" <%= field1.equals("sponsor") ? "selected" : "" %>>Sponsor</option> --%>
-                    <option value="sponsor" <%= field1.equals("sponsor") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.sponsor"/></option>
+                    <option value="sponsor" <%= field1.equals("sponsor") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.sponsor"/></option>
                     <%-- <option value="identifier" <%= field1.equals("identifier") ? "selected" : "" %>>Identifier</option> --%>
-                    <option value="identifier" <%= field1.equals("identifier") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.id"/></option>
+                    <option value="identifier" <%= field1.equals("identifier") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.id"/></option>
-                    <option value="language" <%= field1.equals("language") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.language"/></option>
+                    <option value="language" <%= field1.equals("language") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.language"/></option>
                   </select>
                 </p>
             </td>
@@ -136,22 +136,22 @@
           <tr>
             <td width="12%" align="left" valign="top">
               <select name="conjunction1">
-                <option value="AND" <%= conjunction1.equals("AND") ? "selected" : "" %>> AND </option>
+                <option value="AND" <%= conjunction1.equals("AND") ? "selected" : "" %>> <fmt:message key="jsp.search.advanced.logical.and" /> </option>
-		<option value="OR" <%= conjunction1.equals("OR") ? "selected" : "" %>> OR </option>
+		<option value="OR" <%= conjunction1.equals("OR") ? "selected" : "" %>> <fmt:message key="jsp.search.advanced.logical.or" /> </option>
-                <option value="NOT" <%= conjunction1.equals("NOT") ? "selected" : "" %>> NOT </option>
+                <option value="NOT" <%= conjunction1.equals("NOT") ? "selected" : "" %>> <fmt:message key="jsp.search.advanced.logical.not" /> </option>
               </select>
             </td>
             <td width="20%" align="left" valign="top" nowrap>
                   <select name="field2">
-                    <option value="ANY" <%= field2.equals("ANY") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.keyword"/></option>
+                    <option value="ANY" <%= field2.equals("ANY") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.keyword"/></option>
-                    <option value="author" <%= field2.equals("author") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.author"/></option>
+                    <option value="author" <%= field2.equals("author") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.author"/></option>
-                    <option value="title" <%= field2.equals("title") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.title"/></option>
+                    <option value="title" <%= field2.equals("title") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.title"/></option>
-                    <option value="keyword" <%= field2.equals("keyword") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.subject"/></option>
+                    <option value="keyword" <%= field2.equals("keyword") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.subject"/></option>
-                    <option value="abstract" <%= field2.equals("abstract") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.abstract"/></option>
+                    <option value="abstract" <%= field2.equals("abstract") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.abstract"/></option>
-                    <option value="series" <%= field2.equals("series") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.series"/></option>
+                    <option value="series" <%= field2.equals("series") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.series"/></option>
-                    <option value="sponsor" <%= field2.equals("sponsor") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.sponsor"/></option>
+                    <option value="sponsor" <%= field2.equals("sponsor") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.sponsor"/></option>
-                    <option value="identifier" <%= field2.equals("identifier") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.id"/></option>
+                    <option value="identifier" <%= field2.equals("identifier") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.id"/></option>
-                    <option value="language" <%= field1.equals("language") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.language"/></option>
+                    <option value="language" <%= field2.equals("language") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.language"/></option>
                   </select>
            </td>
             <td align="left" valign="top" nowrap width="68%">
@@ -161,23 +161,23 @@
           <tr>
             <td width="12%" align="left" valign="top">
               <select name="conjunction2">
-                <option value="AND" <%= conjunction2.equals("AND") ? "selected" : "" %>> AND </option>
+                <option value="AND" <%= conjunction2.equals("AND") ? "selected" : "" %>> <fmt:message key="jsp.search.advanced.logical.and" /> </option>
-                <option value="OR" <%= conjunction2.equals("OR") ? "selected" : "" %>> OR </option>
+                <option value="OR" <%= conjunction2.equals("OR") ? "selected" : "" %>> <fmt:message key="jsp.search.advanced.logical.or" /> </option>
-                <option value="NOT" <%= conjunction2.equals("NOT") ? "selected" : "" %>> NOT </option>
+                <option value="NOT" <%= conjunction2.equals("NOT") ? "selected" : "" %>> <fmt:message key="jsp.search.advanced.logical.not" /> </option>
               </select>
             </td>
             <td width="20%" align="left" valign="top" nowrap>
 
                   <select name="field3">
-                    <option value="ANY" <%= field3.equals("ANY") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.keyword"/></option>
+                    <option value="ANY" <%= field3.equals("ANY") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.keyword"/></option>
-                    <option value="author" <%= field3.equals("author") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.author"/></option>
+                    <option value="author" <%= field3.equals("author") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.author"/></option>
-                    <option value="title" <%= field3.equals("title") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.title"/></option>
+                    <option value="title" <%= field3.equals("title") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.title"/></option>
-                    <option value="keyword" <%= field3.equals("keyword") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.subject"/></option>
+                    <option value="keyword" <%= field3.equals("keyword") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.subject"/></option>
-                    <option value="abstract" <%= field3.equals("abstract") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.abstract"/></option>
+                    <option value="abstract" <%= field3.equals("abstract") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.abstract"/></option>
-                    <option value="series" <%= field3.equals("series") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.series"/></option>
+                    <option value="series" <%= field3.equals("series") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.series"/></option>
-                    <option value="sponsor" <%= field3.equals("sponsor") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.sponsor"/></option>
+                    <option value="sponsor" <%= field3.equals("sponsor") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.sponsor"/></option>
-                    <option value="identifier" <%= field3.equals("identifier") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.id"/></option>
+                    <option value="identifier" <%= field3.equals("identifier") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.id"/></option>
-                    <option value="language" <%= field1.equals("language") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.language"/></option>
+                    <option value="language" <%= field3.equals("language") ? "selected" : "" %>><fmt:message key="jsp.search.advanced.type.language"/></option>
                   </select>
                   <br>
             </td>
@@ -211,7 +211,7 @@
     }else
     { %>
         <%-- <P align=center>Search produced no results.</P> --%>
-        <P align=center><fmt:message key="jsp.search.advanced.text"/></P>
+        <P align=center><fmt:message key="jsp.search.general.noresults"/></P>
      <%
      }
 }

dspace/jsp/search/results.jsp

@@ -99,7 +99,7 @@
     <%-- <H1>Search Results</H1> --%>
     
 
-<H1><fmt:message key="jsp.search.results.heading"/></H1>
+<H1><fmt:message key="jsp.search.results.title"/></H1>
     
     <%-- Controls for a repeat search --%>
     <form action="simple-search" method=GET>
@@ -110,7 +110,7 @@
                         <tr>
                             <td>
                                 <%-- <strong>Search:</strong>&nbsp;<select name="location"> --%>
-                                <strong><fmt:message key="jsp.search.results.search"/></strong>&nbsp;<select name="location">
+                                <strong><fmt:message key="jsp.search.results.searchin"/></strong>&nbsp;<select name="location">
 <%
     if (community == null && collection == null)
     {
@@ -118,7 +118,7 @@
         // "all of DSpace" and the communities.
 %>
                                     <%-- <option selected value="/">All of DSpace</option> --%>
-                                    <option selected value="/"><fmt:message key="jsp.search.results.all"/></option>
+                                    <option selected value="/"><fmt:message key="jsp.general.genericScope"/></option>
 <%
         for (int i = 0; i < communityArray.length; i++)
         {
@@ -133,7 +133,7 @@
         // "all of DSpace", the community, and the collections within the community.
 %>
                                     <%-- <option value="/">All of DSpace</option> --%>
-                                    <option value="/"><fmt:message key="jsp.search.results.all"/></option>
+                                    <option value="/"><fmt:message key="jsp.general.genericScope"/></option>
                                     <option selected value="<%= community.getHandle() %>"><%= community.getMetadata("name") %></option>
 <%
         for (int i = 0; i < collectionArray.length; i++)
@@ -148,7 +148,7 @@
         // Scope of the search is a specific collection
 %>
                                     <%-- <option value="/">All of DSpace</option> --%>
-                                    <option value="/"><fmt:message key="jsp.search.results.all"/></option>
+                                    <option value="/"><fmt:message key="jsp.general.genericScope"/></option>
                                     <option value="<%= community.getHandle() %>"><%= community.getMetadata("name") %></option>
                                     <option selected value="<%= collection.getHandle() %>"><%= collection.getMetadata("name") %></option>
 <%
@@ -160,7 +160,7 @@
                         <tr>
                             <td align=center>
                                 <%-- for&nbsp;<input type="text" name="query" value='<//%= (query==null ? "" : query) %>'>&nbsp;<input type="submit" value="Go"> --%>
-                                <fmt:message key="jsp.search.results.for"/>&nbsp;<input type="text" name="query" value='<%= (query==null ? "" : query) %>'>&nbsp;<input type="submit" value="<fmt:message key="jsp.search.results.go"/>">
+                                <fmt:message key="jsp.search.results.searchfor"/>&nbsp;<input type="text" name="query" value='<%= (query==null ? "" : query) %>'>&nbsp;<input type="submit" value="<fmt:message key="jsp.general.go"/>">
                             </td>
                         </tr>
                     </table>
@@ -179,15 +179,18 @@ else if( qResults.getHitCount() == 0 )
 {
  %>
     <%-- <P align=center>Search produced no results.</P> --%>
-    <P align=center><fmt:message key="jsp.search.results.nores"/></P>
+    <P align=center><fmt:message key="jsp.search.general.noresults"/></P>
 <%
 }
 else
 {
 %>
     <%-- <P align=center>Results <//%=qResults.getStart()+1%>-<//%=qResults.getStart()+qResults.getHitHandles().size()%> of --%>
-	<P align=center><fmt:message key="jsp.search.results.results"/> <%=qResults.getStart()+1%>-<%=qResults.getStart()+qResults.getHitHandles().size()%> <fmt:message key="jsp.search.results.of"/>
+	<P align=center><fmt:message key="jsp.search.results.results">
-    <%=qResults.getHitCount()%>. </P>
+        <fmt:param><%=qResults.getStart()+1%></fmt:param>
+        <fmt:param><%=qResults.getStart()+qResults.getHitHandles().size()%></fmt:param>
+        <fmt:param><%=qResults.getHitCount()%></fmt:param>
+    </fmt:message></P>
 
 <% } %>
 
@@ -224,35 +227,30 @@ else
 	searchScope = "/handle/" + collection.getHandle();
     } 
 
-    String prevLink =  "<A HREF=\""
+    // create the URLs accessing the previous and next search result pages
-                    + request.getContextPath()
+    String prevURL =  request.getContextPath()
                     + searchScope 
                     + "/simple-search?query="
                     + URLEncoder.encode(query)
                     + "&start=";
 
-    String nextLink = prevLink;
+    String nextURL = prevURL;
 
-    prevLink = prevLink
+    prevURL = prevURL
-            + (pageCurrent-2) * qResults.getPageSize()
+            + (pageCurrent-2) * qResults.getPageSize();
-            + "\">"
-            + "previous"
-            + "</A>";
 
-    nextLink = nextLink
+    nextURL = nextURL
-            + (pageCurrent) * qResults.getPageSize()
+            + (pageCurrent) * qResults.getPageSize();
-            + "\">"
-            + "next"
-            + "</A>";
     
     
-    
+
-%>
+if (pageFirst != pageCurrent)
+{
+    %><a href="<%= prevURL %>"><fmt:message key="jsp.search.general.previous" /></a><%
+};
 
 
-<%= (pageFirst != pageCurrent) ? prevLink : "" %>
+for( int q = pageFirst; q <= pageLast; q++ )
-
-<% for( int q = pageFirst; q <= pageLast; q++ )
 {
     String myLink = "<A HREF=\""
                     + request.getContextPath()
@@ -280,9 +278,12 @@ else
 
 <%
 }
-%>
 
-<%= ((pageTotal > pageCurrent) ? nextLink : "") %>
+if (pageTotal > pageCurrent)
+{
+    %><a href="<%= nextURL %>"><fmt:message key="jsp.search.general.next" /></a><%
+}
+%>
 
 </P>
 

dspace/jsp/submit/cancel.jsp

@@ -76,7 +76,7 @@
 
 <dspace:layout locbar="off"
                navbar="off"
-               title="cancel.title"
+               title="jsp.submit.cancel.title"
                nocache="true">
 
     <form action="<%= request.getContextPath() %>/submit" method=post>

dspace/jsp/submit/cancelled-removed.jsp

@@ -61,6 +61,6 @@
 	<P><fmt:message key="jsp.submit.cancelled-removed.info"/></P>
 
     <%-- <P><A HREF="<%= request.getContextPath() %>/mydspace">Go to My DSpace</A></P> --%>
-	<P><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.submit.cancelled-removed.link"/></A></P>
+	<P><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.general.goto-mydspace"/></A></P>
 
 </dspace:layout>

dspace/jsp/submit/change-file-description.jsp

@@ -123,7 +123,7 @@
         <input type=hidden name=step value=<%= SubmitServlet.CHANGE_FILE_DESCRIPTION %>>
         
         <%-- <center><P><input type=submit name=submit value="Submit"></P></center> --%>
-		<center><P><input type=submit name=submit value="<fmt:message key="jsp.submit.change-file-description.submit.button"/>"></P></center>
+		<center><P><input type=submit name=submit value="<fmt:message key="jsp.submit.general.submit"/>"></P></center>
 
     </form>
 

dspace/jsp/submit/choose-file.jsp

@@ -93,7 +93,7 @@
         you will need to select the option to display files of other types.
         <dspace:popup page="/help/index.html#netscapeupload">Instructions for Netscape users</dspace:popup> are available.</P> --%>
 		<P class="submitFormHelp"><fmt:message key="jsp.submit.choose-file.info3"/>
-        <dspace:popup page="${helpPage}#netscapeupload"><fmt:message key="jsp.submit.choose-file.info4"/></dspace:popup> <fmt:message key="jsp.submit.choose-file.info5"/></P>
+        <dspace:popup page="${helpPage}#netscapeupload"><fmt:message key="jsp.submit.choose-file.info4"/></dspace:popup></P>
         
 <%-- FIXME: Collection-specific stuff should go here? --%>
 
@@ -104,7 +104,7 @@
         support for each are available.</P> --%>
         
 		<P class="submitFormHelp"><fmt:message key="jsp.submit.choose-file.info6"/>
-        <dspace:popup page="/help/formats.jsp"><fmt:message key="jsp.submit.choose-file.info7"/></dspace:popup> <fmt:message key="jsp.submit.choose-file.info8"/>
+        <dspace:popup page="/help/formats.jsp"><fmt:message key="jsp.submit.choose-file.info7"/></dspace:popup>
         </P>
     
         <table border=0 align=center>
@@ -152,16 +152,16 @@
                     <td width="100%">&nbsp;</td>
                     <td align>
                         <!-- <input type=submit name=submit_prev value="&lt; Previous"> -->
-						<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.choose-file.previous.button"/>">
+						<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.general.previous"/>">
                     </td>
                     <td>
                         <!-- <input type=submit name=submit_next value="Next &gt;"> -->
-						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.choose-file.next.button"/>">
+						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.general.next"/>">
                     </td>
                     <td>&nbsp;&nbsp;&nbsp;</td>
                     <td align=right>
                         <!-- <input type=submit name=submit_cancel value="Cancel/Save"> -->
-						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.choose-file.cancel.button"/>">
+						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/submit/creative-commons.jsp

@@ -74,7 +74,7 @@
 
 <dspace:layout locbar="off"
                navbar="off"
-               title="creative-commons.title"
+               titlekey="jsp.submit.creative-commons.title"
                nocache="true">
 
     <form name="foo" id="license_form" action="<%= request.getContextPath() %>/submit" method=post>
@@ -133,7 +133,7 @@
                     <td width="100%">&nbsp;</td>
                     <td>
                         <%-- <input type=submit name=submit_prev value="&lt; Previous"> --%>
-						<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.creative-commons.previous.button"/>">
+						<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.general.previous"/>">
                     </td>
 <%
      if (licenseExists)
@@ -141,7 +141,7 @@
 %>
                     <td>
                         <%-- <input type=submit name=submit_next value="Next &gt;"> --%>
-						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.creative-commons.next.button"/>">
+						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.general.next"/>">
                     </td>
 <%
      }
@@ -153,7 +153,7 @@
                     <td>&nbsp;&nbsp;&nbsp;</td>
                     <td align=right>
                         <%-- <input type=submit name=submit_cancel value="Cancel/Save"/> --%>
-						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.creative-commons.cancel.button"/>"/>
+						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>"/>
                     </td>
                 </tr>
             </table>

dspace/jsp/submit/get-file-format.jsp

@@ -89,7 +89,10 @@
 		<H1><fmt:message key="jsp.submit.get-file-format.heading"/></H1>
 
         <%-- <P>Uploaded file: <code><%= si.bitstream.getName() %></code> (<%= si.bitstream.getSize() %> bytes)</P> --%>
-		<P><fmt:message key="jsp.submit.get-file-format.info1"/> <code><%= si.bitstream.getName() %></code> (<%= si.bitstream.getSize() %> bytes)</P>
+		<P><fmt:message key="jsp.submit.get-file-format.info1">
+            <fmt:param><%= si.bitstream.getName() %></fmt:param>
+            <fmt:param><%= si.bitstream.getSize() %></fmt:param>
+        </fmt:message></P>
 
 <%
     if (guess == null)
@@ -104,8 +107,9 @@
 %>
         <%-- <P>DSpace recognized the file format as <%= guess.getShortDescription() %>.
         <strong>Please be sure before you change this!</strong></P> --%>
-		<P><fmt:message key="jsp.submit.get-file-format.info3"/> <%= guess.getShortDescription() %>.
+		<P><fmt:message key="jsp.submit.get-file-format.info3">
-        <strong><fmt:message key="jsp.submit.get-file-format.info4"/></strong></P>
+            <fmt:param><%= guess.getShortDescription() %></fmt:param>
+        </fmt:message></P>
     
         <input type=hidden name=format value="<%= guess.getID() %>">
         <%= SubmitServlet.getSubmissionParameters(si) %>
@@ -186,6 +190,6 @@
         <input type=hidden name=step value="<%= SubmitServlet.GET_FILE_FORMAT %>">
 
         <%-- <center><P><input type=submit name=submit value="Set File Format"></P></center> --%>
-		<center><P><input type=submit name=submit value="<fmt:message key="jsp.submit.get-file-format.set.button"/>"></P></center>
+		<center><P><input type=submit name=submit value="<fmt:message key="jsp.submit.general.submit"/>"></P></center>
     </form>
 </dspace:layout>

dspace/jsp/submit/initial-questions.jsp

@@ -86,6 +86,7 @@
         submission.
         <dspace:popup page="/help/index.html#describe1">(More Help...)</dspace:popup></P> --%>
 
+        <P><fmt:message key="jsp.submit.initial-questions.info" /> 
         <dspace:popup page="/help/index.html#describe1"><fmt:message key="jsp.morehelp"/></dspace:popup></P>
 
         <center>
@@ -175,12 +176,12 @@
                     </td>
                     <td>
                         <%-- <input type=submit name=submit_next value="Next &gt;"> --%>
-						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.initial-questions.next.button"/>">
+						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.general.next"/>">
                     </td>
                     <td>&nbsp;&nbsp;&nbsp;</td>
                     <td align=right>
                         <%-- <input type=submit name=submit_cancel value="Cancel/Save"> --%>
-						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.initial-questions.cancel.button"/>">
+						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/submit/license-rejected.jsp

@@ -66,6 +66,6 @@
     <dspace:include page="/components/contact-info.jsp" />
 
     <%-- <P><A HREF="<%= request.getContextPath() %>/mydspace">Go to My DSpace</A></P> --%>
-	<P><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.submit.license-rejected.link"/></A></P>
+	<P><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.general.goto-mydspace"/></A></P>
 
 </dspace:layout>

dspace/jsp/submit/no-theses.jsp

@@ -56,7 +56,7 @@
 <dspace:layout titlekey="jsp.submit.no-theses.title">
 
     <%-- <H1>Theses Not Accepted in DSpace</H1> --%>
-	<H1><fmt:message key="jsp.submit.no-theses.heading"/></H1>
+	<H1><fmt:message key="jsp.submit.no-theses.title"/></H1>
 
     <%-- <P>DSpace does not currently accept individually-submitted
     theses, but you are encouraged to use the separate electronic thesis

dspace/jsp/submit/saved.jsp

@@ -61,6 +61,6 @@
 	<P><fmt:message key="jsp.submit.saved.info"/></P>
 
     <%-- <P><A HREF="<%= request.getContextPath() %>/mydspace">Go to My DSpace</A></P> --%>
-	<P><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.submit.saved.link"/></A></P>
+	<P><A HREF="<%= request.getContextPath() %>/mydspace"><fmt:message key="jsp.mydspace.general.goto-mydspace"/></A></P>
 
 </dspace:layout>

dspace/jsp/submit/select-collection.jsp

@@ -114,12 +114,12 @@
                     <td width="100%">&nbsp;</td>
                     <td>
                         <%-- <input type=submit name=submit_next value="Next &gt;"> --%>
-						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.select-collection.next.button"/>">
+						<input type=submit name=submit_next value="<fmt:message key="jsp.submit.general.next"/>">
                     </td>
                     <td>&nbsp;&nbsp;&nbsp;</td>
                     <td align=right>
                         <%-- <input type=submit name=submit_cancel value="Cancel/Save"> --%>
-						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.select-collection.cancel.button"/>">
+						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/submit/show-uploaded-file.jsp

@@ -136,7 +136,9 @@
             </tr>
             <tr>
                 <td class="evenRowOddCol"><A HREF="<%= request.getContextPath() %>/retrieve/<%= bitstream.getID() %>/<%= org.dspace.app.webui.util.UIUtil.encodeBitstreamName(bitstream.getName()) %>" target="_blank"><%= bitstream.getName() %></A></td>
-                <td class="evenRowEvenCol"><%= bitstream.getSize() %> bytes</td>
+                <td class="evenRowEvenCol"><fmt:message key="jsp.submit.show-uploaded-file.size-in-bytes">
+                    <fmt:param><%= bitstream.getSize() %></fmt:param>
+                </fmt:message></td>
                 <td class="evenRowOddCol">
                     <%= bitstream.getFormatDescription() %>
 <%    
@@ -230,16 +232,16 @@
                     <td width="100%">&nbsp;</td>
                     <td align>
                         <%-- <input type=submit name=submit_prev value="&lt; Previous"> --%>
-						<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.show-uploaded-file.previous.button"/>">
+						<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.general.previous"/>">
                     </td>
                     <td>
                        <%--  <input type=submit name=submit_next value="Next &gt;"> --%>
-					    <input type=submit name=submit_next value="<fmt:message key="jsp.submit.show-uploaded-file.next.button"/>">
+					    <input type=submit name=submit_next value="<fmt:message key="jsp.submit.general.next"/>">
                     </td>
                     <td>&nbsp;&nbsp;&nbsp;</td>
                     <td align=right>
                         <%-- <input type=submit name=submit_cancel value="Cancel/Save"> --%>
-						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.show-uploaded-file.cancel.button"/>">
+						<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/tombstone.jsp

@@ -58,7 +58,7 @@
     <dspace:include page="/components/contact-info.jsp" />
 
     <P align=center>
-        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.tombstone.link"/></A>
+        <A HREF="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></A>
     </P>
 
 </dspace:layout>

dspace/jsp/tools/confirm-delete-item.jsp

@@ -85,11 +85,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit" value="Delete"> --%>
-						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.confirm-delete-item.delete.button"/>">
+						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.general.delete"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-						<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.confirm-delete-item.cancel.button"/>">
+						<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/tools/confirm-withdraw-item.jsp

@@ -88,7 +88,7 @@
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-						<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.confirm-withdraw-item.cancel.button"/>">
+						<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/tools/edit-item-form.jsp

@@ -113,7 +113,7 @@
                         <input type="hidden" name="item_id" value="<%= item.getID() %>">
                         <input type="hidden" name="action" value="<%= EditItemServlet.START_WITHDRAW %>">
                         <%-- <input type="submit" name="submit" value="Withdraw..."> --%>
-						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.withdraw.button"/>">
+						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.withdraw-w-confirm.button"/>">
                     </form>
 <%
     }
@@ -134,7 +134,7 @@
                         <input type="hidden" name="item_id" value="<%= item.getID() %>">
                         <input type="hidden" name="action" value="<%= EditItemServlet.START_DELETE %>">
                         <%-- <input type="submit" name="submit" value="Delete (Expunge)..."> --%>
-						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.delete.button"/>">
+						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.delete-w-confirm.button"/>">
                     </form>
                 </td>
             </tr>
@@ -180,7 +180,7 @@
                         <input type="hidden" name="handle" value="<%= ConfigurationManager.getProperty("handle.prefix") %>">
                         <input type="hidden" name="item_id" value="<%= item.getID() %>">
                         <%-- <input type="submit" name="submit_item_select" value="Edit..."> --%>
-						<input type="submit" name="submit_item_select" value="<fmt:message key="jsp.tools.edit-item-form.edit.button"/>">
+						<input type="submit" name="submit_item_select" value="<fmt:message key="jsp.tools.general.edit"/>">
                     </form>
                 </td>
             </tr>
@@ -262,7 +262,7 @@
                 </td>
                 <td class="<%= row %>RowOddCol">
                     <%-- <input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="Remove"> --%>
-					<input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="<fmt:message key="jsp.tools.edit-item-form.remove.button"/>">
+					<input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="<fmt:message key="jsp.tools.general.remove"/>">
                 </td>
             </tr>
 <%      row = (row.equals("odd") ? "even" : "odd");
@@ -286,7 +286,7 @@
                 </td>
                 <td class="<%= row %>RowOddCol">
                     <%-- <input type="submit" name="submit_addfield" value="Add"> --%>
-					<input type="submit" name="submit_addfield" value="<fmt:message key="jsp.tools.edit-item-form.add.button"/>">
+					<input type="submit" name="submit_addfield" value="<fmt:message key="jsp.tools.general.add"/>">
                 </td>
             </tr>
         </table>
@@ -299,8 +299,7 @@
         <%-- <P><strong>Note: Changes to the bitstreams will not be automatically reflected in the
         Dublin Core metadata above (e.g. <code>format.extent</code>, <code>format.mimetype</code>).
         You will need to update this by hand.</strong></P> --%>
-		<P><strong><fmt:message key="jsp.tools.edit-item-form.note1"/> <code>format.extent</code>, <code>format.mimetype</code>).
+		<P><strong><fmt:message key="jsp.tools.edit-item-form.note1"/></strong></P>
-        <fmt:message key="jsp.tools.edit-item-form.note2"/></strong></P>
 
         <%-- <P>Also note that if the "user format description" field isn't empty, the format will
         always be set to "Unknown", so clear the user format description before changing the
@@ -316,7 +315,7 @@
                 <th class="oddRowEvenCol"><strong>Format</strong></th>
                 <th class="oddRowOddCol"><strong>User&nbsp;Format&nbsp;Description</strong></th> --%>
                 
-		<th class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem5"/><br><fmt:message key="jsp.tools.edit-item-form.elem6"/></strong></th>
+		<th class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem5"/></strong></th>
                 <th class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem7"/></strong></th>
                 <th class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem8"/></strong></th>
                 <th class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem9"/></strong></th>
@@ -367,7 +366,7 @@
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <A TARGET=_blank HREF="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>">View</A>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="Remove"> --%>
-					<A TARGET=_blank HREF="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>"><fmt:message key="jsp.tools.edit-item-form.view"/></A>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="<fmt:message key="jsp.tools.edit-item-form.remove.button"/>">
+					<A TARGET=_blank HREF="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>"><fmt:message key="jsp.tools.general.view"/></A>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="<fmt:message key="jsp.tools.general.remove"/>">
                 </td>
             </tr>
 <%
@@ -389,11 +388,11 @@
                 <tr>
                     <td align="left">
                         <%-- <input type="submit" name="submit" value="Update"> --%>
-						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.edit-item-form.update.button"/>">
+						<input type="submit" name="submit" value="<fmt:message key="jsp.tools.general.update"/>">
                     </td>
                     <td align="right">
                         <%-- <input type="submit" name="submit_cancel" value="Cancel"> --%>
-						<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.edit-item-form.cancel.button"/>">
+						<input type="submit" name="submit_cancel" value="<fmt:message key="jsp.tools.general.cancel"/>">
                     </td>
                 </tr>
             </table>

dspace/jsp/tools/eperson-list.jsp

@@ -131,7 +131,11 @@ function clearEPeople()
 	<body class="pageContents">
 
     <%-- <h3>E-people <%= first + 1 %>-<%= last + 1 %> of <%= epeople.length %></H3> --%>
-	<h3><fmt:message key="jsp.tools.eperson-list.heading"/> <%= first + 1 %>-<%= last + 1 %> <fmt:message key="jsp.tools.eperson-list.of"/> <%= epeople.length %></H3>
+	<h3><fmt:message key="jsp.tools.eperson-list.heading">
+        <fmt:param><%= first + 1 %></fmt:param>
+        <fmt:param><%= last + 1 %></fmt:param>
+        <fmt:param><%= epeople.length %></fmt:param>
+    </fmt:message></H3>
 
 <%
 	if (multiple)
@@ -150,12 +154,12 @@ function clearEPeople()
 			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneForward %>">1 Page &gt;</A></strong></small></td>
 			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveForward %>">5 Pages &gt;</A></strong></small></td>
 			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpEnd %>">Last</A></strong></small></td> --%>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %>0"><fmt:message key="jsp.tools.eperson-list.first"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %>0"><fmt:message key="jsp.tools.eperson-list.jump.first"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveBack %>">&lt; 5 <fmt:message key="jsp.tools.eperson-list.pages"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveBack %>"><fmt:message key="jsp.tools.eperson-list.jump.five-back"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneBack %>">&lt; 1 <fmt:message key="jsp.tools.eperson-list.page"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneBack %>"><fmt:message key="jsp.tools.eperson-list.jump.one-back"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneForward %>">1 <fmt:message key="jsp.tools.eperson-list.page"/> &gt;</A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneForward %>"><fmt:message key="jsp.tools.eperson-list.jump.one-forward"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveForward %>">5 <fmt:message key="jsp.tools.eperson-list.pages"/> &gt;</A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveForward %>"><fmt:message key="jsp.tools.eperson-list.jump.five-forward"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpEnd %>"><fmt:message key="jsp.tools.eperson-list.last"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpEnd %>"><fmt:message key="jsp.tools.eperson-list.jump.last"/></A></strong></small></td>
 		</tr>
 	</table>
 <br>
@@ -165,30 +169,40 @@ function clearEPeople()
     <table class="miscTable" align="center">
         <tr>
             <th class="oddRowOddCol">&nbsp;</th>
-            <th class="oddRowEvenCol"><%= sortBy == EPerson.ID ? "<strong>ID &uarr;</strong>" : "<A HREF=\"" + sortLink + "id\">ID</A>" %></th>
+            <th class="oddRowEvenCol"><%
-            <th class="oddRowOddCol"><%= sortBy == EPerson.EMAIL ? "<strong>E-mail &uarr;</strong>" : "<A HREF=\"" + sortLink + "email\">E-mail</A>" %></th>
+                if (sortBy == EPerson.ID)
+                {
+                    %><strong><fmt:message key="jsp.tools.eperson-list.th.id.sortedby" /></strong><%
+                }
+                else
+                {
+                    %><a href="<%= sortLink %>id"><fmt:message key="jsp.tools.eperson-list.th.id" /></a><%
+                }
+            %></th>
+            <th class="oddRowOddCol"><%
+                if (sortBy == EPerson.EMAIL)
+                {
+                    %><strong><fmt:message key="jsp.tools.eperson-list.th.email.sortedby" /></strong><%
+                }
+                else
+                {
+                    %><a href="<%= sortLink %>email"><fmt:message key="jsp.tools.eperson-list.th.email" /></a><%
+                }
+            %></th>
             <%-- <th class="oddRowEvenCol"><%= sortBy == EPerson.LASTNAME ? "<strong>Last Name &uarr;</strong>" : "<A HREF=\"" + sortLink + "lastname\">Last Name</A>" %></th> --%>
-            <th class="oddRowEvenCol">
+            <th class="oddRowEvenCol"><%
-                <%
+                if (sortBy == EPerson.LASTNAME)
-	    		if(sortBy == EPerson.LASTNAME)
+                {
-	    	     {
+                    %><fmt:message key="jsp.tools.eperson-list.th.lastname.sortedby" /><%
-	    	%>
+                }
-
+                else
-    	        	<strong><fmt:message key="jsp.tools.eperson-list.lastname"/> &uarr;</strong>
+                {
-	    	<%
+                    %><a href="<%= sortLink %>lastname"><fmt:message key="jsp.tools.eperson-list.th.lastname" /></a><%
-	    	    }
+                }
-	    	    else
+            %></th>
-	    	    {
-	    	%>
-			<A HREF="<%=sortLink%>lastname"><fmt:message key="jsp.tools.eperson-list.lastname"/></A>
-	    	<%
-	                 }
-		%>
-
-            </th>
 
             <%-- <th class="oddRowOddCol">First Name</th> --%>
-            <th class="oddRowOddCol"><fmt:message key="jsp.tools.eperson-list.firstname"/></th>
+            <th class="oddRowOddCol"><fmt:message key="jsp.tools.eperson-list.th.firstname"/></th>
         </tr>
 <%
     String row = "even";
@@ -209,8 +223,8 @@ function clearEPeople()
         <tr>
 			<td class="<%= row %>RowOddCol">
 			    <input type=button value="<%
-	if (multiple) { %><fmt:message key="jsp.tools.eperson-list.add"/><% }
+	if (multiple) { %><fmt:message key="jsp.tools.general.add"/><% }
-	else {          %><fmt:message key="jsp.tools.eperson-list.select"/><% } %>" onClick="javascript:<%= clearList %>addEPerson(<%= e.getID() %>, '<%= e.getEmail() %>', '<%= fullname %>');<%= closeWindow %>"></td>
+	else {          %><fmt:message key="jsp.tools.general.select"/><% } %>" onClick="javascript:<%= clearList %>addEPerson(<%= e.getID() %>, '<%= e.getEmail() %>', '<%= fullname %>');<%= closeWindow %>"></td>
 			<td class="<%= row %>RowEvenCol"><%= e.getID() %></td>
 			<td class="<%= row %>RowOddCol"><%= e.getEmail() %></td>
             <td class="<%= row %>RowEvenCol">
@@ -238,12 +252,12 @@ function clearEPeople()
 			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneForward %>">1 Page &gt;</A></strong></small></td>
 			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveForward %>">5 Pages &gt;</A></strong></small></td>
 			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpEnd %>">Last</A></strong></small></td> --%>
-		        <td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %>0"><fmt:message key="jsp.tools.eperson-list.first"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %>0"><fmt:message key="jsp.tools.eperson-list.jump.first"/></A></strong></small></td>
-		        <td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveBack %>">&lt; 5 <fmt:message key="jsp.tools.eperson-list.pages"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveBack %>"><fmt:message key="jsp.tools.eperson-list.jump.five-back"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneBack %>">&lt; 1 <fmt:message key="jsp.tools.eperson-list.page"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneBack %>"><fmt:message key="jsp.tools.eperson-list.jump.one-back"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneForward %>">1 <fmt:message key="jsp.tools.eperson-list.page"/> &gt;</A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpOneForward %>"><fmt:message key="jsp.tools.eperson-list.jump.one-forward"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveForward %>">5 <fmt:message key="jsp.tools.eperson-list.pages"/> &gt;</A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpFiveForward %>"><fmt:message key="jsp.tools.eperson-list.jump.five-forward"/></A></strong></small></td>
-			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpEnd %>"><fmt:message key="jsp.tools.eperson-list.last"/></A></strong></small></td>
+			<td width="17%" align="center"><small><strong><A HREF="<%= jumpLink %><%= jumpEnd %>"><fmt:message key="jsp.tools.eperson-list.jump.last"/></A></strong></small></td>
 		</tr>
 	</table>
 

dspace/jsp/tools/get-item-id.jsp

@@ -69,9 +69,10 @@
     if (request.getAttribute("invalid.id") != null) { %>
     <%-- <P><strong>The ID you entered isn't a valid item ID.</strong>  If you're trying to
     edit a community or collection, you need to use the --%>
-	<P><fmt:message key="jsp.tools.get-item-id.info1"/>
     <%-- <A HREF="<%= request.getContextPath() %>/dspace-admin/edit-communities">communities/collections admin page.</A></P> --%>
-      <A HREF="<%= request.getContextPath() %>/dspace-admin/edit-communities"><fmt:message key="jsp.tools.get-item-id.link"/>.</A></P>
+	<P><fmt:message key="jsp.tools.get-item-id.info1">
+        <fmt:param><%= request.getContextPath() %>/dspace-admin/edit-communities</fmt:param>
+    </fmt:message></P>
 <%  } %>
 
     <%-- <P>Enter the Handle or internal item ID of the item you want to edit or

dspace/jsp/tools/group-list.jsp

@@ -99,7 +99,7 @@
 
     <table class="miscTable" align="center">
         <tr>
-            <th class="oddRowOddCol"><strong>ID</strong></th>
+            <th class="oddRowOddCol"><strong><fmt:message key="jsp.tools.group-list.id" />ID</strong></th>
             <%-- <th class="oddRowEvenCol"><strong>Name</strong></th> --%>
 			<th class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.group-list.name"/></strong></th>
             <th class="oddRowOddCol">&nbsp;</th>
@@ -120,11 +120,11 @@
                 <td class="<%= row %>RowOddCol">
                     <input type="hidden" name="group_id" value="<%= groups[i].getID() %>">
                     <%-- <input type="submit" name="submit_edit" value="Edit..."> --%>
-					<input type="submit" name="submit_edit" value="<fmt:message key="jsp.tools.group-list.edit.button"/>">
+					<input type="submit" name="submit_edit" value="<fmt:message key="jsp.tools.general.edit"/>">
                 </td>
                 <td class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_group_delete" value="Delete"> --%>
-					<input type="submit" name="submit_group_delete" value="<fmt:message key="jsp.tools.group-list.delete.button"/>">
+					<input type="submit" name="submit_group_delete" value="<fmt:message key="jsp.tools.general.delete"/>">
                 </td>
             </tr>
         </form>

dspace/jsp/tools/itemmap-main.jsp

@@ -84,12 +84,16 @@
 	<h2><fmt:message key="jsp.tools.itemmap-main.heading"/></h2>
 
     <%--  <p>Collection: "<%=collection.getMetadata("name")%>"</p> --%>
-    <p><fmt:message key="jsp.tools.itemmap-main.collection"/> "<%=collection.getMetadata("name")%>"</p>
+    <p><fmt:message key="jsp.tools.itemmap-main.collection">
+        <fmt:param><%=collection.getMetadata("name")%></fmt:param>
+    </fmt:message></p>
 	 
     <%-- <p>There are <%=count_native%> items owned by this collection, and
     <%=count_import%> items mapped in from other collections.</p> --%>
-	<p><fmt:message key="jsp.tools.itemmap-main.info1"/> <%=count_native%> <fmt:message key="jsp.tools.itemmap-main.info2"/>
+	<p><fmt:message key="jsp.tools.itemmap-main.info1">
-    <%=count_import%> <fmt:message key="jsp.tools.itemmap-main.info3"/></p>
+        <fmt:param><%=count_native%></fmt:param>
+        <fmt:param><%=count_import%></fmt:param>
+    </fmt:message></p>
    
 <%-- 
     <h3>Quick Add Item:</h3>
@@ -151,7 +155,7 @@
         <input name="namepart">
         <%-- <input type=submit name="action" value="Search Authors"> --%>
         <input type=hidden name="action" value="Search Authors">
-	<input type=submit value="<fmt:message key="jsp.tools.itemmap-main.search.button"/>">
+	    <input type=submit value="<fmt:message key="jsp.tools.itemmap-main.search.button"/>">
         <br>
     </form> 
 
@@ -188,4 +192,3 @@
     <P align=center><A HREF="<%=myLink%>&cid=<%=cid%>&t=<%=myID%>"><%=myTitle%> (<%=myCount%>)</A></P>
 <%  } %>            
 </dspace:layout>
-        

dspace/jsp/tools/upload-bitstream.jsp

@@ -79,7 +79,7 @@
         <input type="hidden" name="item_id" value="<%= item.getID() %>">
 
         <!-- <P align=center><input type="submit" name="submit" value="Upload"></P> -->
-		<P align=center><input type="submit" name="submit" value="<fmt:message key="jsp.tools.upload-bitstream.upload.button"/>"></P>
+		<P align=center><input type="submit" name="submit" value="<fmt:message key="jsp.tools.upload-bitstream.upload"/>"></P>
     </form>
     
 </dspace:layout>