[SCM] ardour/master: Fixed typos
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Sat Jan 16 20:34:58 UTC 2016
The following commit has been merged in the master branch:
commit 1644a497fafd6097c3ffa9e82191860fd1c868fb
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Sat Jan 16 20:28:44 2016 +0100
Fixed typos
diff --git a/debian/patches/0100-fix-typos.patch b/debian/patches/0100-fix-typos.patch
new file mode 100644
index 0000000..370c97b
--- /dev/null
+++ b/debian/patches/0100-fix-typos.patch
@@ -0,0 +1,317 @@
+Description: fixed typos
+ occured -> occurred
+ unknow -> unknown
+Author: IOhannes m zmölnig
+Last-Update: 2016-01-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- ardour.orig/gtk2_ardour/editor_drag.cc
++++ ardour/gtk2_ardour/editor_drag.cc
+@@ -4038,9 +4038,9 @@
+ }
+
+ void
+-MarkerDrag::aborted (bool movement_occured)
++MarkerDrag::aborted (bool movement_occurred)
+ {
+- if (!movement_occured) {
++ if (!movement_occurred) {
+ return;
+ }
+
+@@ -4279,9 +4279,9 @@
+ }
+
+ 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 ();
+@@ -5245,9 +5245,9 @@
+ }
+
+ void
+-RangeMarkerBarDrag::aborted (bool movement_occured)
++RangeMarkerBarDrag::aborted (bool movement_occurred)
+ {
+- if (movement_occured) {
++ if (movement_occurred) {
+ _drag_rect->hide ();
+ }
+ }
+--- ardour.orig/gtk2_ardour/editor_ops.cc
++++ ardour/gtk2_ardour/editor_ops.cc
+@@ -4570,7 +4570,7 @@
+
+ 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) {
+--- ardour.orig/gtk2_ardour/midi_region_view.cc
++++ ardour/gtk2_ardour/midi_region_view.cc
+@@ -539,7 +539,7 @@
+
+ switch (editor.current_mouse_mode()) {
+ case MouseRange:
+- /* no motion occured - simple click */
++ /* no motion occurred - simple click */
+ clear_selection ();
+ _mouse_changed_selection = true;
+ break;
+--- ardour.orig/libs/ardour/export_handler.cc
++++ ardour/libs/ardour/export_handler.cc
+@@ -500,10 +500,10 @@
+ }
+
+ } 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());
+ }
+ }
+--- ardour.orig/libs/ardour/playlist.cc
++++ ardour/libs/ardour/playlist.cc
+@@ -3110,7 +3110,7 @@
+ }
+
+ /* 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.
+ */
+
+--- ardour.orig/libs/ardour/po/cs.po
++++ ardour/libs/ardour/po/cs.po
+@@ -594,7 +594,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/de.po
++++ ardour/libs/ardour/po/de.po
+@@ -658,7 +658,7 @@
+ msgstr "Editor: kann \"%1\" als Export-Datei für CD-Marker nicht öffnen"
+
+ #: export_handler.cc:508 export_handler.cc:511
+-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:801 export_handler.cc:859
+--- ardour.orig/libs/ardour/po/el.po
++++ ardour/libs/ardour/po/el.po
+@@ -581,7 +581,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/en_GB.po
++++ ardour/libs/ardour/po/en_GB.po
+@@ -577,7 +577,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/es.po
++++ ardour/libs/ardour/po/es.po
+@@ -581,7 +581,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/fr.po
++++ ardour/libs/ardour/po/fr.po
+@@ -601,7 +601,7 @@
+ "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
+--- ardour.orig/libs/ardour/po/it.po
++++ ardour/libs/ardour/po/it.po
+@@ -569,7 +569,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/nn.po
++++ ardour/libs/ardour/po/nn.po
+@@ -586,7 +586,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/pl.po
++++ ardour/libs/ardour/po/pl.po
+@@ -564,7 +564,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/ru.po
++++ ardour/libs/ardour/po/ru.po
+@@ -625,7 +625,7 @@
+ "Редактор: не удалось открыть \"%1\", как файл экспорта для 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 "Произошла ошибка при записи TOC/CUE файла: %1"
+
+ #: export_handler.cc:744 export_handler.cc:802
+--- ardour.orig/libs/ardour/po/sv.po
++++ ardour/libs/ardour/po/sv.po
+@@ -564,7 +564,7 @@
+ 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
+--- ardour.orig/libs/ardour/po/zh.po
++++ ardour/libs/ardour/po/zh.po
+@@ -569,7 +569,7 @@
+ 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
+--- ardour.orig/libs/audiographer/src/general/sr_converter.cc
++++ ardour/libs/audiographer/src/general/sr_converter.cc
+@@ -87,7 +87,7 @@
+ 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;
+@@ -162,7 +162,7 @@
+ 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)));
+ }
+
+--- ardour.orig/libs/canvas/canvas.cc
++++ ardour/libs/canvas/canvas.cc
+@@ -1152,7 +1152,7 @@
+ 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.
+ */
+
+--- ardour.orig/libs/pbd/msvc/msvc_poll.cc
++++ ardour/libs/pbd/msvc/msvc_poll.cc
+@@ -71,7 +71,7 @@
+
+ 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)
+--- ardour.orig/tools/jacktest.c
++++ ardour/tools/jacktest.c
+@@ -10,7 +10,7 @@
+ 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 @@
+ 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 @@
+ 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;
+ }
+
+--- ardour.orig/libs/midi++2/parser.cc
++++ ardour/libs/midi++2/parser.cc
+@@ -100,7 +100,7 @@
+ return "active sense";
+
+ default:
+- return "unknow MIDI event type";
++ return "unknown MIDI event type";
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 5fdc4ce..428dc97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0010-waf.patch
0030-wscript.patch
0050-log-stdout.patch
+0100-fix-typos.patch
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list