[SCM] hydrogen/master: Add spelling patch.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Nov 10 22:17:49 UTC 2016
The following commit has been merged in the master branch:
commit e03a708f82550a95ddc3400d615077bee8901b0b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Nov 10 23:17:38 2016 +0100
Add spelling patch.
diff --git a/debian/patches/1010-spelling.patch b/debian/patches/1010-spelling.patch
new file mode 100644
index 0000000..9cd1350
--- /dev/null
+++ b/debian/patches/1010-spelling.patch
@@ -0,0 +1,176 @@
+Description: Fix some spelling.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: hydrogen/src/core/src/IO/jack_output.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/IO/jack_output.cpp
++++ hydrogen/src/core/src/IO/jack_output.cpp
+@@ -152,13 +152,13 @@ int JackOutput::connect()
+ INFOLOG( "Could not connect so saved out-ports. Connecting to first pair of in-ports" );
+ const char ** portnames = jack_get_ports ( client, NULL, NULL, JackPortIsInput );
+ if ( !portnames || !portnames[0] || !portnames[1] ) {
+- ERRORLOG( "Could't locate two Jack input port" );
++ ERRORLOG( "Couldn't locate two Jack input port" );
+ Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
+ return 2;
+ }
+ if ( jack_connect( client, jack_port_name( output_port_1 ), portnames[0] ) != 0 ||
+ jack_connect( client, jack_port_name( output_port_2 ), portnames[1] ) != 0 ) {
+- ERRORLOG( "Could't connect to first pair of Jack input ports" );
++ ERRORLOG( "Couldn't connect to first pair of Jack input ports" );
+ Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
+ return 2;
+ }
+Index: hydrogen/src/core/src/IO/midi_input.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/IO/midi_input.cpp
++++ hydrogen/src/core/src/IO/midi_input.cpp
+@@ -254,7 +254,7 @@ void MidiInput::handleNoteOnMessage( con
+ else if(Preferences::get_instance()->m_bMidiFixedMapping ){
+ pInstr = instrList->findMidiNote( nNote );
+ if(pInstr == NULL) {
+- ERRORLOG( QString( "Can't find correponding Intrument for note %1" ).arg( nNote ));
++ ERRORLOG( QString( "Can't find corresponding Instrument for note %1" ).arg( nNote ));
+ return;
+ }
+ nInstrument = instrList->index(pInstr);
+Index: hydrogen/src/core/src/helpers/legacy.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/helpers/legacy.cpp
++++ hydrogen/src/core/src/helpers/legacy.cpp
+@@ -106,7 +106,7 @@ Drumkit* Legacy::load_drumkit( const QSt
+ DEBUGLOG( "Using back compatibility code. filename node found" );
+ QString sFilename = instrument_node.read_string( "filename", "" );
+ if( sFilename.isEmpty() ) {
+- ERRORLOG( "filename back compability node is empty" );
++ ERRORLOG( "filename back compatibility node is empty" );
+ } else {
+
+ Sample* sample = new Sample( dk_path+"/"+sFilename );
+Index: hydrogen/src/core/src/helpers/xml.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/helpers/xml.cpp
++++ hydrogen/src/core/src/helpers/xml.cpp
+@@ -159,7 +159,7 @@ bool XMLDoc::write( const QString& filep
+ {
+ QFile file( filepath );
+ if ( !file.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ) ) {
+- ERRORLOG( QString( "Unable to open %1 for writting" ).arg( filepath ) );
++ ERRORLOG( QString( "Unable to open %1 for writing" ).arg( filepath ) );
+ return false;
+ }
+ QTextStream out( &file );
+Index: hydrogen/src/core/src/lilypond/lilypond.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/lilypond/lilypond.cpp
++++ hydrogen/src/core/src/lilypond/lilypond.cpp
+@@ -30,7 +30,7 @@
+ * It contains the notation style (states the position of notes), and for this
+ * it follows the "Guide to Standardized Drumset Notation" by Norman Weinberg.
+ *
+- * Note that the GM-kit uses two unconventionnal intruments: "Stick" and
++ * Note that the GM-kit uses two unconventionnal instruments: "Stick" and
+ * "Hand Clap", so for those I did what I could and used the recommended
+ * triangle notehead to distinguish them for drum and cymbal notation.
+ */
+Index: hydrogen/src/core/src/midi_action.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/midi_action.cpp
++++ hydrogen/src/core/src/midi_action.cpp
+@@ -87,7 +87,7 @@ bool setSong( int songnumber ) {
+ * in midi_input.cpp .
+ *
+ * Each action has two independ parameters. The two parameters are optional and
+-* can be used to carry additional informations, which mean
++* can be used to carry additional information, which mean
+ * only something to this very Action. They can have totally different meanings for other Actions.
+ * Example: parameter1 is the Mixer strip and parameter 2 a multiplier for the volume change on this strip
+ *
+Index: hydrogen/src/core/src/preferences.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/preferences.cpp
++++ hydrogen/src/core/src/preferences.cpp
+@@ -102,7 +102,7 @@ Preferences::Preferences()
+
+ char * ladpath = getenv( "LADSPA_PATH" ); // read the Environment variable LADSPA_PATH
+ if ( ladpath ) {
+- INFOLOG( "Found LADSPA_PATH enviroment variable" );
++ INFOLOG( "Found LADSPA_PATH environment variable" );
+ QString sLadspaPath = QString::fromLocal8Bit(ladpath);
+ int pos;
+ while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
+Index: hydrogen/src/gui/src/ExportSongDialog.cpp
+===================================================================
+--- hydrogen.orig/src/gui/src/ExportSongDialog.cpp
++++ hydrogen/src/gui/src/ExportSongDialog.cpp
+@@ -66,7 +66,7 @@ ExportSongDialog::ExportSongDialog(QWidg
+ setWindowTitle( trUtf8( "Export song" ) );
+
+ exportTypeCombo->addItem(trUtf8("Export to a single track"));
+- exportTypeCombo->addItem(trUtf8("Export to seperate tracks"));
++ exportTypeCombo->addItem(trUtf8("Export to separate tracks"));
+ exportTypeCombo->addItem(trUtf8("Both"));
+
+ HydrogenApp::get_instance()->addEventListener( this );
+Index: hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
+===================================================================
+--- hydrogen.orig/src/gui/src/PatternEditor/DrumPatternEditor.cpp
++++ hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
+@@ -92,7 +92,7 @@ void DrumPatternEditor::updateEditor()
+ // check engine state
+ int state = engine->getState();
+ if ( (state != STATE_READY) && (state != STATE_PLAYING) ) {
+- ERRORLOG( "FIXME: skipping pattern editor update (state shoud be READY or PLAYING)" );
++ ERRORLOG( "FIXME: skipping pattern editor update (state should be READY or PLAYING)" );
+ return;
+ }
+
+Index: hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
+===================================================================
+--- hydrogen.orig/src/gui/src/SampleEditor/SampleEditor_UI.ui
++++ hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
+@@ -641,7 +641,7 @@ p, li { white-space: pre-wrap; }
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 4 default processing options</p>
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 5 equivalent to --no-lamination --window-short (may be good for drums)</p>
+ <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more informations about you can find here:</p>
++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more information about you can find here:</p>
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.breakfastquay.com/rubberband/ "><span style=" text-decoration: underline; color:#0000ff;">http://www.breakfastquay.com/rubberband/ </span></a></p></body></html></string>
+ </property>
+ <item>
+Index: hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
+===================================================================
+--- hydrogen.orig/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
++++ hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
+@@ -493,7 +493,7 @@ void SoundLibraryPanel::on_drumkitLoadAc
+ bool conditionalLoad = false;
+ bool hasNotes = false;
+
+- INFOLOG("Old kit has " + QString::number( oldCount ) + " intruments, new one has " + QString::number( newCount ) );
++ INFOLOG("Old kit has " + QString::number( oldCount ) + " instruments, new one has " + QString::number( newCount ) );
+
+ if ( newCount < oldCount )
+ {
+@@ -520,7 +520,7 @@ void SoundLibraryPanel::on_drumkitLoadAc
+ QMessageBox msgBox;
+ msgBox.setWindowTitle("Hydrogen");
+ msgBox.setIcon( QMessageBox::Warning );
+- msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new intruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
++ msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new instruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
+
+ msgBox.setStandardButtons(QMessageBox::Save);
+ msgBox.setButtonText(QMessageBox::Save, trUtf8("Keep"));
+Index: hydrogen/src/core/src/local_file_mgr.cpp
+===================================================================
+--- hydrogen.orig/src/core/src/local_file_mgr.cpp
++++ hydrogen/src/core/src/local_file_mgr.cpp
+@@ -1078,7 +1078,7 @@ bool LocalFileMng::checkTinyXMLCompatMod
+ return false;
+ } else {
+ _WARNINGLOG( QString("File '%1' is being read in "
+- "TinyXML compatability mode")
++ "TinyXML compatibility mode")
+ .arg(filename) );
+ return true;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index bd1e47f..d8a7b7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
1006_porttime.patch
ftbfs-gcc-4.7.diff
#1008-desktop.patch
+1010-spelling.patch
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list