Change the word 'disagree' to 'differ'.

diff --git a/src/verify.cc b/src/verify.cc
index 9dc87eece0b553dea6004c37035293bac25beb8c..1b476ef2c3be6be58a9f7b2ee092ed933318c41c 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -495,7 +495,7 @@ verify_main_picture_asset (
                case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
                        notes.push_back (
                                VerificationNote(
-                                       VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE, file
+                                       VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER, file
                                        )
                                );
                        break;
@@ -606,7 +606,7 @@ verify_main_sound_asset (
                case VERIFY_ASSET_RESULT_CPL_PKL_DIFFER:
                        notes.push_back (
                                VerificationNote(
-                                       VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE, *asset->file()
+                                       VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER, *asset->file()
                                        )
                                );
                        break;
@@ -845,12 +845,12 @@ dcp::note_to_string (dcp::VerificationNote note)
                return "The picture in a reel has an invalid frame rate.";
        case dcp::VerificationNote::PICTURE_HASH_INCORRECT:
                return dcp::String::compose("The hash of the picture asset %1 does not agree with the PKL file.", note.file()->filename());
-       case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE:
-               return dcp::String::compose("The PKL and CPL hashes disagree for the picture asset %1.", note.file()->filename());
+       case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER:
+               return dcp::String::compose("The PKL and CPL hashes differ for the picture asset %1.", note.file()->filename());
        case dcp::VerificationNote::SOUND_HASH_INCORRECT:
                return dcp::String::compose("The hash of the sound asset %1 does not agree with the PKL file.", note.file()->filename());
-       case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE:
-               return dcp::String::compose("The PKL and CPL hashes disagree for the sound asset %1.", note.file()->filename());
+       case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER:
+               return dcp::String::compose("The PKL and CPL hashes differ for the sound asset %1.", note.file()->filename());
        case dcp::VerificationNote::EMPTY_ASSET_PATH:
                return "The asset map contains an empty asset path.";
        case dcp::VerificationNote::MISSING_ASSET:

diff --git a/src/verify.h b/src/verify.h
index 5a120e1000c743ec9548d7c6093b3bbeaf6a76fc..8a049dd5ec16771ae5e554549371e9f41b6a5708 100644 (file)
--- a/src/verify.h
+++ b/src/verify.h
@@ -65,11 +65,11 @@ public:
                /** The hash of a main picture asset does not agree with the PKL file.  file contains the picture asset filename. */
                PICTURE_HASH_INCORRECT,
                /** The hash of a main picture is different in the CPL and PKL */
-               PKL_CPL_PICTURE_HASHES_DISAGREE,
+               PKL_CPL_PICTURE_HASHES_DIFFER,
                /** The hash of a main sound asset does not agree with the PKL file.  file contains the sound asset filename. */
                SOUND_HASH_INCORRECT,
                /** The hash of a main sound is different in the CPL and PKL */
-               PKL_CPL_SOUND_HASHES_DISAGREE,
+               PKL_CPL_SOUND_HASHES_DIFFER,
                /** An assetmap's <Path> entry is empty */
                EMPTY_ASSET_PATH,
                /** A file mentioned in an asset map cannot be found */

diff --git a/test/verify_test.cc b/test/verify_test.cc
index 1fc66dcd5b98e4cf994496941ca21acf214dce12..24d583b6d7c633ded7d9e238bdd45ff14806657c 100644 (file)
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -244,10 +244,10 @@ BOOST_AUTO_TEST_CASE (verify_test3)
        BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT);
        ++i;
        BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE);
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER);
        ++i;
        BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
-       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE);
+       BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER);
        ++i;
        BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
        BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);