option to enable/disable translations when using a bundled (OS X) version of Ardour; compile-time control of Ardour program name for gtk2_ardour (libardour to follow)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6755 d708f5d6-7413-0410-9779-e7cbd77b26cf

27 files changed, 131 insertions, 76 deletions

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 3db55b60d5..09178646f5 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -81,7 +81,7 @@ ActionManager::init ()
 		error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg;
 		cerr << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endl;
 	} catch (...) {
-		error << _("Ardour menu definition file not found") << endmsg;
+		error << string_compose (_("%1 menu definition file not found"), PROGRAM_NAME) << endmsg;
 	}
 
 	if (!loaded) {
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index dd153ccc76..0185e46196 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -67,7 +67,7 @@ AddRouteDialog::AddRouteDialog ()
 	}
 	
 	set_name ("AddRouteDialog");
-	set_wmclass (X_("ardour_add_track_bus"), "Ardour");
+	set_wmclass (X_("ardour_add_track_bus"), PROGRAM_NAME);
 	set_position (Gtk::WIN_POS_MOUSE);
 	set_resizable (false);
 
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 8edb8b27fa..3f10527a38 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -573,6 +573,7 @@
 	             <menuitem action='NameNewMarkers'/>
                	     <menuitem action='RubberbandingSnapsToGrid'/>
                	     <menuitem action='AutoAnalyseAudio'/>
+               	     <menuitem action='EnableTranslation'/>
          </menu>
 	</menu>
          
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b8520b2f8e..a206160710 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -107,7 +107,7 @@ sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-	: Gtkmm2ext::UI (X_("Ardour"), argcp, argvp),
+	: Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp),
 
 	  primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
 	  secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),
@@ -258,7 +258,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 		RouteTimeAxisView::setup_slider_pix ();
 
 	} catch (failed_constructor& err) {
-		error << _("could not initialize Ardour.") << endmsg;
+		error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
 		// pass it on up
 		throw;
 	} 
@@ -591,9 +591,9 @@ ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
 {
 	string title;
 	if (we_set_params) {
-		title = _("Ardour could not start JACK");
+		title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
 	} else {
-		title = _("Ardour could not connect to JACK.");
+		title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
 	}
 
 	MessageDialog win (title,
@@ -657,7 +657,7 @@ ARDOUR_UI::startup ()
 		return;
 	}
 	
-	BootMessage (_("Ardour is ready for use"));
+	BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
 	show ();
 }
 
@@ -699,12 +699,12 @@ ARDOUR_UI::check_memory_locking ()
 			if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
 			
 
-				MessageDialog msg (_("WARNING: Your system has a limit for maximum amount of locked memory. "
-						     "This might cause Ardour to run out of memory before your system "
-						     "runs out of memory. \n\n"
-						     "You can view the memory limit with 'ulimit -l', "
-						     "and it is normally controlled by /etc/security/limits.conf"));
-				
+				MessageDialog msg (string_compose (_("WARNING: Your system has a limit for maximum amount of locked memory. "
+								     "This might cause %1 to run out of memory before your system "
+								     "runs out of memory. \n\n"
+								     "You can view the memory limit with 'ulimit -l', "
+								     "and it is normally controlled by /etc/security/limits.conf"), PROGRAM_NAME));
+						   
 				VBox* vbox = msg.get_vbox();
 				HBox hbox;
 				CheckButton cb (_("Do not show this window again"));
