Merge branch 'compose-to-fmt-take2'

This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index cd792c0b7..80f2eb0bf 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -222,9 +222,9 @@ DCPDecoder::pass ()
 					);
 				}
 			} catch (dcp::MPEG2DecompressionError& e) {
-				LOG_ERROR("Failed to decompress MPEG video frame %1 (%2)", entry_point + frame, e.what());
+				LOG_ERROR("Failed to decompress MPEG video frame {} ({})", entry_point + frame, e.what());
 			} catch (dcp::ReadError& e) {
-				LOG_ERROR("Failed to read MPEG2 video frame %1 (%2)", entry_point + frame, e.what());
+				LOG_ERROR("Failed to read MPEG2 video frame {} ({})", entry_point + frame, e.what());
 			}
 		}
 	}