Author: vhennebert
Date: Fri Apr  9 17:22:31 2010
New Revision: 932519

URL: http://svn.apache.org/viewvc?rev=932519&view=rev
Log:
Added getEventKey method to Event so that it's no longer necessary to store the 
whole event ID (fully qualified interface name) in message files


Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer_de.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.xml
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.xml

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml Fri 
Apr  9 17:22:31 2010
@@ -18,15 +18,15 @@
 <!-- $Id$ -->
 <catalogue xml:lang="en">
   <message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| 
(No context info available)]</message>
-  <message key="org.apache.fop.ResourceEventProducer.imageNotFound">Image not 
found.[ URI: {uri}.]{{locator}}</message>
-  <message key="org.apache.fop.ResourceEventProducer.imageError">Image not 
available.[ URI: {uri}.] Reason:[ {reason}][ {e}]{{locator}}</message>
-  <message key="org.apache.fop.ResourceEventProducer.imageIOError">I/O error 
while loading image.[ URI: {uri}.][ Reason: {ioe}]{{locator}}</message>
-  <message key="org.apache.fop.ResourceEventProducer.ifoNoIntrinsicSize">The 
intrinsic dimensions of an instream-foreign-object could not be 
determined.{{locator}}</message>
-  <message key="org.apache.fop.ResourceEventProducer.uriError">Error while 
handling URI: {uri}. Reason: {e}{{locator}}</message>
-  <message 
key="org.apache.fop.ResourceEventProducer.foreignXMLProcessingError">Some XML 
content will be ignored. Could not render XML in namespace "{namespaceURI}".[ 
Reason: {e}]</message>
-  <message key="org.apache.fop.ResourceEventProducer.foreignXMLNoHandler">Some 
XML content will be ignored. No handler defined for XML with namespace 
"{namespaceURI}".</message>
-  <message key="org.apache.fop.ResourceEventProducer.imageWritingError">Error 
while writing an image to the target file.[ Reason: {e}]</message>
-  <message 
key="org.apache.fop.ResourceEventProducer.cannotDeleteTempFile">Temporary file 
could not be deleted: {tempFile}</message>
-  <message 
key="org.apache.fop.ResourceEventProducer.catalogResolverNotFound">Catalog 
resolver not found along the classpath</message>
-  <message 
key="org.apache.fop.ResourceEventProducer.catalogResolverNotCreated">Error 
creating the catalog resolver: {message}</message>
+  <message key="imageNotFound">Image not found.[ URI: 
{uri}.]{{locator}}</message>
+  <message key="imageError">Image not available.[ URI: {uri}.] Reason:[ 
{reason}][ {e}]{{locator}}</message>
+  <message key="imageIOError">I/O error while loading image.[ URI: {uri}.][ 
Reason: {ioe}]{{locator}}</message>
+  <message key="ifoNoIntrinsicSize">The intrinsic dimensions of an 
instream-foreign-object could not be determined.{{locator}}</message>
+  <message key="uriError">Error while handling URI: {uri}. Reason: 
{e}{{locator}}</message>
+  <message key="foreignXMLProcessingError">Some XML content will be ignored. 
Could not render XML in namespace "{namespaceURI}".[ Reason: {e}]</message>
+  <message key="foreignXMLNoHandler">Some XML content will be ignored. No 
handler defined for XML with namespace "{namespaceURI}".</message>
+  <message key="imageWritingError">Error while writing an image to the target 
file.[ Reason: {e}]</message>
+  <message key="cannotDeleteTempFile">Temporary file could not be deleted: 
{tempFile}</message>
+  <message key="catalogResolverNotFound">Catalog resolver not found along the 
classpath</message>
+  <message key="catalogResolverNotCreated">Error creating the catalog 
resolver: {message}</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml
 Fri Apr  9 17:22:31 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
-  <message 
key="org.apache.fop.accessibility.AccessibilityEventProducer.noStructureTreeInXML">Accessibility
 is enabled but structure tree is missing in XML file. Please disable 