@@ -1176,8 +1176,8 @@ ARDOUR_UI::check_audioengine ()
 {
 	if (engine) {
 		if (!engine->connected()) {
-			MessageDialog msg (_("Ardour is not connected to JACK\n"
-					     "You cannot open or close sessions in this condition"));
+			MessageDialog msg (string_compose (_("%1 is not connected to JACK\n"
+							     "You cannot open or close sessions in this condition"), PROGRAM_NAME));
 			pop_back_splash ();
 			msg.set_position (WIN_POS_CENTER);
 			msg.run ();
@@ -2151,11 +2151,11 @@ ARDOUR_UI::fontconfig_dialog ()
 	
 	if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
 		MessageDialog msg (*new_session_dialog,
-				   _("Welcome to Ardour.\n\n"
-				     "The program will take a bit longer to start up\n"
-				     "while the system fonts are checked.\n\n"
-				     "This will only be done once, and you will\n"
-				     "not see this message again\n"),
+				   string_compose (_("Welcome to %1.\n\n"
+						     "The program will take a bit longer to start up\n"
+						     "while the system fonts are checked.\n\n"
+						     "This will only be done once, and you will\n"
+						     "not see this message again\n"), PROGRAM_NAME),
 				   true,
 				   Gtk::MESSAGE_INFO,
 				   Gtk::BUTTONS_OK);
@@ -2250,7 +2250,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 	
 	msg.set_name (X_("CleanupDialog"));
 	msg.set_title (_("Cleanup Unused Sources"));
-	msg.set_wmclass (X_("existing_session"), "Ardour");
+	msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
 	msg.set_position (Gtk::WIN_POS_MOUSE);
 	pop_back_splash ();
 
@@ -2644,7 +2644,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 		goto out;
 	}
 
-	loading_message (_("Please wait while Ardour loads your session"));
+	loading_message (string_compose (_("Please wait while %1 loads your session"), PROGRAM_NAME));
 
 	try {
 		new_session = new Session (*engine, path, snap_name, mix_template);
@@ -2995,7 +2995,7 @@ After cleanup, unused audio files will be moved to a \
 	checker.set_default_response (RESPONSE_CANCEL);
 
 	checker.set_name (_("CleanupDialog"));
-	checker.set_wmclass (X_("ardour_cleanup"), "Ardour");
+	checker.set_wmclass (X_("ardour_cleanup"), PROGRAM_NAME);
 	checker.set_position (Gtk::WIN_POS_MOUSE);
 
 	switch (checker.run()) {
@@ -3305,7 +3305,7 @@ ARDOUR_UI::write_buffer_stats ()
 
 	fout.close ();
 
-	cerr << "Ardour buffering statistics can be found in: " << path << endl;
+	cerr << "buffering statistics can be found in: " << path << endl;
 }
 
 void
@@ -3714,3 +3714,40 @@ ARDOUR_UI::setup_profile ()
 	}
 }
 
+
+void
+ARDOUR_UI::toggle_translations ()
+{
+	using namespace Glib;
+
+	RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("EnableTranslation"));
+	if (act) {
+		RefPtr<ToggleAction> ract = RefPtr<ToggleAction>::cast_dynamic (act);
+		if (ract) {
+
+			string i18n_killer = ARDOUR::translation_kill_path();
+			
+			bool already_enabled = !ARDOUR::translations_are_disabled ();
+
+			if (ract->get_active ()) {
+				/* we don't care about errors */
+				int fd = ::open (i18n_killer.c_str(), O_RDONLY|O_CREAT, 0644);
+				close (fd);
+			} else {
+				/* we don't care about errors */
+				unlink (i18n_killer.c_str());
+			}
+
+			if (already_enabled != ract->get_active()) {
+				MessageDialog win (already_enabled ? _("Translations disabled") : _("Translations enabled"),
+						   false,
+						   Gtk::MESSAGE_WARNING,
+						   Gtk::BUTTONS_OK);
+				win.set_secondary_text (string_compose (_("You must restart %1 for this to take effect."), PROGRAM_NAME));
+				win.set_position (Gtk::WIN_POS_CENTER);
+				win.present ();
+				win.run ();
+			}
+		}
+	}
+}
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 8342ee747a..b2f125ed46 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -777,6 +777,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void platform_specific ();
 	void platform_setup ();
 	void fontconfig_dialog ();
+	void toggle_translations ();
 
 	/* these are used only in response to a platform-specific "ShouldQuit" signal
 	 */
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index ac6f3e7413..7e95984060 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -264,7 +264,7 @@ ARDOUR_UI::setup_transport ()
 	ARDOUR_UI::instance()->tooltips().set_tip (punch_out_button, _("Stop recording at auto-punch end"));
 	ARDOUR_UI::instance()->tooltips().set_tip (click_button, _("Enable/Disable audio click"));
 	ARDOUR_UI::instance()->tooltips().set_tip (sync_option_combo, _("Positional sync source"));
-	ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, _("Does Ardour control the time?"));
+	ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME));
 	ARDOUR_UI::instance()->tooltips().set_tip (shuttle_box, _("Shuttle speed control"));
 	ARDOUR_UI::instance()->tooltips().set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display"));
 	ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed"));
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 643352d4fb..e5da29339d 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -575,7 +575,7 @@ ARDOUR_UI::install_actions ()
 	if (!engine->can_request_hardware_monitoring()) {
 		act->set_sensitive (false);
 	}
