smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Merging from GIT

Browse source 
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
This commit is contained in:
Grygorii Zharun 2014-04-18 04:21:54 -05:00
parent 0046ee6488
commit ce2a519afa
103 changed files with 2160 additions and 915 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/actions.cc
View file

@ -85,15 +85,15 @@ ActionManager::load_menus (const string& menus_file)
info << string_compose (_("Loading menus from %1"), ui_file) << endmsg;
loaded = true;
} catch (Glib::MarkupError& err) {
error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg;
cerr << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endl;
error << string_compose (_("badly formatted menu definition file: %1"), err.what()) << endmsg;
cerr << string_compose (_("badly formatted menu definition file: %1"), err.what()) << endl;
} catch (...) {
error << string_compose (_("%1 menu definition file not found"), PROGRAM_NAME) << endmsg;
}
if (!loaded) {
cerr << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endl;
error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg;
cerr << string_compose (_("%1 will not work without a valid menu definition file"), PROGRAM_NAME) << endl;
error << string_compose (_("%1 will not work without a valid menu definition file"), PROGRAM_NAME) << endmsg;
exit(1);
}
}