summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2019-08-19 21:44:49 +0200
committerJulien Nabet <serval2412@yahoo.fr>2019-08-20 08:56:23 +0200
commit4b317a704268ba03700c50255dd6fded278c81ba (patch)
tree059d7af7307c48e36742f9c12a3d6bbc57c7d861 /xmerge
parent686b3b5bfc8caac0d5db7c9845fafd32250281e2 (diff)
Fix typos
Change-Id: I62577ca57b90d6575bfcf722ac2487e057a95715 Reviewed-on: https://gerrit.libreoffice.org/77767 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties4
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
#