diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
| commit | 6a436fd826d1c9d88b60287696cc0836ccce35aa (patch) | |
| tree | 460a08b4d46359b6b168ece26f592c75fc2fe41f /gtk2_ardour/video_server_dialog.cc | |
| parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
| parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) | |
fix merge conflict from master
Diffstat (limited to 'gtk2_ardour/video_server_dialog.cc')
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index 468bcc5c8d..ce0633b6c3 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -95,8 +95,10 @@ VideoServerDialog::VideoServerDialog (Session* s) } else { PBD::warning << - _("The external video server 'harvid' can not be found. The tool is included with the Ardour releases from ardour.org, " - "alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution.") << endmsg; + 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) + << endmsg; } @@ -137,7 +139,9 @@ VideoServerDialog::VideoServerDialog (Session* s) t->attach (*l, 0, 1, 2, 3, FILL); t->attach (cachesize_spinner, 1, 2, 2, 3); - l = manage (new Label (_("Ardour relies on an external Video Server for the videotimeline.\nThe server configured in Edit -> Prefereces -> Video is not reachable.\nDo you want ardour to launch 'harvid' on this machine?"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l = manage (new Label (string_compose( + _("%1 relies on an external Video Server for the videotimeline.\nThe server configured in Edit -> Prefereces -> Video is not reachable.\nDo you want ardour to launch 'harvid' on this machine?"), PROGRAM_NAME) + , Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l->set_max_width_chars(80); l->set_line_wrap(); vbox->pack_start (*l, true, true, 4); |