summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/add_route_dialog.cc4
-rw-r--r--gtk2_ardour/ardour_ui.cc2
-rw-r--r--gtk2_ardour/ardour_ui_ed.cc4
-rw-r--r--gtk2_ardour/bundle_manager.cc4
-rw-r--r--gtk2_ardour/editor.cc4
-rw-r--r--gtk2_ardour/editor_actions.cc4
-rw-r--r--gtk2_ardour/export_format_dialog.cc2
-rw-r--r--gtk2_ardour/io_selector.cc2
-rw-r--r--gtk2_ardour/location_ui.cc3
-rw-r--r--gtk2_ardour/midi_port_dialog.cc4
-rw-r--r--gtk2_ardour/playlist_selector.cc4
-rw-r--r--gtk2_ardour/return_ui.cc2
-rw-r--r--gtk2_ardour/route_group_dialog.cc4
-rw-r--r--gtk2_ardour/route_params_ui.cc30
-rw-r--r--gtk2_ardour/send_ui.cc2
-rw-r--r--gtk2_ardour/session_import_dialog.cc2
16 files changed, 25 insertions, 52 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 18792bb654..e7ae4454aa 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -62,7 +62,7 @@ std::vector<std::string> AddRouteDialog::track_mode_strings;
std::vector<std::string> AddRouteDialog::bus_mode_strings;
AddRouteDialog::AddRouteDialog (Session* s)
- : ArdourDialog (X_("add route dialog"))
+ : ArdourDialog (_("Add Track or Bus"))
, routes_adjustment (1, 1, 128, 1, 4)
, routes_spinner (routes_adjustment)
, mode_label (_("Track mode:"))
@@ -91,8 +91,6 @@ AddRouteDialog::AddRouteDialog (Session* s)
set_skip_taskbar_hint (true);
set_resizable (false);
- set_title (_("Add Track/Bus"));
-
name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
routes_spinner.set_name (X_("AddRouteDialogSpinner"));
channel_combo.set_name (X_("ChannelCountSelector"));
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 91c3ed6f43..4b2f0961d1 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2020,7 +2020,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
vector<string> n = get_file_names_no_extension (p);
if (find (n.begin(), n.end(), snapname) != n.end()) {
- ArdourDialog confirm (_("Confirm snapshot overwrite"), true);
+ ArdourDialog confirm (_("Confirm Snapshot Overwrite"), true);
Label m (_("A snapshot already exists with that name. Do you want to overwrite it?"));
confirm.get_vbox()->pack_start (m, true, true);
confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 20b20c6f73..fddc1a74c9 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -120,7 +120,7 @@ ARDOUR_UI::install_actions ()
act = ActionManager::register_action (main_actions, X_("Close"), _("Close"), sigc::mem_fun(*this, &ARDOUR_UI::close_session));
ActionManager::session_sensitive_actions.push_back (act);
- act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track/Bus..."),
+ act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."),
sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);
@@ -218,7 +218,7 @@ ARDOUR_UI::install_actions ()
ActionManager::register_action (common_actions, X_("toggle-editor-mixer-on-top"), _("Toggle Editor Mixer on Top"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_editor_mixer_on_top));
ActionManager::register_toggle_action (common_actions, X_("ToggleRCOptionsEditor"), _("Preferences"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_rc_options_window));
ActionManager::register_toggle_action (common_actions, X_("ToggleSessionOptionsEditor"), _("Preferences"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_options_window));
- act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Track/Bus Inspector"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_route_params_window));
+ act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Tracks and Busses"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_route_params_window));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_toggle_action (common_actions, X_("ToggleLocations"), _("Locations"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_location_window));
diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index bec15a1674..559bc7ed6c 100644
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -435,14 +435,14 @@ BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColum
}
NameChannelDialog::NameChannelDialog ()
- : ArdourDialog (_("Add channel")),
+ : ArdourDialog (_("Add Channel")),
_adding (true)
{
setup ();
}
NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
- : ArdourDialog (_("Rename channel")),
+ : ArdourDialog (_("Rename Channel")),
_bundle (b),
_channel (c),
_adding (false)
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 98480743e0..d55a1aaf37 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -547,7 +547,7 @@ Editor::Editor ()
nlabel = manage (new Label (_("Regions")));
nlabel->set_angle (-90);
the_notebook.append_page (_regions->widget (), *nlabel);
- nlabel = manage (new Label (_("Tracks/Busses")));
+ nlabel = manage (new Label (_("Tracks & Busses")));
nlabel->set_angle (-90);
the_notebook.append_page (_routes->widget (), *nlabel);
nlabel = manage (new Label (_("Snapshots")));
@@ -3879,7 +3879,7 @@ Editor::session_range_location_changed (Location* location)
int
Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
{
- ArdourDialog dialog ("playlist deletion dialog");
+ ArdourDialog dialog (_("Playlist Deletion"));
Label label (string_compose (_("Playlist %1 is currently unused.\n"
"If left alone, no audio files used by it will be cleaned.\n"
"If deleted, audio files used by it alone by will cleaned."),
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index f4a8e81b9c..79df54b25f 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -200,9 +200,9 @@ Editor::register_actions ()
act = ActionManager::register_action (editor_actions, "select-all-in-loop-range", _("Select All in Loop Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_loop));
ActionManager::session_sensitive_actions.push_back (act);
- act = ActionManager::register_action (editor_actions, "select-next-route", _("Select Next Track/Bus"), sigc::mem_fun(*this, &Editor::select_next_route));
+ act = ActionManager::register_action (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::mem_fun(*this, &Editor::select_next_route));
ActionManager::session_sensitive_actions.push_back (act);
- act = ActionManager::register_action (editor_actions, "select-prev-route", _("Select Previous Track/Bus"), sigc::mem_fun(*this, &Editor::select_prev_route));
+ act = ActionManager::register_action (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::mem_fun(*this, &Editor::select_prev_route));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "track-record-enable-toggle", _("Toggle Record Enable"), sigc::mem_fun(*this, &Editor::toggle_record_enable));
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 9cb2a9cb5d..cd34104d86 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -28,7 +28,7 @@
using namespace ARDOUR;
ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) :
- ArdourDialog (new_dialog ? _("New export format profile") : _("Edit export format profile")),
+ ArdourDialog (new_dialog ? _("New Export Format Profile") : _("Edit Export Format Profile")),
format (format),
manager (format),
original_state (format->get_state()),
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 0b6c60e311..b4e1af132a 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -322,7 +322,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
{
set_name ("IOSelectorWindow");
- string title = _("ardour: ");
+ string title = _("Port Insert ");
title += pi->name();
set_title (title);
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index f830d817a6..68c03e0604 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -896,9 +896,8 @@ LocationUI::session_going_away()
/*------------------------*/
LocationUIWindow::LocationUIWindow ()
- : ArdourDialog ("locations dialog")
+ : ArdourDialog (_("Locations"))
{
- set_title (_("Locations"));
set_wmclass(X_("ardour_locations"), "Ardour");
set_name ("LocationWindow");
diff --git a/gtk2_ardour/midi_port_dialog.cc b/gtk2_ardour/midi_port_dialog.cc
index 23fb6f1ef2..0f19fde9d6 100644
--- a/gtk2_ardour/midi_port_dialog.cc
+++ b/gtk2_ardour/midi_port_dialog.cc
@@ -17,7 +17,7 @@ using namespace Gtkmm2ext;
static const char* mode_strings[] = { "duplex", "output", "input", (char*) 0 };
MidiPortDialog::MidiPortDialog ()
- : ArdourDialog ("add MIDI port dialog")
+ : ArdourDialog (_("Add MIDI Port"))
, port_label (_("Port name:"))
{
set_modal (true);
@@ -26,8 +26,6 @@ MidiPortDialog::MidiPortDialog ()
set_position (Gtk::WIN_POS_MOUSE);
set_name (N_("MidiPortDialog"));
- set_title (_("Add MIDI Port"));
-
vector<string> str = internationalize (PACKAGE, mode_strings);
set_popdown_strings (port_mode_combo, str);
port_mode_combo.set_active_text (str.front());
diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index c8a9255c62..e0c51082a1 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -42,7 +42,7 @@ using namespace ARDOUR;
using namespace PBD;
PlaylistSelector::PlaylistSelector ()
- : ArdourDialog ("playlist selector")
+ : ArdourDialog (_("Playlists"))
{
rui = 0;
@@ -52,8 +52,6 @@ PlaylistSelector::PlaylistSelector ()
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
set_size_request (300, 200);
- set_title (_("Playlists"));
-
model = TreeStore::create (columns);
tree.set_model (model);
tree.append_column (_("Playlists grouped by track"), columns.text);
diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index f49b853c61..62762dee44 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -99,7 +99,7 @@ ReturnUI::fast_update ()
}
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
- : ArdourDialog (string("Ardour: return ") + r->name())
+ : ArdourDialog (string(_("Return ")) + r->name())
{
ui = new ReturnUI (this, r, s);
diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index 8dd204ea93..176c23d8e2 100644
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -30,7 +30,7 @@ using namespace std;
using namespace PBD;
RouteGroupDialog::RouteGroupDialog (RouteGroup* g, StockID const & s)
- : ArdourDialog (_("route group dialog")),
+ : ArdourDialog (_("Route Group")),
_group (g),
_active (_("Active")),
_gain (_("Gain")),
@@ -47,8 +47,6 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, StockID const & s)
set_position (Gtk::WIN_POS_MOUSE);
set_name (N_("RouteGroupDialog"));
- set_title (_("Route Group"));
-
VBox* vbox = manage (new VBox);
Gtk::Label* l;
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index d2aadf0eb3..64e78c2125 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -60,7 +60,7 @@ using namespace Gtk;
using namespace Gtkmm2ext;
RouteParams_UI::RouteParams_UI ()
- : ArdourDialog ("track/bus inspector"),
+ : ArdourDialog (_("Tracks and Busses")),
latency_apply_button (Stock::APPLY),
track_menu(0)
{
@@ -145,8 +145,6 @@ RouteParams_UI::RouteParams_UI ()
set_default_size (620,370);
set_wmclass (X_("ardour_route_parameters"), "Ardour");
- set_title (_("Track/Bus Inspector"));
-
// events
route_display.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &RouteParams_UI::route_selected));
route_display.get_column(0)->signal_clicked().connect(sigc::mem_fun(*this, &RouteParams_UI::show_track_menu));
@@ -509,7 +507,7 @@ RouteParams_UI::show_track_menu()
track_menu = new Menu;
track_menu->set_name ("ArdourContextMenu");
track_menu->items().push_back
- (MenuElem (_("Add Track/Bus"),
+ (MenuElem (_("Add Track or Bus"),
sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0)));
}
track_menu->popup (1, gtk_get_current_event_time());
@@ -610,31 +608,15 @@ RouteParams_UI::processor_going_away (boost::weak_ptr<ARDOUR::Processor> wproc)
void
RouteParams_UI::update_title ()
{
- WindowTitle title(_("Track/Bus Inspector"));
+ WindowTitle title (_("Tracks and Busses"));
if (_route) {
-
- // title += ": ";
-
- // if (_redirect && (_current_view == PLUGIN_CONFIG_VIEW || _current_view == SEND_CONFIG_VIEW)) {
- // title += _redirect->name();
- // }
- // else if (_current_view == INPUT_CONFIG_VIEW) {
- // title += _("INPUT");
- // }
- // else if (_current_view == OUTPUT_CONFIG_VIEW) {
- // title += _("OUTPUT");
- // }
-
title_label.set_text(_route->name());
-
title += _route->name();
-
set_title(title.get_string());
- }
- else {
- title_label.set_text(_("No Route Selected"));
- title += _("No Route Selected");
+ } else {
+ title_label.set_text(_("No Track or Bus Selected"));
+ title += _("No Track or Bus Selected");
set_title(title.get_string());
}
}
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 677abebf8d..a0359a4856 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -119,7 +119,7 @@ SendUI::fast_update ()
}
SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
- : ArdourDialog (string("Ardour: send ") + s->name())
+ : ArdourDialog (string (_("Send ")) + s->name())
{
ui = new SendUI (this, s, session);
diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index 675a3b0603..6fdac9aa90 100644
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -38,7 +38,7 @@ using namespace std;
using namespace ARDOUR;
SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) :
- ArdourDialog (_("Import from session")),
+ ArdourDialog (_("Import From Session")),
file_browse_button (_("Browse"))
{
set_session (target);