Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Fixed typo in XML file.

Fixed typo in XML file.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-30T15-40-37.894Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2013-01-30T15-40-37.894Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~paul-lucas/zorba/pjl-misc]

11056. By Paul J. Lucas on 2013-01-30

Forgot to commit generated file.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-30T16-46-40.37Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-01-30T16-46-40.37Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2013-01-24 04:23:25 +0000
+++ src/diagnostics/diagnostic_en.xml	2013-01-30 16:45:32 +0000
@@ -1649,7 +1649,7 @@
        It is a dynamic error if a function that was declared to be both \c
        external and \c updating returns a non-empty data model instance.
       </comment>
-      <value>"$1": function declated external, updating returns non-empty data model instance</value>
+      <value>"$1": function declared external, updating returns non-empty data model instance</value>
     </diagnostic>
 
     <diagnostic code="XUDY0021">
@@ -4854,7 +4854,7 @@
     </entry>
 
     <entry key="libxml_ERR_533"> <!-- XML_DTD_UNKNOWN_ATTRIBUTE -->
-      <value>"$6?6:{xmlns}": attribute not declated for element "$6?6:5"</value>
+      <value>"$6?5:{xmlns}": attribute not declared for element "$6?6:5"</value>
     </entry>
 
     <entry key="libxml_ERR_534"> <!-- XML_DTD_UNKNOWN_ELEM -->

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2013-01-23 17:24:44 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2013-01-30 16:45:32 +0000
@@ -275,7 +275,7 @@
   { "XUDY0016", "node is target of multiple \"replace\" expressions (without \"value of\") in same query" },
   { "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" },
   { "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" },
-  { "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" },
+  { "XUDY0019", "\"$1\": function declared external, updating returns non-empty data model instance" },
   { "XUDY0021", "$1${ 2}" },
   { "XUDY0023", "\"$1\": qname causes namespace binding conflict: prefix $2 cannot be bound to both $3 and $4" },
   { "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" },
@@ -1057,7 +1057,7 @@
   { "~libxml_ERR_530", "\"$5\" on \"$6\" value has to be normalized based on external subset declaration" },
   { "~libxml_ERR_531", "\"$5\"/\"$6\": root/DTD name mismatch" },
   { "~libxml_ERR_532", "\"$5\": element declared in external subset contains whitespace nodes" },
-  { "~libxml_ERR_533", "\"$6?6:{xmlns}\": attribute not declated for element \"$6?6:5\"" },
+  { "~libxml_ERR_533", "\"$6?5:{xmlns}\": attribute not declared for element \"$6?6:5\"" },
   { "~libxml_ERR_534", "\"$6?6:5\": undeclared element$6?{ for attribute \"5\"}" },
   { "~libxml_ERR_535", "$5?{\"6\": unknown entity referenced by attribute \"5\"}:{unknown entity type}" },
   { "~libxml_ERR_536", "\"$5\": attribute references an unknown ID \"$6\"${ on line 8}\"" },