diff options
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/step_entry.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/audioregion.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/export_handler.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_port.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 2 |
7 files changed, 14 insertions, 13 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index b598d606c5..bc63a6c8f6 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -347,10 +347,10 @@ Editor::register_actions () toggle_reg_sens (editor_actions, "toggle-log-window", _("Log"), sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::toggle_errors)); - reg_sens (editor_actions, "tab-to-transient-forwards", _("Move Later to Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); - reg_sens (editor_actions, "alternate-tab-to-transient-forwards", _("Move Later to Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); - reg_sens (editor_actions, "tab-to-transient-backwards", _("Move Earlier to Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); - reg_sens (editor_actions, "alternate-tab-to-transient-backwards", _("Move Earlier to Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); + reg_sens (editor_actions, "alternate-tab-to-transient-forwards", _("Move to Next Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); + reg_sens (editor_actions, "alternate-tab-to-transient-backwards", _("Move to Previous Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); + reg_sens (editor_actions, "tab-to-transient-forwards", _("Move to Next Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); + reg_sens (editor_actions, "tab-to-transient-backwards", _("Move to Previous Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); reg_sens (editor_actions, "crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index d79813ab35..6d20b7aaf0 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -6565,6 +6565,7 @@ edit your ardour.rc file to set the\n\ return; } + // XXX should be using gettext plural forms, maybe? if (ntracks > 1) { trackstr = _("tracks"); } else { @@ -6591,7 +6592,7 @@ edit your ardour.rc file to set the\n\ } } else if (nbusses) { prompt = string_compose (_("Do you really want to remove %1 %2?\n\n" - "This action cannot be undon, and the session file will be overwritten"), + "This action cannot be undone, and the session file will be overwritten"), nbusses, busstr); } diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 2039f50a0a..ac13770a29 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -279,8 +279,8 @@ StepEntry::StepEntry (StepEditor& seditor) ARDOUR_UI::instance()->set_tip (&velocity_mp_button, _("Set volume (velocity) to mezzo-piano"), ""); ARDOUR_UI::instance()->set_tip (&velocity_mf_button, _("Set volume (velocity) to mezzo-forte"), ""); ARDOUR_UI::instance()->set_tip (&velocity_f_button, _("Set volume (velocity) to forte"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_ff_button, _("Set volume (velocity) to forteissimo"), ""); - ARDOUR_UI::instance()->set_tip (&velocity_fff_button, _("Set volume (velocity) to forteississimo"), ""); + ARDOUR_UI::instance()->set_tip (&velocity_ff_button, _("Set volume (velocity) to fortissimo"), ""); + ARDOUR_UI::instance()->set_tip (&velocity_fff_button, _("Set volume (velocity) to fortississimo"), ""); note_velocity_box.pack_start (velocity_ppp_button, false, false); note_velocity_box.pack_start (velocity_pp_button, false, false); diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 630819d7c1..8c4eb6aa2a 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -1678,16 +1678,16 @@ AudioRegion::get_transients (AnalysisFeatureList& results, bool force_new) if (!Config->get_auto_analyse_audio()) { if (!analyse_dialog_shown) { - pl->session().Dialog (_("\ + pl->session().Dialog (string_compose (_("\ You have requested an operation that requires audio analysis.\n\n\ You currently have \"auto-analyse-audio\" disabled, which means \ that transient data must be generated every time it is required.\n\n\ If you are doing work that will require transient data on a \ regular basis, you should probably enable \"auto-analyse-audio\" \ -then quit ardour and restart.\n\n\ +then quit %1 and restart.\n\n\ This dialog will not display again. But you may notice a slight delay \ in this and future transient-detection operations.\n\ -")); +"), PROGRAM_NAME)); analyse_dialog_shown = true; } } diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index ec89f270ca..38086bd273 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -363,7 +363,7 @@ ExportHandler::finish_timespan () open_uri(path.c_str()); // open the soundcloud website to the new file } } else { - error << _("upload to Soundcloud failed. Perhaps your email or password are incorrect?\n") << endmsg; + error << _("upload to Soundcloud failed. Perhaps your email or password are incorrect?\n") << endmsg; } delete soundcloud_uploader; } diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index 55280eb942..97ef865f47 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -206,7 +206,7 @@ MidiPort::flush_buffers (pframes_t nframes) } } else { cerr << "drop flushed event on the floor, time " << ev.time() - << " to early for " << _global_port_buffer_offset + << " too early for " << _global_port_buffer_offset << " + " << _port_buffer_offset << endl; } } diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 0017a89daf..bb39a03b09 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1955,7 +1955,7 @@ Session::XMLSourceFactory (const XMLNode& node) } catch (failed_constructor& err) { - error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the progammers."), PROGRAM_NAME) << endmsg; + error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the programmers."), PROGRAM_NAME) << endmsg; return boost::shared_ptr<Source>(); } } |