[SCM] ardour/master: More spelling fixes

Tue Oct 18 12:40:56 UTC 2016

The following commit has been merged in the master branch:
commit 725f15dc40a981f7638f9ab1a54afc4ea8be9961
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Oct 18 14:25:58 2016 +0200

    More spelling fixes
    
    suprising -> surprising
    unvailable -> unavailable

diff --git a/debian/patches/0080-more-spelling.patch b/debian/patches/0080-more-spelling.patch
new file mode 100644
index 0000000..7c6db4a
--- /dev/null
+++ b/debian/patches/0080-more-spelling.patch
@@ -0,0 +1,331 @@
+Description: more spelling fixes
+ some more spelling errors are fixed.
+ this is done in a separate patch to ease upstream's integration of the patch
+ (they already included 0070-spelling.patch)
+Author: IOhannes m zmölnig
+Forwarded: yes
+Last-Update: 2016-10-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- ardour.orig/gtk2_ardour/ardour_ui.cc
++++ ardour/gtk2_ardour/ardour_ui.cc
+@@ -3806,7 +3806,7 @@
+ 				    Gtk::MESSAGE_INFO,
+ 				    Gtk::BUTTONS_OK);
+ 		msgd.set_title (_("Clean-up"));
+-		msgd.set_secondary_text (_("If this seems suprising, \n\
++		msgd.set_secondary_text (_("If this seems surprising, \n\
+ check for any existing snapshots.\n\
+ These may still include regions that\n\
+ require some unused files to continue to exist."));
+--- ardour.orig/gtk2_ardour/gtk2_ardour5.pot
++++ ardour/gtk2_ardour/gtk2_ardour5.pot
+@@ -1378,7 +1378,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10482,7 +10482,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/cs.po
++++ ardour/gtk2_ardour/po/cs.po
+@@ -1501,7 +1501,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10975,7 +10975,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ "Místní cesta ke kořenu dokumentu (docroot) videoserveru. Videoserver bude "
+--- ardour.orig/gtk2_ardour/po/de.po
++++ ardour/gtk2_ardour/po/de.po
+@@ -1558,7 +1558,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -11109,7 +11109,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ "Lokaler Pfad zum document-root des Videoservers. Nur Dateien unterhalb "
+--- ardour.orig/gtk2_ardour/po/el.po
++++ ardour/gtk2_ardour/po/el.po
+@@ -1368,7 +1368,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10514,7 +10514,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/en_GB.po
++++ ardour/gtk2_ardour/po/en_GB.po
+@@ -1372,7 +1372,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10495,7 +10495,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/es.po
++++ ardour/gtk2_ardour/po/es.po
+@@ -1479,7 +1479,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10911,7 +10911,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/fr.po
++++ ardour/gtk2_ardour/po/fr.po
+@@ -1564,7 +1564,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -11108,7 +11108,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ "Chemin local vers le répertoire-racine du serveur vidéo. Seuls les fichiers "
+--- ardour.orig/gtk2_ardour/po/it.po
++++ ardour/gtk2_ardour/po/it.po
+@@ -1442,7 +1442,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10837,7 +10837,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ "Percorso locale alla cartella principale del server video. Soltanto i file "
+--- ardour.orig/gtk2_ardour/po/nn.po
++++ ardour/gtk2_ardour/po/nn.po
+@@ -1452,7 +1452,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10750,7 +10750,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/pl.po
++++ ardour/gtk2_ardour/po/pl.po
+@@ -1386,7 +1386,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10536,7 +10536,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/pt.po
++++ ardour/gtk2_ardour/po/pt.po
+@@ -1394,7 +1394,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10533,7 +10533,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/pt_PT.po
++++ ardour/gtk2_ardour/po/pt_PT.po
+@@ -1370,7 +1370,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10507,7 +10507,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/ru.po
++++ ardour/gtk2_ardour/po/ru.po
+@@ -1549,7 +1549,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -11043,7 +11043,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ "Локальный путь к корневому докум. видеосервера. Только файлы ниже этого "
+--- ardour.orig/gtk2_ardour/po/sv.po
++++ ardour/gtk2_ardour/po/sv.po
+@@ -1369,7 +1369,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10509,7 +10509,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ 
+--- ardour.orig/gtk2_ardour/po/zh.po
++++ ardour/gtk2_ardour/po/zh.po
+@@ -1516,7 +1516,7 @@
+ 
+ #: ardour_ui.cc:3728
+ msgid ""
+-"If this seems suprising, \n"
++"If this seems surprising, \n"
+ "check for any existing snapshots.\n"
+ "These may still include regions that\n"
+ "require some unused files to continue to exist."
+@@ -10937,7 +10937,7 @@
+ "Local path to the video-server document-root. Only files below this "
+ "directory will be accessible by the video-server. If the server run on a "
+ "remote host, it should point to a network mounted folder of the server's "
+-"docroot or be left empty if it is unvailable. It is used for the local video-"
++"docroot or be left empty if it is unavailable. It is used for the local video-"
+ "monitor and file-browsing when opening/adding a video file."
+ msgstr ""
+ "视频服务器文档根的本地路径。视频服务器仅访问这个目录下的文件。如果服务器运行"
+--- ardour.orig/gtk2_ardour/rc_option_editor.cc
++++ ardour/gtk2_ardour/rc_option_editor.cc
+@@ -1582,7 +1582,7 @@
+ 		t->attach (*l, 1, 2, 3, 4, FILL);
+ 		t->attach (_video_server_docroot_entry, 2, 4, 3, 4);
+ 		Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
+-					    _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
++					    _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+ 
+ 		t->attach (_show_video_export_info_button, 1, 4, 4, 5);
+ 		_show_video_export_info_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_export_info_toggled));
diff --git a/debian/patches/series b/debian/patches/series
index 47db5c5..eb0dcc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0050-log-stdout.patch
 060-warn-video-timeline.patch
 0070-spelling.patch
+0080-more-spelling.patch

-- 
ardour Debian packaging

