svn commit: r596760 - in /lenya/trunk/src: modules-core/workflow/resources/i18n/cmsui.xml webapp/lenya/resources/i18n/cmsui.xml

Author: andreas
Date: Tue Nov 20 10:06:44 2007
New Revision: 596760

URL: http://svn.apache.org/viewvc?rev=596760&view=rev
Log:
Consolidate English workflow usecase i18n messages

Modified:
    lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml

Modified: lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml?rev=596760&r1=596759&r2=596760&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml Tue Nov 20 10:06:44 2007
@@ -22,7 +22,6 @@
 
   <message key="workflow.multiWorkflow">Workflow Overview</message>
   <message key="back-to-document">Back to document</message>
-  <message key="workflow.submit">Submit</message>
   <message key="workflow.reject">Reject</message>
   <message key="workflow.publish">Publish</message>
   <message key="workflow.deactivate">Deactivate</message>
@@ -39,15 +38,31 @@
     -->
     {0} ("{1}")
   </message>
+  
+  <!-- submit usecase -->
+  <message key="workflow.submit">Submit</message>
+  <message key="notify-reviewers">Notify reviewers</message>
+  <message key="submit-for-approval?">
+    Do you want to submit the document <xhtml:q>{0}</xhtml:q> for approval?
+  </message>
+  
+  <!-- reject usecae -->
+  <message key="Reject">Reject</message>
+  <message key="reject-doc?">Do you want to reject the document <xhtml:q>{0}</xhtml:q>?</message>
+  <message key="notify-submitter">Notify the submitter</message>
   
   <message key="unpublished-links">Links to unpublished documents:</message>
   <message key="links-to-document">Links from other documents:</message>
   <message key="publish-broken-links">The document contains broken links.</message>
   
-  <message key="notify-reviewers">Notify reviewers</message>
   <message key="scheduler-date-format-invalid">The scheduler date must be of the form 'yyyy-MM-dd HH:mm:ss'.</message>
   <message key="This usecase can only be invoked when the live version exists.">
     This usecase can only be invoked when the live version exists.
   </message>
+  
+  <!-- deactivate usecase -->
+  <message key="Deactivate Document">Deactivate Document</message>
+  <message key="deactivate-doc?">Do you want to deactivate the document <xhtml:q>{0}</xhtml:q>?</message>
+  
   
 </catalogue>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml?rev=596760&r1=596759&r2=596760&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Tue Nov 20 10:06:44 2007
@@ -98,9 +98,6 @@
   <message key="Live View">Live&#160;View</message>
   <message key="Other Publications">Other&#160;Publications</message>
   
-  <!-- submit screen -->
-  <message key="submit-for-approval">Submit "{0}" for approval</message>  
-  <message key="submit-for-approval?">Do you want to submit <xhtml:em>"{0}"</xhtml:em> for approval?</message>
 
   <!-- publish screen -->     
   <message key="Publish">Publish</message>  
@@ -123,11 +120,6 @@
   <message key="Your History">Your History</message>
   <message key="Login to Authoring Area">Login to Authoring Area</message>
 
-  <!-- reject screen -->
-  <message key="Reject">Reject</message>
-  <message key="reject-doc">Reject document "{0}"</message>
-  <message key="reject-doc?">Do you want to reject the document <xhtml:em>"{0}"</xhtml:em>?</message>
-  
   <!-- cms menu -->
   <message key="New Document">New Document</message>
   <message key="New ... Document">New {0} Document</message>
@@ -270,9 +262,6 @@
 
       <!-- Deactivate and delete -->
   <message key="docs-have-links-to-doc">The following documents have links to this document</message>
-  <message key="Deactivate Document">Deactivate Document</message>
-  <message key="deactivate-doc">Deactivate document {0}</message>
-  <message key="deactivate-doc?">Do you really want to deactivate the document {0}?</message>
   <message key="Delete Document">Delete Document</message>
   <message key="delete-doc">Delete document {0}</message>
   <message key="cannot-deactivate-unless-children-deactivated">This document cannot be deactivated unless the following child documents are deactivated</message>
@@ -329,7 +318,6 @@
   
   <!-- Notification -->
   <message key="notification-message">Lenya Notification</message>
-  <message key="notify-submitter">notify the submitter</message>
   <message key="document-published">A document you submitted was published: {0}</message>
   <message key="document-submitted">A document has been submitted for you to review: {0}</message>
   <message key="document-rejected">A document you submitted was rejected for the following reason: {0}, {1}</message>