Spelling correction patch from Debian

Patch taken (and forward-ported to HEAD) from
<https://anonscm.debian.org/cgit/pkg-multimedia/ardour.git/plain/debian/patches/0100-fix-typos.patch>

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 21cd043304928851f78a593c6d72d7892acd16a0..ba8954f7222a6dae3a38c8a7517f9b817d3f3f6a 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4126,9 +4126,9 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 }
 
 void
-MarkerDrag::aborted (bool movement_occured)
+MarkerDrag::aborted (bool movement_occurred)
 {
-       if (!movement_occured) {
+       if (!movement_occurred) {
                return;
        }
 
@@ -4382,9 +4382,9 @@ LineDrag::motion (GdkEvent* event, bool first_move)
 }
 
 void
-LineDrag::finished (GdkEvent* event, bool movement_occured)
+LineDrag::finished (GdkEvent* event, bool movement_occurred)
 {
-       if (movement_occured) {
+       if (movement_occurred) {
                motion (event, false);
                _line->end_drag (false, 0);
                _editor->commit_reversible_command ();
@@ -5361,9 +5361,9 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
 }
 
 void
-RangeMarkerBarDrag::aborted (bool movement_occured)
+RangeMarkerBarDrag::aborted (bool movement_occurred)
 {
-       if (movement_occured) {
+       if (movement_occurred) {
                _drag_rect->hide ();
        }
 }

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 115d37a3c3fdee035ae550b43900457b27612ed0..91f2031efa1890dfaaf6472e6dad90796aec5ab7 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4567,7 +4567,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
 
                list<boost::shared_ptr<Playlist> > foo;
 
-               /* the pmap is in the same order as the tracks in which selected regions occured */
+               /* the pmap is in the same order as the tracks in which selected regions occurred */
 
                for (vector<PlaylistMapping>::iterator i = pmap.begin(); i != pmap.end(); ++i) {
                        if ((*i).pl) {

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 0b13c3ff4e9b6f5c51355bb586cf773c1486dd9a..c00cc9b56523bce3d625c623ec29229f3a778d74 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -536,7 +536,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
 
                switch (editor.current_mouse_mode()) {
                case MouseRange:
-                       /* no motion occured - simple click */
+                       /* no motion occurred - simple click */
                        clear_editor_note_selection ();
                        _mouse_changed_selection = true;
                        break;

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index d940258011e5af6ab927a38d7341eff4e4ea84de..64a9ec65eff8cb54c1efb84751e6d05ccf70b694 100644 (file)
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -182,7 +182,7 @@ MonitorSection::MonitorSection (Session* s)
        /* Processor Box hide/shos */
        toggle_processorbox_button.set_text (_("Processors"));
        toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
-       set_tooltip (&toggle_processorbox_button, _("Allow to add monitor effect processors"));
+       set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors"));
 
        proctoggle = ToggleAction::create ();
        toggle_processorbox_button.set_related_action (proctoggle);

diff --git a/gtk2_ardour/po/ru.po b/gtk2_ardour/po/ru.po
index 1593470fb57c85ecb7568944e12aec1c9511eec4..86ef42807e5b9eb784df35cbfaa42a5e6cda9e43 100644 (file)
--- a/gtk2_ardour/po/ru.po
+++ b/gtk2_ardour/po/ru.po
@@ -8518,7 +8518,7 @@ msgid "Processors"
 msgstr "Обработчики"
 
 #: monitor_section.cc:189
-msgid "Allow to add monitor effect processors"
+msgid "Allow one to add monitor effect processors"
 msgstr ""
 
 #: monitor_section.cc:205

diff --git a/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h b/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
index c9a611bf7aa34ef214b1003a7ca4580f84c42196..2a44868f720425f7466a0500f7bbb981e602dfbc 100644 (file)
--- a/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
+++ b/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
@@ -80,7 +80,7 @@ inline SInt32 CAAtomicAdd32Barrier(SInt32 theAmt, volatile SInt32* theValue)
 #if TARGET_OS_WIN32
        long lRetVal = InterlockedExchangeAdd((volatile long*)theValue, theAmt);
        // InterlockedExchangeAdd returns the original value which differs from OSX version. 
-       // At this point the addition would have occured and hence returning the new value
+       // At this point the addition would have occurred and hence returning the new value
        // to keep it sync with OSX.
        return lRetVal + theAmt;
 #else

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index c36a6da0c761f6e2644c6d8ad54f3997c2022c7f..c84af00514f8124666ed1d976fae2c9ba38d40bb 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -517,10 +517,10 @@ ExportHandler::export_cd_marker_file (ExportTimespanPtr timespan, ExportFormatSp
                }
 
        } catch (std::exception& e) {
-               error << string_compose (_("an error occured while writing a TOC/CUE file: %1"), e.what()) << endmsg;
+               error << string_compose (_("an error occurred while writing a TOC/CUE file: %1"), e.what()) << endmsg;
                ::g_unlink (filepath.c_str());
        } catch (Glib::Exception& e) {
-               error << string_compose (_("an error occured while writing a TOC/CUE file: %1"), e.what()) << endmsg;
+               error << string_compose (_("an error occurred while writing a TOC/CUE file: %1"), e.what()) << endmsg;
                ::g_unlink (filepath.c_str());
        }
 }

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 41681a73f0a8bb7dac9b8d543a2474bdeabcf231..b571a9eb5fd618698264c4ccc93b93be4fe9fc74 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -3173,7 +3173,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
                }
 
                /* check to see how the original region (in the
-                * playlist before compounding occured) overlaps
+                * playlist before compounding occurred) overlaps
                 * with the new state of the compound region.
                 */
 

diff --git a/libs/ardour/po/cs.po b/libs/ardour/po/cs.po
index 47c740f83350c2ac38d99e8ece67cf2d3d00e399..5985df8f714250e233f3490d80fd59c619fb7bf9 100644 (file)
--- a/libs/ardour/po/cs.po
+++ b/libs/ardour/po/cs.po
@@ -594,7 +594,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr "Editor: Nelze otevřít \"%1\" jako soubor vyvedení pro značku CD"
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr "Při zápisu souboru TOC/CUE se vyskytla chyba:%1"
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/de.po b/libs/ardour/po/de.po
index 5056d5919b9cdb69ad48f321b2c21dca93e53a64..d8e098315d8edb1e2a76bbcf768f7215de1692a3 100644 (file)
--- a/libs/ardour/po/de.po
+++ b/libs/ardour/po/de.po
@@ -790,7 +790,7 @@ msgstr ""
 "Adresse oder Passwort falsch?"
 
 #: export_handler.cc:503 export_handler.cc:506
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr "beim Schreiben einer TOC/CUE Datei trat ein Fehler auf:%1"
 
 #: export_handler.cc:796 export_handler.cc:854

diff --git a/libs/ardour/po/el.po b/libs/ardour/po/el.po
index a0e913ad71bc65118cbb7b8561b946a11efb74a1..d614704cb830b8af727ea311b71ef706296cde8a 100644 (file)
--- a/libs/ardour/po/el.po
+++ b/libs/ardour/po/el.po
@@ -581,7 +581,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr ""
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/en_GB.po b/libs/ardour/po/en_GB.po
index 7d46f4ecb2a47e8adfff767f9e8f3d276f339445..bdf4c17368cc4714a70a171d48b7da7209cbf1ad 100644 (file)
--- a/libs/ardour/po/en_GB.po
+++ b/libs/ardour/po/en_GB.po
@@ -577,7 +577,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr ""
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/es.po b/libs/ardour/po/es.po
index b43f81ff18a30b703c5f6393a803ae4c0f64dbb0..a95ae07041d5e588238b91f6c66522f39f983d39 100644 (file)
--- a/libs/ardour/po/es.po
+++ b/libs/ardour/po/es.po
@@ -581,7 +581,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr ""
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/fr.po b/libs/ardour/po/fr.po
index 507c2c75f8595a895c59df2fa209a2ae6a2330a8..f702ed848a33bd2aae8363dab9396a261c741229 100644 (file)
--- a/libs/ardour/po/fr.po
+++ b/libs/ardour/po/fr.po
@@ -601,7 +601,7 @@ msgstr ""
 "de CD"
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr "Erreur lors de l'écriture du fichier TOC/CUE : %1"
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/it.po b/libs/ardour/po/it.po
index a51a52054af891c583521d9758a8e530d978cb47..77cb2569a7f27f4314b4819d221464b14b55bdaf 100644 (file)
--- a/libs/ardour/po/it.po
+++ b/libs/ardour/po/it.po
@@ -569,7 +569,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr ""
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/nn.po b/libs/ardour/po/nn.po
index 96780ff3ab64ee17c008cfa8fd9c32bd2cecd21e..3f35d8689cc6aaee8a07dbf9be5553913afbe57a 100644 (file)
--- a/libs/ardour/po/nn.po
+++ b/libs/ardour/po/nn.po
@@ -586,7 +586,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr "Redigering: greier ikkje opna \"%1\" som eksportfil for CD-markørfil"
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/pl.po b/libs/ardour/po/pl.po
index e6c4f7bdb9303c8eef96c9e634e35e28c038d604..9743d402c45e9376ebae4bb8ffa0c811998d2bd7 100644 (file)
--- a/libs/ardour/po/pl.po
+++ b/libs/ardour/po/pl.po
@@ -564,7 +564,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr ""
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/ardour/po/ru.po b/libs/ardour/po/ru.po
index dac67d792c7bb161fa1208cb5482058759050d73..b1feb6d0bcc14395297fb26bf83d04e0f185b4de 100644 (file)
--- a/libs/ardour/po/ru.po
+++ b/libs/ardour/po/ru.po
@@ -792,7 +792,7 @@ msgstr ""
 "пароль неверны.\n"
 
 #: export_handler.cc:503 export_handler.cc:506
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr "Произошла ошибка при записи TOC/CUE файла: %1"
 
 #: export_handler.cc:796 export_handler.cc:854

diff --git a/libs/ardour/po/sv.po b/libs/ardour/po/sv.po
index dd2b06031625c88bfa9f1eec47e63019a6a95508..5230916ace7f1f09f5f2927b0cf8071c90d5a5b8 100644 (file)
--- a/libs/ardour/po/sv.po
+++ b/libs/ardour/po/sv.po
@@ -564,7 +564,7 @@ msgid "Editor: cannot open \"%1\" as export file for CD marker file"
 msgstr ""
 
 #: export_handler.cc:492 export_handler.cc:495
-msgid "an error occured while writing a TOC/CUE file: %1"
+msgid "an error occurred while writing a TOC/CUE file: %1"
 msgstr ""
 
 #: export_handler.cc:744 export_handler.cc:802

diff --git a/libs/audiographer/src/general/sr_converter.cc b/libs/audiographer/src/general/sr_converter.cc
index 9b5fa801fe537e2d013d3532647b8e2faff1e7ba..74da2ae6a785b31d099fadfe2b575ff99a7e4980 100644 (file)
--- a/libs/audiographer/src/general/sr_converter.cc
+++ b/libs/audiographer/src/general/sr_converter.cc
@@ -89,7 +89,7 @@ SampleRateConverter::allocate_buffers (framecnt_t max_frames)
                max_leftover_frames = 4 * max_frames;
                leftover_data = (float *) realloc (leftover_data, max_leftover_frames * sizeof (float));
                if (throw_level (ThrowObject) && !leftover_data) {
-                       throw Exception (*this, "A memory allocation error occured");
+                       throw Exception (*this, "A memory allocation error occurred");
                }
 
                max_frames_in = max_frames;
@@ -164,7 +164,7 @@ SampleRateConverter::process (ProcessContext<float> const & c)
                err = src_process (src_state, &src_data);
                if (throw_level (ThrowProcess) && err) {
                        throw Exception (*this, str (format
-                       ("An error occured during sample rate conversion: %1%")
+                       ("An error occurred during sample rate conversion: %1%")
                        % src_strerror (err)));
                }
 

diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index 6bf1959c67b3cc0dc778ade159e5f293cb8f8978..a166c23521f1aca0d37eceefd61858050c84dea2 100644 (file)
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -1161,7 +1161,7 @@ GtkCanvas::start_tooltip_timeout (Item* item)
 bool
 GtkCanvas::really_start_tooltip_timeout ()
 {
-       /* an idle has occured since we entered a tooltip-bearing widget. Now
+       /* an idle has occurred since we entered a tooltip-bearing widget. Now
         * wait 1 second and if the timeout isn't cancelled, show the tooltip.
         */
 

diff --git a/libs/midi++2/parser.cc b/libs/midi++2/parser.cc
index fcee844cefa5e05cc107c68f5dbc99b3c65750d4..ff0702f794acff5463f58338e20d3fe1896b1235 100644 (file)
--- a/libs/midi++2/parser.cc
+++ b/libs/midi++2/parser.cc
@@ -100,7 +100,7 @@ Parser::midi_event_type_name (eventType t)
                return "active sense";
 
        default:
-               return "unknow MIDI event type";
+               return "unknown MIDI event type";
        }
 }
 

diff --git a/libs/pbd/msvc/msvc_poll.cc b/libs/pbd/msvc/msvc_poll.cc
index 921638a3f5105f6767d520bf38f10e022c8f6a42..c18e7060844b833cdff6267dc3f0e9413a24cac8 100644 (file)
--- a/libs/pbd/msvc/msvc_poll.cc
+++ b/libs/pbd/msvc/msvc_poll.cc
@@ -71,7 +71,7 @@ int   ret = 0;
 
                                        if (0 > pos)
                                        {
-                                               // An error occured ('errno' should have been set by '_tell()')
+                                               // An error occurred ('errno' should have been set by '_tell()')
                                                ret = (-1);
                                                fds[loop].revents = POLLERR;
                                                if (fds[loop].events & POLLRDNORM)

diff --git a/tools/jacktest.c b/tools/jacktest.c
index 62a6a083760f526287326cfbda96f94c82fd6de0..d75dad5e9ebb02e0acea3fbc6355ac48e52396d5 100644 (file)
--- a/tools/jacktest.c
+++ b/tools/jacktest.c
@@ -10,7 +10,7 @@ jack_port_t *input_port;
 jack_port_t *output_port;
 jack_client_t *client;
 int loopsize = 25000;
-int xrun_occured = 0;
+int xrun_occurred = 0;
 int consecutive_xruns = 0;
 float first_xrun = 0.0f;
 float last_load = 0.0f;
@@ -59,14 +59,14 @@ process (jack_nframes_t nframes, void *arg)
                printf ("loopsize = %d\n", loopsize);
        }
 
-       if (xrun_occured) {
+       if (xrun_occurred) {
                if (consecutive_xruns == 0) {
                        first_xrun = last_load;
                }
                consecutive_xruns++;
        }
 
-       xrun_occured = 0;
+       xrun_occurred = 0;
 
        if (consecutive_xruns >= 10) {
                fprintf (stderr, "Stopping with load = %f (first xrun at %f)\n", last_load, first_xrun);
@@ -90,8 +90,8 @@ jack_shutdown (void *arg)
 int
 jack_xrun (void *arg)
 {
-       fprintf (stderr, "xrun occured with loop size = %d\n", loopsize);
-       xrun_occured = 1;
+       fprintf (stderr, "xrun occurred with loop size = %d\n", loopsize);
+       xrun_occurred = 1;
        return 0;
 }