accessibility, or re-generate XML file in accessibility mode.</message>
+  <message key="noStructureTreeInXML">Accessibility is enabled but structure 
tree is missing in XML file. Please disable accessibility, or re-generate XML 
file in accessibility mode.</message>
 </catalogue>

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.xml 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.xml Fri 
Apr  9 17:22:31 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
-  <message key="org.apache.fop.afp.AFPEventProducer.warnDefaultFontSetup">No 
AFP fonts configured. Using default setup.</message>
-  <message key="org.apache.fop.afp.AFPEventProducer.warnMissingDefaultFont">No 
AFP default "any", {style}, {weight} font configured.</message>
-  <message 
key="org.apache.fop.afp.AFPEventProducer.characterSetEncodingError">An error 
occurred when attempting to encode character set {charSetName} with encoding 
scheme {encoding}.</message>
-  <message key="org.apache.fop.afp.AFPEventProducer.resourceEmbeddingError">An 
error occurs while embedding the resource named "{resourceName}".[ Reason: 
{e}]</message>
+  <message key="warnDefaultFontSetup">No AFP fonts configured. Using default 
setup.</message>
+  <message key="warnMissingDefaultFont">No AFP default "any", {style}, 
{weight} font configured.</message>
+  <message key="characterSetEncodingError">An error occurred when attempting 
to encode character set {charSetName} with encoding scheme {encoding}.</message>
+  <message key="resourceEmbeddingError">An error occurs while embedding the 
resource named "{resourceName}".[ Reason: {e}]</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.xml 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -17,9 +17,9 @@
 -->
 <!-- $Id$ -->
 <catalogue xml:lang="en">
