13
0

vtl: replace Ardour with Program-Name in messages

This commit is contained in:
Robin Gareus 2013-07-25 14:19:28 +02:00
parent 953e4aba54
commit d7a52dc0fe

View File

@ -502,14 +502,18 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
_session->config.set_timecode_format(timecode_60); _session->config.set_timecode_format(timecode_60);
break; break;
default: default:
warning << _("Failed to set session-framerate: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */ warning << string_compose (
_("Failed to set session-framerate: '%1' does not have a corresponding option setting in %2."),
video_file_fps, PROGRAM_NAME ) << endmsg;
break; break;
} }
_session->config.set_video_pullup(0); /* TODO only set if set_timecode_format() was successful ?!*/ _session->config.set_video_pullup(0); /* TODO only set if set_timecode_format() was successful ?!*/
} }
if (floor(video_file_fps*100) != floor(_session->timecode_frames_per_second()*100)) { if (floor(video_file_fps*100) != floor(_session->timecode_frames_per_second()*100)) {
warning << _("Video file's framerate is not equal to Ardour session timecode's framerate: ") warning << string_compose(
<< video_file_fps << _(" vs ") << _session->timecode_frames_per_second() << endmsg; _("Video file's framerate is not equal to %1 session timecode's framerate: '%2' vs '%3'"),
PROGRAM_NAME, video_file_fps, _session->timecode_frames_per_second())
<< endmsg;
} }
flush_local_cache (); flush_local_cache ();
@ -580,8 +584,8 @@ VideoTimeLine::check_server_docroot ()
|| lines.at(0).empty() || lines.at(0).empty()
|| lines.at(0).at(0) != video_get_docroot(Config)) { || lines.at(0).at(0) != video_get_docroot(Config)) {
warning << string_compose( warning << string_compose(
_("Video-server docroot mismatch. Ardour: '%1', video-server: '%2'. This usually means that the video server was not started by ardour and uses a different document-root."), _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by ardour and uses a different document-root."),
video_get_docroot(Config), lines.at(0).at(0)) PROGRAM_NAME, video_get_docroot(Config), lines.at(0).at(0))
<< endmsg; << endmsg;
ok = false; // TODO allow to override ok = false; // TODO allow to override
} }