-	act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), _("Ardour does monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring));
+	act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), string_compose (_("%1 does monitoring"), PROGRAM_NAME).c_str(), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring));
 	act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseExternalMonitoring"), _("Audio Hardware does monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring));
 
 	RadioAction::Group solo_group;
@@ -613,6 +613,15 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_toggle_action (option_actions, X_("AutoRebinding"), _("Auto Rebind Controls"), mem_fun (*(this->mixer), &Mixer_UI::toggle_auto_rebinding));
 	ActionManager::session_sensitive_actions.push_back (act);
 
+	if (getenv ("ARDOUR_BUNDLED")) {
+		act = ActionManager::register_toggle_action (main_actions, X_("EnableTranslation"), _("Enable Translations"), mem_fun (*this, &ARDOUR_UI::toggle_translations));
+		if (act) {
+			RefPtr<ToggleAction> ract = RefPtr<ToggleAction>::cast_dynamic (act);
+			if (ract) {
+				ract->set_active (!ARDOUR::translations_are_disabled());
+			}
+		}
+	}
 
 	ActionManager::add_action_group (shuttle_actions);
 	ActionManager::add_action_group (option_actions);
diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index 3036eb0ab6..072008e9a1 100644
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -73,6 +73,8 @@ cocoa_open_url (const char* uri)
 void
 set_language_preference ()
 {
+	gtk_disable_setlocale ();
+
 	if (g_getenv ("LANGUAGE") || g_getenv ("LC_ALL") || g_getenv ("LANG")) {
 		return;
 	}
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 124b650ee3..f4e18c69c4 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -96,7 +96,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
 	  select_in_button (_("Fade In")),
 	  select_out_button (_("Fade Out"))
 {
-	set_wmclass (X_("ardour_automationedit"), "Ardour");
+	set_wmclass (X_("ardour_automationedit"), PROGRAM_NAME);
 	set_name ("CrossfadeEditWindow");
 	set_position (Gtk::WIN_POS_MOUSE);
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index c78ea9540e..525ab9c7e6 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -824,7 +824,7 @@ Editor::Editor ()
 	WindowTitle title(Glib::get_application_name());
 	title += _("Editor");
 	set_title (title.get_string());
-	set_wmclass (X_("ardour_editor"), "Ardour");
+	set_wmclass (X_("ardour_editor"), PROGRAM_NAME);
 
 	add (vpacker);
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
@@ -4924,7 +4924,7 @@ Editor::first_idle ()
 
 	if (track_views.size() > 1) { 
 		dialog = new MessageDialog (*this, 
-					    _("Please wait while Ardour loads visual data"),
+					    string_compose (_("Please wait while %1 loads visual data"), PROGRAM_NAME),
 					    true,
 					    Gtk::MESSAGE_INFO,
 					    Gtk::BUTTONS_NONE);
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index f1d23c7cdb..edec6c16d1 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -956,7 +956,7 @@ EngineControl::find_jack_servers (vector<string>& strings)
 	if (getenv ("ARDOUR_WITH_JACK")) {
 		/* no other options - only use the JACK we supply */
 		if (strings.empty()) {
-			fatal << _("JACK appears to be missing from the Ardour bundle") << endmsg;
+			fatal << string_compose (_("JACK appears to be missing from the %1 bundle"), PROGRAM_NAME) << endmsg;
 			/*NOTREACHED*/
 		}
 		return;
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 861a1d3270..9029371f0d 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -122,7 +122,7 @@ ExportDialog::ExportDialog(PublicEditor& e)
 	export_cd_markers_allowed = true;
 
 	set_title (_("Export"));
-	set_wmclass (X_("ardour_export"), "Ardour");
+	set_wmclass (X_("ardour_export"), PROGRAM_NAME);
 	set_name ("ExportWindow");
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
 	
@@ -1060,7 +1060,7 @@ ExportDialog::do_export ()
 				   true,
 				   MESSAGE_ERROR,
 				   BUTTONS_OK);
-		msg.set_secondary_text (_("Ardour cannot export audio when disconnected"));
+		msg.set_secondary_text (string_compose (_("%1 cannot export audio when disconnected"), PROGRAM_NAME));
 		msg.present ();
 		msg.run ();
 		return;
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index a0d4b1f788..28f6c78668 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -563,7 +563,7 @@ Keyboard::setup_keybindings ()
 			if (path.empty()) {
 				
 				if (keybindings_path == default_bindings) {
-					error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+					error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
 					return;
 				} else {
 					warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), 
@@ -587,7 +587,7 @@ Keyboard::setup_keybindings ()
 
 			if (!Glib::file_test (keybindings_path, Glib::FILE_TEST_EXISTS)) {
 				if (keybindings_path == default_bindings) {
-					error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+					error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
 					return;
 				} else {
 					warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), 
@@ -629,7 +629,7 @@ Keyboard::load_keybindings (string path)
 
 
 	} catch (...) {
-		error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), path)
+		error << string_compose (_("%1 key bindings file not found at \"%2\" or contains errors."), PROGRAM_NAME, path)
 		      << endmsg;
 		return false;
 	}
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 0d3a8ea9ff..5e12f1ce6d 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -627,7 +627,7 @@ LocationUI::LocationUI ()
 	
 	set_title(_("Locations"));
 	
-	set_wmclass(X_("ardour_locations"), "Ardour");
+	set_wmclass(X_("ardour_locations"), PROGRAM_NAME);
 
 	set_name ("LocationWindow");
 
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index dc615d5bc2..1963fee62b 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -178,11 +178,14 @@ fixup_bundle_environment ()
 
 	setenv ("GTK_PATH", path.c_str(), 1);
 
-	path = dir_path;
-	path += "/../Resources/locale";
-	
-	localedir = strdup (path.c_str());
-	setenv ("GTK_LOCALEDIR", localedir, 1);
+	if (!ARDOUR::translations_are_disabled ()) {
+
+		path = dir_path;
+		path += "/../Resources/locale";
+		
+		localedir = strdup (path.c_str());
+		setenv ("GTK_LOCALEDIR", localedir, 1);
+	}
 
 	/* write a pango.rc file and tell pango to use it. we'd love
 	   to put this into the Ardour.app bundle and leave it there,
@@ -253,12 +256,12 @@ tell_about_jack_death (void* /* ignored */)
 		/* died during startup */
 		MessageDialog msg (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK);
 		msg.set_position (Gtk::WIN_POS_CENTER);
-		msg.set_secondary_text (_(
-"JACK exited unexpectedly, and without notifying Ardour.\n\
+		msg.set_secondary_text (string_compose (_(
+"JACK exited unexpectedly, and without notifying %1.\n\
 \n\
 This could be due to misconfiguration or to an error inside JACK.\n\
 \n\
-Click OK to exit Ardour."));
+Click OK to exit %1."), PROGRAM_NAME));
     
 		msg.run ();
 		_exit (0);
@@ -268,12 +271,12 @@ Click OK to exit Ardour."));
 		/* engine has already run, so this is a mid-session JACK death */
 		
 		MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE));
