diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
| commit | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (patch) | |
| tree | 823af8a96f4e0b2a404f5e52eadf4f46e1d10229 /gtk2_ardour/video_server_dialog.cc | |
| parent | f6d29abfc75c460b9e35717f2907e4e61bf38058 (diff) | |
| parent | 08a1409b1f5b5558d2eccc28a3ae4cbd44391812 (diff) | |
merge with master and fix 4 conflicts by hand
Diffstat (limited to 'gtk2_ardour/video_server_dialog.cc')
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index 6d9bb22978..add7ea42de 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -123,8 +123,13 @@ VideoServerDialog::VideoServerDialog (Session* s) else { PBD::warning << string_compose( - _("The external video server 'harvid' can not be found. The tool is included with the %1 releases from ardour.org, " - "alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution."), PROGRAM_NAME) + _("The external video server 'harvid' can not be found.\n" + "The tool is included with the %1 releases from ardour.org, " + "alternatively you can download it from http://x42.github.com/harvid/ " + "or acquire it from your distribution.\n" + "\n" + "see also http://manual.ardour.org/video-timeline/setup/" + ), PROGRAM_NAME) << endmsg; } |