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>

18 files changed, 20 insertions, 20 deletions

diff --git a/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h b/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
index c9a611bf7a..2a44868f72 100644
--- 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 c36a6da0c7..c84af00514 100644
--- 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 41681a73f0..b571a9eb5f 100644
--- 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 47c740f833..5985df8f71 100644
--- 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 5056d5919b..d8e098315d 100644
--- 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 a0e913ad71..d614704cb8 100644
--- 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 7d46f4ecb2..bdf4c17368 100644
--- 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 b43f81ff18..a95ae07041 100644
--- 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 507c2c75f8..f702ed848a 100644
--- 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 a51a52054a..77cb2569a7 100644
--- 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 96780ff3ab..3f35d8689c 100644
--- 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 e6c4f7bdb9..9743d402c4 100644
--- 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 dac67d792c..b1feb6d0bc 100644
--- 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 dd2b060316..5230916ace 100644
--- 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 9b5fa801fe..74da2ae6a7 100644
--- 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 6bf1959c67..a166c23521 100644
--- 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 fcee844cef..ff0702f794 100644
--- 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 921638a3f5..c18e706084 100644
--- 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)