From 8c2b13948945d70225fda7d68d32aa6537977744 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 5 Sep 2015 08:12:43 +0200 Subject: [PATCH] merge: use proper singular/plural versions for error message for #1420 --- src/output/p_ac3.cpp | 3 ++- src/output/p_mp3.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/output/p_ac3.cpp b/src/output/p_ac3.cpp index 719a72d6a..b3871a705 100644 --- a/src/output/p_ac3.cpp +++ b/src/output/p_ac3.cpp @@ -76,7 +76,8 @@ ac3_packetizer_c::get_frame() { m_packet_extensions.push_back(std::make_shared([this, bytes](packet_cptr const &packet, int64_t timecode_offset) { mxwarn_tid(m_ti.m_fname, m_ti.m_id, boost::format("%1% %2%\n") - % (boost::format(Y("This audio track contains %1% bytes of invalid data which were skipped before timecode %2%.")) % bytes % format_timecode(packet->assigned_timecode - timecode_offset)) + % (boost::format(NY("This audio track contains %1% byte of invalid data which was skipped before timecode %2%.", + "This audio track contains %1% bytes of invalid data which were skipped before timecode %2%.", bytes)) % bytes % format_timecode(packet->assigned_timecode - timecode_offset)) % Y("The audio/video synchronization may have been lost.")); })); } diff --git a/src/output/p_mp3.cpp b/src/output/p_mp3.cpp index 2adccd713..afd993a2f 100644 --- a/src/output/p_mp3.cpp +++ b/src/output/p_mp3.cpp @@ -67,7 +67,8 @@ mp3_packetizer_c::handle_garbage(int64_t bytes) { m_packet_extensions.push_back(std::make_shared([this, bytes](packet_cptr const &packet, int64_t timecode_offset) { mxwarn_tid(m_ti.m_fname, m_ti.m_id, boost::format("%1% %2%\n") - % (boost::format(Y("This audio track contains %1% bytes of invalid data which were skipped before timecode %2%.")) % bytes % format_timecode(packet->assigned_timecode - timecode_offset)) + % (boost::format(NY("This audio track contains %1% byte of invalid data which was skipped before timecode %2%.", + "This audio track contains %1% bytes of invalid data which were skipped before timecode %2%.", bytes)) % bytes % format_timecode(packet->assigned_timecode - timecode_offset)) % Y("The audio/video synchronization may have been lost.")); })); }