diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-14 23:58:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-17 20:13:22 +0100 |
| commit | 151330152d773fd2bc9e3260d918e25aeb179234 (patch) | |
| tree | f0a9555e42e510e4d1ac1aaeb2004528e474502b /src | |
| parent | d4519ea7898ccb878a297126bbb45c7b65cccd08 (diff) | |
Change the word 'disagree' to 'differ'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 12 | ||||
| -rw-r--r-- | src/verify.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/verify.cc b/src/verify.cc index 9dc87eec..1b476ef2 100644 --- 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 5a120e10..8a049dd5 100644 --- 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 */ |