diff options
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties index 9247036b6543..95e10b9e6746 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties @@ -38,7 +38,7 @@ OPERATION_NOT_SUPPORTED=Operation not supported TEMPLATE_FILE_LOAD_ERROR=Error in loading template file - # -# diff/merge algorithm erro messages +# diff/merge algorithm error messages # EMPTY_NODE_EXCEPTION=Current Node is empty NOT_LEAFNODE_EXCEPTION=Current Node is not a leaf node @@ -48,7 +48,7 @@ NULL_NODE_EXCEPTION=The initial Xmldocument node is null CELL_NODE_EXCEPTION1=Cell node do not have only 1 child <text:p> nodes, will skip the merge of this node.Num of PARA child nodes: CELL_NODE_EXCEPTION2=Cell node have a non Element child nodes - CELL_NODE_EXCEPTION2=There is a child node under an expected empty cell node. -NOT_ELEM_NODE_ERROR=The compared nodes are not a Element Node +NOT_ELEM_NODE_ERROR=The compared nodes are not an Element Node NOT_PARA_NODE_ERROR=The compared nodes are not a Paragraph or Heading node - NOT_NODE_ERROR=The compared nodes are not a Node # |