-  <message 
key="org.apache.fop.area.AreaEventProducer.unresolvedIDReference">{type}: 
Unresolved ID reference "{id}" found.</message>
-  <message 
key="org.apache.fop.area.AreaEventProducer.unresolvedIDReferenceOnPage">Page 
{page}: Unresolved ID reference "{id}" found.</message>
-  <message key="org.apache.fop.area.AreaEventProducer.pageLoadError">Error 
while deserializing page {page}.[ Reason: {e}]</message>
-  <message key="org.apache.fop.area.AreaEventProducer.pageSaveError">Error 
while serializing page {page}.[ Reason: {e}]</message>
-  <message 
key="org.apache.fop.area.AreaEventProducer.pageRenderingError">Error while 
rendering page {page}.[ Reason: {e}]</message>
+  <message key="unresolvedIDReference">{type}: Unresolved ID reference "{id}" 
found.</message>
+  <message key="unresolvedIDReferenceOnPage">Page {page}: Unresolved ID 
reference "{id}" found.</message>
+  <message key="pageLoadError">Error while deserializing page {page}.[ Reason: 
{e}]</message>
+  <message key="pageSaveError">Error while serializing page {page}.[ Reason: 
{e}]</message>
+  <message key="pageRenderingError">Error while rendering page {page}.[ 
Reason: {e}]</message>
 </catalogue>

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java Fri Apr  9 
17:22:31 2010
@@ -33,7 +33,10 @@ public class Event extends EventObject {
 
     private static final long serialVersionUID = -1310594422868258083L;
 
-    private String eventID;
+    private String eventGroupID;
+
+    private String eventKey;
+
     private EventSeverity severity;
     private Map params;
 
@@ -46,7 +49,13 @@ public class Event extends EventObject {
      */
     public Event(Object source, String eventID, EventSeverity severity, Map 
params) {
         super(source);
-        this.eventID = eventID;
+        int pos = eventID.lastIndexOf('.');
+        if (pos < 0 || pos == eventID.length() - 1) {
+            eventKey = eventID;
+        } else {
+            eventGroupID = eventID.substring(0, pos);
+            eventKey = eventID.substring(pos + 1);
+        }
         setSeverity(severity);
         this.params = params;
     }
@@ -56,7 +65,11 @@ public class Event extends EventObject {
      * @return the event identifier
      */
     public String getEventID() {
-        return this.eventID;
+        if (eventGroupID == null) {
+            return eventKey;
+        } else {
+            return eventGroupID + '.' + eventKey;
+        }
     }
 
     /**
@@ -64,12 +77,15 @@ public class Event extends EventObject {
      * @return the event group identifier (or null if there is no group 
identifier)
      */
     public String getEventGroupID() {
-        int pos = this.eventID.lastIndexOf('.');
-        if (pos > 0) {
-            return this.eventID.substring(0, pos);
-        } else {
-            return null;
-        }
+        return eventGroupID;
+    }
+
+    /**
+     * Returns the event key.
+     * @return the event key
+     */
+    public String getEventKey() {
+        return eventKey;
     }
 
     /**

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java 
Fri Apr  9 17:22:31 2010
@@ -98,7 +98,7 @@ public final class EventFormatter {
     }
 
     private static String format(Event event, ResourceBundle bundle) {
-        String template = bundle.getString(event.getEventID());
+        String template = bundle.getString(event.getEventKey());
         return format(event, processIncludes(template, bundle));
     }
 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.xml 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -13,31 +13,31 @@
   <message key="rule.childOfPageSequence">The element must be a child of 
fo:page-sequence.</message>
   <message key="rule.childOfPageSequenceOrSPM">The element must be a child of 
fo:page-sequence or fo:simple-page-master.</message>
   <message key="rule.wrapperInvalidChildForParent">An fo:wrapper is only 
permitted to have children that would be permitted for its parent.</message>
-  <message key="org.apache.fop.fo.FOValidationEventProducer.tooManyNodes">For 
"{elementName}", only one "{offendingNode}" may be 
declared.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.nodeOutOfOrder">For 
"{elementName}", "{tooLateNode}" must be declared before 
"{tooEarlyNode}"!{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.invalidChild">"{offendingNode}"
 is not a valid child of "{elementName}"![ 
{ruleViolated,lookup}]{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.missingChildElement">"{elementName}"
 is missing child elements.[ Required content model: 
{contentModel}]{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.missingProperty">Element 
"{elementName}" is missing required property 
"{propertyName}"!{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.idNotUnique">Property ID 
"{id}" (found on "{elementName}") previously used; ID values must be unique 
within a document!{severity,equals,EventSeverity:FATAL,, Any reference to it 
will be considered a reference to the first occurrence in the 
document.}{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.markerBlockContainerAbsolutePosition">Only
 an fo:block-container that does not generate absolutely positioned areas may 
have one or more fo:markers as its initial children.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.markerNotInitialChild">fo:marker
 must be an initial child: {mcname}{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.markerNotUniqueForSameParent">fo:marker
 "marker-class-name" must be unique for same parent: 
{mcname}{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.invalidProperty">Invalid 
property encountered on "{elementName}": {attr}{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.invalidPropertyValue">Invalid 
property value encountered in {propName}="{propValue}"[: 
{e}]{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.unimplementedFeature">The 
following feature isn't implemented by Apache FOP, yet: {feature} (on 
{elementName}){{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.missingLinkDestination">Missing
 attribute on {elementName}: Either external-destination or 
internal-destination must be specified.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.markerCloningFailed">Unable to 
clone subtree of fo:marker (marker-class-name="{markerClassName}") for 
fo:retrieve-marker.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.colorProfileNameNotUnique">Duplicate
 color profile profile name: {name}{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.regionNameMappedToMultipleRegionClasses">Region-name
 ("{regionName}") is being mapped to multiple region-classes 
({defaultRegionClass1} and {defaultRegionClass2}).{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.masterNameNotUnique">The page 
master name ("{name}") must be unique across page-masters and 
page-sequence-masters.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.duplicateFlowNameInPageSequence">Duplicate
 flow-name "{flowName}" found within {elementName}.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.flowNameNotMapped">The 
flow-name "{flowName}" on {elementName} could not be mapped to a region-name in 
the layout-master-set.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.masterNotFound">The 
master-reference "{masterReference}" on {elementName} matches no 
simple-page-master or page-sequence-master.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.illegalRegionName">The 
region-name "{regionName}" for {elementName} is not 
permitted.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.nonZeroBorderPaddingOnRegion">Border
 and padding for {elementName} "{regionName}" should be '0' (See 6.4.14 in XSL 
1.1); non-standard values are allowed if relaxed validation is enabled. 
{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.columnCountErrorOnRegionBodyOverflowScroll">If
 overflow property is set to "scroll" on {elementName}, a column-count other 
than "1" may not be specified.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.invalidFORoot">First element 
must be the fo:root formatting object. Found {elementName} instead. Please make 
sure you're producing a valid XSL-FO document.</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.emptyDocument">Document is 
empty (something might be wrong with your XSLT stylesheet).</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.unknownFormattingObject">Unknown
 formatting object "{offendingNode}" encountered (a child of 
{elementName}}.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.altTextMissing">Alternate text 
is missing on {foElement}.{{locator}}</message>
+  <message key="tooManyNodes">For "{elementName}", only one "{offendingNode}" 
may be declared.{{locator}}</message>
+  <message key="nodeOutOfOrder">For "{elementName}", "{tooLateNode}" must be 
declared before "{tooEarlyNode}"!{{locator}}</message>
+  <message key="invalidChild">"{offendingNode}" is not a valid child of 
"{elementName}"![ {ruleViolated,lookup}]{{locator}}</message>
+  <message key="missingChildElement">"{elementName}" is missing child 
elements.[ Required content model: {contentModel}]{{locator}}</message>
+  <message key="missingProperty">Element "{elementName}" is missing required 
property "{propertyName}"!{{locator}}</message>
+  <message key="idNotUnique">Property ID "{id}" (found on "{elementName}") 
previously used; ID values must be unique within a 
document!{severity,equals,EventSeverity:FATAL,, Any reference to it will be 
considered a reference to the first occurrence in the 
document.}{{locator}}</message>
+  <message key="markerBlockContainerAbsolutePosition">Only an 
fo:block-container that does not generate absolutely positioned areas may have 
one or more fo:markers as its initial children.{{locator}}</message>
+  <message key="markerNotInitialChild">fo:marker must be an initial child: 
{mcname}{{locator}}</message>
+  <message key="markerNotUniqueForSameParent">fo:marker "marker-class-name" 
must be unique for same parent: {mcname}{{locator}}</message>
+  <message key="invalidProperty">Invalid property encountered on 
"{elementName}": {attr}{{locator}}</message>
+  <message key="invalidPropertyValue">Invalid property value encountered in 
{propName}="{propValue}"[: {e}]{{locator}}</message>
+  <message key="unimplementedFeature">The following feature isn't implemented 
by Apache FOP, yet: {feature} (on {elementName}){{locator}}</message>
+  <message key="missingLinkDestination">Missing attribute on {elementName}: 
Either external-destination or internal-destination must be 
specified.{{locator}}</message>
+  <message key="markerCloningFailed">Unable to clone subtree of fo:marker 
(marker-class-name="{markerClassName}") for 
fo:retrieve-marker.{{locator}}</message>
+  <message key="colorProfileNameNotUnique">Duplicate color profile profile 
name: {name}{{locator}}</message>
+  <message key="regionNameMappedToMultipleRegionClasses">Region-name 
("{regionName}") is being mapped to multiple region-classes 
({defaultRegionClass1} and {defaultRegionClass2}).{{locator}}</message>
+  <message key="masterNameNotUnique">The page master name ("{name}") must be 
unique across page-masters and page-sequence-masters.{{locator}}</message>
+  <message key="duplicateFlowNameInPageSequence">Duplicate flow-name 
"{flowName}" found within {elementName}.{{locator}}</message>
+  <message key="flowNameNotMapped">The flow-name "{flowName}" on {elementName} 
could not be mapped to a region-name in the 
layout-master-set.{{locator}}</message>
+  <message key="masterNotFound">The master-reference "{masterReference}" on 
{elementName} matches no simple-page-master or 
page-sequence-master.{{locator}}</message>
+  <message key="illegalRegionName">The region-name "{regionName}" for 
{elementName} is not permitted.{{locator}}</message>
+  <message key="nonZeroBorderPaddingOnRegion">Border and padding for 
{elementName} "{regionName}" should be '0' (See 6.4.14 in XSL 1.1); 
non-standard values are allowed if relaxed validation is enabled. 
{{locator}}</message>
+  <message key="columnCountErrorOnRegionBodyOverflowScroll">If overflow 
property is set to "scroll" on {elementName}, a column-count other than "1" may 
not be specified.{{locator}}</message>
+  <message key="invalidFORoot">First element must be the fo:root formatting 
object. Found {elementName} instead. Please make sure you're producing a valid 
XSL-FO document.</message>
+  <message key="emptyDocument">Document is empty (something might be wrong 
with your XSLT stylesheet).</message>
+  <message key="unknownFormattingObject">Unknown formatting object 
"{offendingNode}" encountered (a child of {elementName}}.{{locator}}</message>
+  <message key="altTextMissing">Alternate text is missing on 
{foElement}.{{locator}}</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer_de.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer_de.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer_de.xml
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer_de.xml
 Fri Apr  9 17:22:31 2010
@@ -18,6 +18,6 @@
 <!-- $Id$ -->
 <catalogue xml:lang="de">
   <message key="locator">[ (Siehe Position {loc})| (Siehe 
{#gatherContextInfo})| (Keine Kontextinformationen verfügbar)]</message>
-  <message key="org.apache.fop.fo.FOValidationEventProducer.tooManyNodes">In 
"{elementName}" darf nur ein einziges "{offendingNode}" 
vorkommen!{{locator}}</message>
-  <message 
key="org.apache.fop.fo.FOValidationEventProducer.missingProperty">Dem Element 
"{elementName}" fehlt ein verlangtes Property 
"{propertyName}"!{{locator}}</message>
+  <message key="tooManyNodes">In "{elementName}" darf nur ein einziges 
"{offendingNode}" vorkommen!{{locator}}</message>
+  <message key="missingProperty">Dem Element "{elementName}" fehlt ein 
verlangtes Property "{propertyName}"!{{locator}}</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.xml
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.xml
 Fri Apr  9 17:22:31 2010
@@ -18,16 +18,16 @@
 <!-- $Id$ -->
 <catalogue xml:lang="en">
   <message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| 
(No context info available)]</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.nonAutoBPDOnTable">Only a 
value of "auto" for block-progression-dimension has a well-specified behavior 
on fo:table. Falling back to "auto".{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.noTablePaddingWithCollapsingBorderModel">In
 collapsing border model a table does not have padding (see 
http://www.w3.org/TR/REC-CSS2/tables.html#collapsing-borders), but a non-zero 
value for padding was found. The padding will be ignored.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.noMixRowsAndCells">Either 
fo:table-rows or fo:table-cells may be children of an {elementName} but not 
both.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.footerOrderCannotRecover">This
 table uses the collapsing border model. In order to resolve borders in an 
efficient way the table-footer must be known before any table-body is parsed. 
Either put the footer at the correct place or switch to the separate border 
model.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.startEndRowUnderTableRowWarning">starts-row/ends-row
 for fo:table-cells non-applicable for children of an 
fo:table-row.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.tooManyCells">The 
column-number or number of cells in the row overflows the number of 
fo:table-columns specified for the table.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.valueMustBeBiggerGtEqOne">{propName}
 must be 1 or bigger, but got {actualValue}{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.warnImplicitColumns">table-layout=\"fixed\"
 and column-width unspecified =&gt; falling back to 
proportional-column-width(1){{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.paddingNotApplicable">padding-*
 properties are not applicable to {elementName}, but a non-zero value for 
padding was found.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.cellOverlap">{elementName} 
overlaps in column {column}.<!-- no locator here, exception will be wrapped 
--></message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.forceNextColumnNumber">Negative
 value {propValue} of property column-number of element {elementName} forced 
into the next available column number {columnNumber}.{{locator}}</message>
-  <message 
key="org.apache.fop.fo.flow.table.TableEventProducer.breakIgnoredDueToRowSpanning">{breakBefore,if,break-before,break-after}
 ignored on {elementName} because of row spanning in progress (See XSL 1.1, 
{breakBefore,if,7.20.2,7.20.1}){{locator}}</message>
+  <message key="nonAutoBPDOnTable">Only a value of "auto" for 
block-progression-dimension has a well-specified behavior on fo:table. Falling 
back to "auto".{{locator}}</message>
+  <message key="noTablePaddingWithCollapsingBorderModel">In collapsing border 
model a table does not have padding (see 
http://www.w3.org/TR/REC-CSS2/tables.html#collapsing-borders), but a non-zero 
value for padding was found. The padding will be ignored.{{locator}}</message>
+  <message key="noMixRowsAndCells">Either fo:table-rows or fo:table-cells may 
be children of an {elementName} but not both.{{locator}}</message>
+  <message key="footerOrderCannotRecover">This table uses the collapsing 
border model. In order to resolve borders in an efficient way the table-footer 
must be known before any table-body is parsed. Either put the footer at the 
correct place or switch to the separate border model.{{locator}}</message>
+  <message key="startEndRowUnderTableRowWarning">starts-row/ends-row for 
fo:table-cells non-applicable for children of an 
fo:table-row.{{locator}}</message>
+  <message key="tooManyCells">The column-number or number of cells in the row 
overflows the number of fo:table-columns specified for the 
table.{{locator}}</message>
+  <message key="valueMustBeBiggerGtEqOne">{propName} must be 1 or bigger, but 
got {actualValue}{{locator}}</message>
+  <message key="warnImplicitColumns">table-layout=\"fixed\" and column-width 
unspecified =&gt; falling back to 
proportional-column-width(1){{locator}}</message>
+  <message key="paddingNotApplicable">padding-* properties are not applicable 
to {elementName}, but a non-zero value for padding was 
found.{{locator}}</message>
+  <message key="cellOverlap">{elementName} overlaps in column {column}.<!-- no 
locator here, exception will be wrapped --></message>
+  <message key="forceNextColumnNumber">Negative value {propValue} of property 
column-number of element {elementName} forced into the next available column 
number {columnNumber}.{{locator}}</message>
+  <message 
key="breakIgnoredDueToRowSpanning">{breakBefore,if,break-before,break-after} 
ignored on {elementName} because of row spanning in progress (See XSL 1.1, 
{breakBefore,if,7.20.2,7.20.1}){{locator}}</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -17,7 +17,7 @@
 -->
 <!-- $Id$ -->
 <catalogue xml:lang="en">
-  <message key="org.apache.fop.fonts.FontEventProducer.fontSubstituted">Font 
"{requested}" not found. Substituting with "{effective}".</message>
-  <message 
key="org.apache.fop.fonts.FontEventProducer.fontLoadingErrorAtAutoDetection">Unable
 to load font file: {fontURL}.[ Reason: {e}]</message>
-  <message 
key="org.apache.fop.fonts.FontEventProducer.glyphNotAvailable">Glyph "{ch}" 
(0x{ch,hex}[, {ch,glyph-name}]) not available in font "{fontName}".</message>
+  <message key="fontSubstituted">Font "{requested}" not found. Substituting 
with "{effective}".</message>
+  <message key="fontLoadingErrorAtAutoDetection">Unable to load font file: 
{fontURL}.[ Reason: {e}]</message>
+  <message key="glyphNotAvailable">Glyph "{ch}" (0x{ch,hex}[, 
{ch,glyph-name}]) not available in font "{fontName}".</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
 Fri Apr  9 17:22:31 2010
@@ -18,15 +18,15 @@
 <!-- $Id$ -->
 <catalogue xml:lang="en">
   <message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| 
(No context info available)]</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.rowTooTall">The contents 
of table-row {row} are taller than they should be (there is a 
block-progression-dimension or height constraint on the indicated row). Due to 
its contents the row grows to {effCellBPD} millipoints, but the row shouldn't 
get any taller than {maxCellBPD} millipoints.{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.tableFixedAutoWidthNotSupported">table-layout="fixed"
 and width="auto", but auto-layout not supported =&gt; assuming 
width="100%".{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.objectTooWide">The extent 
in inline-progression-direction (width) of a {elementName} is bigger than the 
available space ({effIPD}mpt &gt; {maxIPD}mpt).{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.overconstrainedAdjustEndIndent">An
 {elementName} {{locator}} is wider than the available room in 
inline-progression-dimension. Adjusting end-indent based on overconstrained 
geometry rules (XSL 1.1, ch. 5.3.4)</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.viewportOverflow">Content 
overflows the viewport of an {elementName} in block-progression direction by 
{amount} millipoints.{clip,if, Content will be clipped.}{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.regionOverflow">Content 
overflows the viewport of the {elementName} on page {page} in block-progression 
direction by {amount} millipoints.{clip,if, Content will be 
clipped.}{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.flowNotMappingToRegionBody">Flow
 "{flowName}" does not map to the region-body in page-master "{masterName}". 
FOP presently does not support this.{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.pageSequenceMasterExhausted">Subsequences
 exhausted in page-sequence-master "{pageSequenceMasterName}", 
{canRecover,if,using previous subsequence,cannot recover}.{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.missingSubsequencesInPageSequenceMaster">No
 subsequences in page-sequence-master 
"{pageSequenceMasterName}".{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.noMatchingPageMaster">No 
simple-page-master matching "{pageMasterName}" in page-sequence-master 
"{pageSequenceMasterName}".{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.BlockLevelEventProducer.nonRestartableContentFlowingToNarrowerPage">Content
 that cannot handle IPD changes is flowing to a narrower page. Part of it may 
be clipped by the page border.</message>
+  <message key="rowTooTall">The contents of table-row {row} are taller than 
they should be (there is a block-progression-dimension or height constraint on 
the indicated row). Due to its contents the row grows to {effCellBPD} 
millipoints, but the row shouldn't get any taller than {maxCellBPD} 
millipoints.{{locator}}</message>
+  <message key="tableFixedAutoWidthNotSupported">table-layout="fixed" and 
width="auto", but auto-layout not supported =&gt; assuming 
width="100%".{{locator}}</message>
+  <message key="objectTooWide">The extent in inline-progression-direction 
(width) of a {elementName} is bigger than the available space ({effIPD}mpt &gt; 
{maxIPD}mpt).{{locator}}</message>
+  <message key="overconstrainedAdjustEndIndent">An {elementName} {{locator}} 
is wider than the available room in inline-progression-dimension. Adjusting 
end-indent based on overconstrained geometry rules (XSL 1.1, ch. 
5.3.4)</message>
+  <message key="viewportOverflow">Content overflows the viewport of an 
{elementName} in block-progression direction by {amount} millipoints.{clip,if, 
Content will be clipped.}{{locator}}</message>
+  <message key="regionOverflow">Content overflows the viewport of the 
{elementName} on page {page} in block-progression direction by {amount} 
millipoints.{clip,if, Content will be clipped.}{{locator}}</message>
+  <message key="flowNotMappingToRegionBody">Flow "{flowName}" does not map to 
the region-body in page-master "{masterName}". FOP presently does not support 
this.{{locator}}</message>
+  <message key="pageSequenceMasterExhausted">Subsequences exhausted in 
page-sequence-master "{pageSequenceMasterName}", {canRecover,if,using previous 
subsequence,cannot recover}.{{locator}}</message>
+  <message key="missingSubsequencesInPageSequenceMaster">No subsequences in 
page-sequence-master "{pageSequenceMasterName}".{{locator}}</message>
+  <message key="noMatchingPageMaster">No simple-page-master matching 
"{pageMasterName}" in page-sequence-master 
"{pageSequenceMasterName}".{{locator}}</message>
+  <message key="nonRestartableContentFlowingToNarrowerPage">Content that 
cannot handle IPD changes is flowing to a narrower page. Part of it may be 
clipped by the page border.</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
 Fri Apr  9 17:22:31 2010
@@ -18,6 +18,6 @@
 <!-- $Id$ -->
 <catalogue xml:lang="en">
   <message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| 
(No context info available)]</message>
-  <message 
key="org.apache.fop.layoutmgr.inline.InlineLevelEventProducer.leaderWithoutContent">fo:leader
 is set to "use-content" but has no content.{{locator}}</message>
-  <message 
key="org.apache.fop.layoutmgr.inline.InlineLevelEventProducer.lineOverflows">Line
 {line} of a paragraph overflows the available area by 
{overflowLength,choice,50000#{overflowLength} millipoints|50000&lt;more than 50 
points}.{{locator}}</message>
+  <message key="leaderWithoutContent">fo:leader is set to "use-content" but 
has no content.{{locator}}</message>
+  <message key="lineOverflows">Line {line} of a paragraph overflows the 
available area by {overflowLength,choice,50000#{overflowLength} 
millipoints|50000&lt;more than 50 points}.{{locator}}</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -17,5 +17,5 @@
 -->
 <!-- $Id$ -->
 <catalogue xml:lang="en">
-  <message key="org.apache.fop.render.RendererEventProducer.ioError">I/O error 
while writing to target file.[ Reason: {ioe}]</message>
+  <message key="ioError">I/O error while writing to target file.[ Reason: 
{ioe}]</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
 Fri Apr  9 17:22:31 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
-  <message 
key="org.apache.fop.render.bitmap.BitmapRendererEventProducer.stoppingAfterFirstPageNoFilename">No
 filename information available. Stopping early after the first page.</message>
-  <message 
key="org.apache.fop.render.bitmap.BitmapRendererEventProducer.stoppingAfterFirstPageNoMultiWriter">Image
 writer does not support multiple images. Only the first page has been 
produced.</message>
-  <message 
key="org.apache.fop.render.bitmap.BitmapRendererEventProducer.noImageWriterFound">Could
 not get an ImageWriter to produce "{mime}". The most likely explanation for 
this is a class loading problem.</message>
+  <message key="stoppingAfterFirstPageNoFilename">No filename information 
available. Stopping early after the first page.</message>
+  <message key="stoppingAfterFirstPageNoMultiWriter">Image writer does not 
support multiple images. Only the first page has been produced.</message>
+  <message key="noImageWriterFound">Could not get an ImageWriter to produce 
"{mime}". The most likely explanation for this is a class loading 
problem.</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.xml 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
-  <message 
key="org.apache.fop.render.pcl.PCLEventProducer.paperTypeUnavailable">Paper 
type ({pageWidth} x {pageHeight} mpt) could not be determined. Falling back to: 
{fallbackPaper}</message>
+  <message key="paperTypeUnavailable">Paper type ({pageWidth} x {pageHeight} 
mpt) could not be determined. Falling back to: {fallbackPaper}</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
-  <message 
key="org.apache.fop.render.pdf.PDFEventProducer.nonFullyResolvedLinkTargets">{count}
 link target{count,equals,1,,s} could not be fully resolved and now 
point{count,equals,1,,s} to the top of the page or {count,equals,1,is,are} 
dysfunctional.</message>
-  <message 
key="org.apache.fop.render.pdf.PDFEventProducer.nonStandardStructureType">‘{type}’
 is not a standard structure type defined by the PDF Reference. Falling back to 
‘{fallback}’.</message>
+  <message key="nonFullyResolvedLinkTargets">{count} link 
target{count,equals,1,,s} could not be fully resolved and now 
point{count,equals,1,,s} to the top of the page or {count,equals,1,is,are} 
dysfunctional.</message>
+  <message key="nonStandardStructureType">‘{type}’ is not a standard 
structure type defined by the PDF Reference. Falling back to 
‘{fallback}’.</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.xml 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
-  <message 
key="org.apache.fop.render.ps.PSEventProducer.postscriptDictionaryParseError">Failed
 to parse dictionary string. Reason: {e}, content = "{content}"</message>
+  <message key="postscriptDictionaryParseError">Failed to parse dictionary 
string. Reason: {e}, content = "{content}"</message>
 </catalogue>

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml 
Fri Apr  9 17:22:31 2010
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue xml:lang="en">
   <message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| 
(No context info available)]</message>
-  <message 
key="org.apache.fop.render.rtf.RTFEventProducer.onlySPMSupported">Only 
simple-page-masters are supported on page-sequences. Using default 
simple-page-master from page-sequence-master 
"{masterReference}".{{locator}}</message>
-  <message key="org.apache.fop.render.rtf.RTFEventProducer.noSPMFound">No 
simple-page-master could be determined.</message>
-  <message 
key="org.apache.fop.render.rtf.RTFEventProducer.explicitTableColumnsRequired">No
 table-columns found on table. RTF output requires that all table-columns for a 
table are defined. Output will be incorrect.{{locator}}</message>
-  <message 
key="org.apache.fop.render.rtf.RTFEventProducer.ignoredDeferredEvent">Ignored 
deferred event for {node} ({start,if,start,end}).{{locator}}</message>
+  <message key="onlySPMSupported">Only simple-page-masters are supported on 
page-sequences. Using default simple-page-master from page-sequence-master 
"{masterReference}".{{locator}}</message>
+  <message key="noSPMFound">No simple-page-master could be 
determined.</message>
+  <message key="explicitTableColumnsRequired">No table-columns found on table. 
RTF output requires that all table-columns for a table are defined. Output will 
be incorrect.{{locator}}</message>
+  <message key="ignoredDeferredEvent">Ignored deferred event for {node} 
({start,if,start,end}).{{locator}}</message>
 </catalogue>

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.xml?rev=932519&r1=932518&r2=932519&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.xml 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.xml Fri 
Apr  9 17:22:31 2010
@@ -17,9 +17,9 @@
 -->
 <!-- $Id$ -->
 <catalogue xml:lang="en">
-  <message key="org.apache.fop.svg.SVGEventProducer.error">SVG error: 
{message}</message>
-  <message key="org.apache.fop.svg.SVGEventProducer.alert">SVG alert: 
{message}</message>
-  <message key="org.apache.fop.svg.SVGEventProducer.info">SVG info: 
{message}</message>
-  <message key="org.apache.fop.svg.SVGEventProducer.svgNotBuilt">SVG graphic 
could not be built. Reason: {e}</message>
-  <message key="org.apache.fop.svg.SVGEventProducer.svgRenderingError">SVG 
graphic could not be rendered. Reason: {e}</message>
+  <message key="error">SVG error: {message}</message>
+  <message key="alert">SVG alert: {message}</message>
+  <message key="info">SVG info: {message}</message>
+  <message key="svgNotBuilt">SVG graphic could not be built. Reason: 
{e}</message>
+  <message key="svgRenderingError">SVG graphic could not be rendered. Reason: 
{e}</message>
 </catalogue>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to