-		msg->set_secondary_text (_(
-"JACK exited unexpectedly, and without notifying Ardour.\n\
+		msg->set_secondary_text (string_compose (_(
+"JACK exited unexpectedly, and without notifying %1.\n\
 \n\
 This is probably due to an error inside JACK. You should restart JACK\n\
-and reconnect Ardour to it, or exit Ardour now. You cannot save your\n\
-session at this time, because we would lose your connection information.\n"));
+and reconnect %1 to it, or exit %1 now. You cannot save your\n\
+session at this time, because we would lose your connection information.\n"), PROGRAM_NAME));
 		msg->present ();
 	}
 	return false; /* do not call again */
@@ -350,7 +353,7 @@ int main (int argc, char* argv[])
 		return curvetest (curvetest_file);
 	}
 	
-	cout << _("Ardour/GTK ") 
+	cout << PROGRAM_NAME << ' '
 	     << VERSIONSTRING
 	     << _("\n   (built using ")
 	     << svn_revision
@@ -368,7 +371,7 @@ int main (int argc, char* argv[])
 		cerr << _("Copyright (C) 1999-2008 Paul Davis") << endl
 		     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
 		     << endl
-		     << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl
+		     << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
 		     <<	_("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
 		     << _("This is free software, and you are welcome to redistribute it ") << endl
 		     << _("under certain conditions; see the source for copying conditions.")
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 59bba9aea0..3ae1c315cd 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -214,7 +214,7 @@ Mixer_UI::Mixer_UI ()
 	title += _("Mixer");
 	set_title (title.get_string());
 
-	set_wmclass (X_("ardour_mixer"), "Ardour");
+	set_wmclass (X_("ardour_mixer"), PROGRAM_NAME);
 
 	add_accel_group (ActionManager::ui_manager->get_accel_group());
 
diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index 301dc2036a..7d17ed98f7 100644
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -12,7 +12,7 @@ using namespace Glib;
 using namespace Gtk;
 
 NagScreen::NagScreen (std::string context, bool maybe_sub)
-	: ArdourDialog (_("Support Ardour Development"), true)
+	: ArdourDialog (string_compose (_("Support %1 Development"), PROGRAM_NAME), true)
 	, donate_button (button_group, _("I'd like to make a one-time donation"))
 	, subscribe_button (button_group, _("Tell me more about becoming a subscriber"))
 	, existing_button (button_group, _("I'm already a subscriber!"))
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 53119ea968..d858791791 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -124,7 +124,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui)
 	set_title(_("Preferences"));
 
 	set_default_size (300, 300);
