Clarify user interaction preference tooltips. Also rebase branch on master.

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2ba4c50424f47f24562f424e2cedf3a841b7739b..2238033816c7475cf4f143f803e689d03918e442 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -371,7 +371,7 @@ public:
                  _insert_note_button_adjustment (3, 1, 5),
                  _insert_note_button_spin (_insert_note_button_adjustment)
        {
-               const Glib::ustring restart_msg = string_compose (_("\nThis setting will only take effect after your project has been saved and %1 has been restarted."), PROGRAM_NAME);
+               const Glib::ustring restart_msg = _("\nChanges to this setting will only persist after your project has been saved.");
                /* internationalize and prepare for use with combos */
 
                vector<string> dumb;