MERGE of https://svn.apache.org/repos/asf/xmlgraphics/fop/{branches/AFP_GOCAResources...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@721430 13f79535-47bb-0310-9956-ffa450edef68

diff --cc src/java/org/apache/fop/events/EventFormatter.xml
index 1c8c35b0b924706f68816910f83fcd557c3d5e0a,be8f028dcd536b827562c6e5ccd0f02f5bce0ddb..9bd30609f922e07e649f4180b87ccbda2e71f7aa
--- 1/src/java/org/apache/fop/events/EventFormatter.xml
--- 2/src/java/org/apache/fop/events/EventFormatter.xml
+++ b/src/java/org/apache/fop/events/EventFormatter.xml
@@@ -102,4 -103,4 +103,7 @@@ Any reference to it will be considered 
    <message key="org.apache.fop.fonts.FontEventAdapter.fontSubstituted">Font "{requested}" not found. Substituting with "{effective}".</message>
    <message key="org.apache.fop.fonts.FontEventAdapter.fontLoadingErrorAtAutoDetection">Unable to load font file: {fontURL}.[ Reason: {e}]</message>
    <message key="org.apache.fop.fonts.FontEventAdapter.glyphNotAvailable">Glyph "{ch}" (0x{ch,hex}[, {ch,glyph-name}]) not available in font "{fontName}".</message>
++<message key="org.apache.fop.afp.AFPEventProducer.warnDefaultFontSetup"/>
++<message key="org.apache.fop.afp.AFPEventProducer.warnMissingDefaultFont"/>
++<message key="org.apache.fop.afp.AFPEventProducer.characterSetEncodingError"/>
  </catalogue>