-	set_wmclass (X_("ardour_preferences"), "Ardour");
+	set_wmclass (X_("ardour_preferences"), PROGRAM_NAME);
 
 	set_name ("Preferences");
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 2814f126bd..a6c90495a4 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -54,7 +54,7 @@ print_help (const char *execname)
 	     << _("  -c, --name  name                 Use a specific jack client name, default is ardour\n")
 	     << _("  -d, --disable-plugins            Disable all plugins in an existing session\n")
 	     << _("  -n, --show-splash                Show splash screen\n")
-	     << _("  -m, --menus file                 Use \"file\" for Ardour menus\n")                       
+	     << _("  -m, --menus file                 Use \"file\" for menus\n")                       
 	     << _("  -N, --new session-name           Create a new session from the command line\n")
 	     << _("  -O, --no-hw-optimizations        Disable h/w specific optimizations\n")
 	     << _("  -S, --sync	                      Draw the gui synchronously \n")
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 233774dba2..7cdd132d8a 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -112,7 +112,7 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert
 		_pluginui = pu;
 		add (*pu);
 		
-		set_wmclass (X_("ardour_plugin_editor"), "Ardour");
+		set_wmclass (X_("ardour_plugin_editor"), PROGRAM_NAME);
 
 		signal_map_event().connect (mem_fun (*pu, &GenericPluginUI::start_updating));
 		signal_unmap_event().connect (mem_fun (*pu, &GenericPluginUI::stop_updating));
@@ -372,7 +372,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
 	
 	focus_button.add (*focus_out_image);
 
-	ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow the plugin to receive keyboard events that Ardour would normally use as a shortcut"), "");
+	ARDOUR_UI::instance()->set_tip (&focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME).c_str(), "");
 	ARDOUR_UI::instance()->set_tip (&bypass_button, _("Click to enable/disable this plugin"), "");
 
 	insert->GoingAway.connect (mem_fun (*this, &PlugUIBase::plugin_going_away));
@@ -465,13 +465,13 @@ PlugUIBase::focus_toggled (GdkEventButton* ev)
 		focus_button.remove ();
 		focus_button.add (*focus_out_image);
 		focus_out_image->show ();
-		ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow the plugin to receive keyboard events that Ardour would normally use as a shortcut"), "");
+		ARDOUR_UI::instance()->set_tip (&focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME).c_str(), "");
 	} else {
 		Keyboard::the_keyboard().magic_widget_grab_focus();
 		focus_button.remove ();
 		focus_button.add (*focus_in_image);
 		focus_in_image->show ();
-		ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow normal use of Ardour keyboard shortcuts"), "");
+		ARDOUR_UI::instance()->set_tip (&focus_button, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME).c_str(), "");
 	}
 
 	return true;
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 1b7f868926..a2cb6488c2 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -456,11 +456,11 @@ RedirectBox::weird_plugin_dialog (Plugin& p, uint32_t streams, boost::shared_ptr
 "only %3 active signal streams.\n"
 "\n"
 "This makes no sense - unless the plugin supports\n"
-"side-chain inputs. A future version of Ardour will\n"
+"side-chain inputs. A future version of %4 will\n"
 "support this type of configuration."),
 					 p.name(),
 					 p.get_info()->n_inputs,
-					 streams));
+					 streams, PROGRAM_NAME));
 	} else {
 		label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
@@ -471,13 +471,13 @@ RedirectBox::weird_plugin_dialog (Plugin& p, uint32_t streams, boost::shared_ptr
 "The track/bus has %4 inputs and %5 outputs.\n"
 "The insertion point, has %6 active signals.\n"
 "\n"
-"Ardour does not understand what to do in such situations.\n"),
+"%7 does not understand what to do in such situations.\n"),
 					 p.name(),
 					 p.get_info()->n_inputs,
 					 p.get_info()->n_outputs,
 					 io->n_inputs(),
 					 io->n_outputs(),
-					 streams));
+					 streams, PROGRAM_NAME));
 	}
 
 	dialog.set_border_width (PublicEditor::window_border_width);
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 10273b274c..6974d3a74b 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -137,7 +137,7 @@ RouteParams_UI::RouteParams_UI ()
 	
 	set_name ("RouteParamsWindow");
 	set_default_size (620,370);
-	set_wmclass (X_("ardour_route_parameters"), "Ardour");
+	set_wmclass (X_("ardour_route_parameters"), PROGRAM_NAME);
 
 	set_title (_("Track/Bus Inspector"));
 
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 939d3bba74..bb1069be9d 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -26,6 +26,8 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 
@@ -113,7 +115,7 @@ SendUI::fast_update ()
 }
 	
 SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
-	: ArdourDialog (string("Ardour: send ") + s->name())
+	: ArdourDialog (string_compose (_("%1: send "), PROGRAM_NAME) + s->name())
 {
 	ui = new SendUI (s, ss);
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 4a4548a734..c83f1c552e 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -405,12 +405,12 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 	resetting_ourselves = false;
 	gm = 0;
 
-	if (ARDOUR::Profile->get_sae()) {
-		chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
-		chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
-	}
 	
 #ifdef GTKOSX
+	chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
+	chooser.add_shortcut_folder_uri("file:///Library/Audio/Apple Loops");
+	chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
+	
 	chooser.add_shortcut_folder_uri("file:///Volumes");
 #endif
 
@@ -1045,7 +1045,7 @@ bool
 SoundFileOmega::bad_file_message()
 {
 	MessageDialog msg (*this, 
-			   _("One or more of the selected files\ncannot be used by Ardour"),
+			   string_compose (_("One or more of the selected files\ncannot be used by %1"), PROGRAM_NAME),
 			   true,
 			   Gtk::MESSAGE_INFO,
 			   Gtk::BUTTONS_OK);
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index f79ebdc71b..aecc431930 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -39,7 +39,7 @@ Splash::Splash ()
 
 	layout = create_pango_layout ("");
 	string str = "<b>";
-	string i18n = _("Ardour loading ...");
+	string i18n = string_compose (_("%1 loading ..."), PROGRAM_NAME);
 	str += i18n;
 	str += "</b>";
 
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 9fdba15da8..173ea6f1e9 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -184,7 +184,7 @@ load_rc_file (const string& filename, bool themechange)
 
 	if(!rcfile.length())
 	{
-		warning << string_compose(_("Unable to find UI style file %1. Ardour will look strange"), rcfile) << endmsg;
+		warning << string_compose(_("Unable to find UI style file %1. %2 will look strange"), rcfile, PROGRAM_NAME) << endmsg;
 		return;
 	}
 
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index acd6ed03cd..4e21f427a0 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -83,12 +83,12 @@ UIConfiguration::load_defaults ()
 		cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
 		
 		if (!tree.read (rcfile.c_str())) {
-			error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
+			error << string_compose(_("%1: cannot read default ui configuration file \"%2\""), PROGRAM_NAME, rcfile) << endmsg;
 			return -1;
 		}
 
 		if (set_state (*tree.root())) {
-			error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+			error << string_compose(_("%1: default ui configuration file \"%2\" not loaded successfully."), PROGRAM_NAME, rcfile) << endmsg;
 			return -1;
 		}
 	}
@@ -109,18 +109,18 @@ UIConfiguration::load_state ()
 		cerr << string_compose (_("loading user ui configuration file %1"), rcfile) << endl;
 		
 		if (!tree.read (rcfile)) {
-			error << string_compose(_("Ardour: cannot read ui configuration file \"%1\""), rcfile) << endmsg;
+			error << string_compose(_("%1: cannot read ui configuration file \"%2\""), PROGRAM_NAME, rcfile) << endmsg;
 			return -1;
 		}
 
 		if (set_state (*tree.root())) {
-			error << string_compose(_("Ardour: user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+			error << string_compose(_("%1: user ui configuration file \"%2\" not loaded successfully."), PROGRAM_NAME, rcfile) << endmsg;
 			return -1;
 		}
 	}
 
 	if (found != 1)
-		error << "Ardour: could not find any ui configuration file, canvas will look broken." << endmsg;
+		error << string_compose (_("%1: could not find any ui configuration file, canvas will look broken."), PROGRAM_NAME) << endmsg;
 
 	pack_canvasvars();
 	return 0;