diff --git a/ChangeLog b/ChangeLog index 973857c45..95cc16ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-08-23 Paul Giblock + + * plugins/bit_invader/bit_invader.cpp: + * plugins/vibed/vibed.cpp: + * plugins/triple_oscillator/triple_oscillator.cpp: + * plugins/audio_file_processor/audio_file_processor.cpp: + * src/gui/piano_roll.cpp: + * src/gui/lfo_controller_dialog.cpp: + * src/gui/main_window.cpp: + * src/gui/song_editor.cpp: + * src/gui/widgets/instrument_sound_shaping_view.cpp: + * src/gui/widgets/envelope_and_lfo_view.cpp: + * src/gui/widgets/instrument_function_views.cpp: + * src/gui/widgets/effect_view.cpp: + * src/gui/automation_editor.cpp: + * src/gui/bb_editor.cpp: + * src/core/envelope_and_lfo_parameters.cpp: + * src/core/mmp.cpp: + Fix English grammer, punctuation, and hard to read strings + 2008-08-23 Tobias Doerffel * src/gui/automatable_model_view.cpp: diff --git a/data/locale/en.ts b/data/locale/en.ts index c182a3c42..9f4316af3 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -164,7 +164,7 @@ http://lmms.sourceforge.net - An arpeggio is a type of playing (especially plucked) instruments, which makes the music much livelier. The strings of such instruments (e.g. harps) are plucked like chords, the only difference is, that this is done in a sequential order, so the notes are not played at the same time. Typical arpeggios are major or minor triads. But there're a lot of other possible chords, you can select. + An arpeggio is a type of playing (especially plucked) instruments, which makes the music much livelier. The strings of such instruments (e.g. harps) are plucked like chords, the only difference is, that this is done in a sequential order, so the notes are not played at the same time. Typical arpeggios are major or minor triads. But there are a lot of other possible chords to select. diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index b69b63adf..3c914a08c 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -333,12 +333,11 @@ audioFileProcessorView::audioFileProcessorView( instrument * _instrument, toolTip::add( m_openAudioFileButton, tr( "Open other sample" ) ); m_openAudioFileButton->setWhatsThis( - tr( "Click here, if you want to open another audio-file. After " - "clicking on this button, a file-open-dialog appears " - "and you can select your file. Settings like Looping-" - "Mode, start- and end-point, amplify-value and so on " - "are not reset, so please don't wonder if your sample " - "doesn't sound like the original one..." ) ); + tr( "Click here, if you want to open another audio-file. " + "A dialog will appear where you can select your file. " + "Settings like looping-mode, start and end-points, " + "amplify-value, and so on are not reset. So, it may not " + "sound like the original sample.") ); m_reverseButton = new pixmapButton( this ); m_reverseButton->setCheckable( TRUE ); @@ -363,10 +362,10 @@ audioFileProcessorView::audioFileProcessorView( instrument * _instrument, toolTip::add( m_loopButton, tr( "Loop sample at start- and end-point" ) ); m_loopButton->setWhatsThis( - tr( "Here you can set, whether Looping-Mode is enabled. If " - "enabled, AudioFileProcessor loops between start- and " - "end-point of a sample until the whole note is played. " - "This is useful for things like string- and choir-" + tr( "Here you can set, whether looping-mode is enabled. If " + "enabled, AudioFileProcessor loops between start and " + "end-points of a sample until the whole note is played. " + "This is useful for things like string and choir " "samples." ) ); m_ampKnob = new knob( knobStyled, this ); @@ -375,7 +374,7 @@ audioFileProcessorView::audioFileProcessorView( instrument * _instrument, m_ampKnob->setFixedSize( 37, 47 ); m_ampKnob->setHintText( tr( "Amplify:" )+" ", "%" ); m_ampKnob->setWhatsThis( - tr( "With this knob you can set the amplify-ratio. When you " + tr( "With this knob you can set the amplify ratio. When you " "set a value of 100% your sample isn't changed. " "Otherwise it will be amplified up or down (your " "actual sample-file isn't touched!)" ) ); @@ -386,9 +385,9 @@ audioFileProcessorView::audioFileProcessorView( instrument * _instrument, m_startKnob->setWhatsThis( tr( "With this knob you can set the point where " "AudioFileProcessor should begin playing your sample. " - "If you enable Looping-Mode, this is the point to " + "If you enable looping-mode, this is the point to " "which AudioFileProcessor returns if a note is longer " - "than the sample between start- and end-point." ) ); + "than the sample between the start and end-points." ) ); m_endKnob = new audioFileKnob( this ); m_endKnob->move( 119, 108 ); @@ -396,9 +395,9 @@ audioFileProcessorView::audioFileProcessorView( instrument * _instrument, m_endKnob->setWhatsThis( tr( "With this knob you can set the point where " "AudioFileProcessor should stop playing your sample. " - "If you enable Looping-Mode, this is the point where " + "If you enable looping-mode, this is the point where " "AudioFileProcessor returns if a note is longer than " - "the sample between start- and end-point." ) ); + "the sample between the start and end-points." ) ); setAcceptDrops( TRUE ); } diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index d6067f758..335a61cf0 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -334,8 +334,8 @@ bitInvaderView::bitInvaderView( instrument * _instrument, m_graph->move(53,118); // 55,120 - 2px border m_graph->setAutoFillBackground( TRUE ); - toolTip::add( m_graph, tr ( "Draw your own waveform here" - "by dragging your mouse onto this graph" + toolTip::add( m_graph, tr ( "Draw your own waveform here " + "by dragging your mouse on this graph." )); @@ -352,8 +352,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, sinWaveBtn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); toolTip::add( sinWaveBtn, - tr( "Click here if you want a sine-wave for " - "current oscillator." ) ); + tr( "Click for a sine-wave." ) ); triangleWaveBtn = new pixmapButton( this, tr( "Triangle wave" ) ); triangleWaveBtn->move( 188, 136 ); @@ -362,8 +361,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, triangleWaveBtn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); toolTip::add( triangleWaveBtn, - tr( "Click here if you want a triangle-wave " - "for current oscillator." ) ); + tr( "Click here for a triangle-wave." ) ); sawWaveBtn = new pixmapButton( this, tr( "Saw wave" ) ); sawWaveBtn->move( 188, 152 ); @@ -372,8 +370,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, sawWaveBtn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); toolTip::add( sawWaveBtn, - tr( "Click here if you want a saw-wave for " - "current oscillator." ) ); + tr( "Click here for a saw-wave." ) ); sqrWaveBtn = new pixmapButton( this, tr( "Square wave" ) ); sqrWaveBtn->move( 188, 168 ); @@ -382,8 +379,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, sqrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); toolTip::add( sqrWaveBtn, - tr( "Click here if you want a square-wave for " - "current oscillator." ) ); + tr( "Click here for a square-wave." ) ); whiteNoiseWaveBtn = new pixmapButton( this, tr( "White noise wave" ) ); @@ -393,8 +389,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, whiteNoiseWaveBtn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); toolTip::add( whiteNoiseWaveBtn, - tr( "Click here if you want a white-noise for " - "current oscillator." ) ); + tr( "Click here for white-noise." ) ); usrWaveBtn = new pixmapButton( this, tr( "User defined wave" ) ); usrWaveBtn->move( 188, 200 ); @@ -403,8 +398,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, usrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "usr_wave_inactive" ) ); toolTip::add( usrWaveBtn, - tr( "Click here if you want a user-defined " - "wave-shape for current oscillator." ) ); + tr( "Click here for a user-defined shape." ) ); smoothBtn = new pixmapButton( this, tr( "Smooth" ) ); smoothBtn->move( 55, 225 ); @@ -414,8 +408,7 @@ bitInvaderView::bitInvaderView( instrument * _instrument, "smooth" ) ); smoothBtn->setChecked( TRUE ); toolTip::add( smoothBtn, - tr( "Click here to " - "smooth waveform." ) ); + tr( "Click here to smooth waveform." ) ); m_interpolationToggle = new ledCheckBox( "Interpolation", this, diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp index a9e328179..326e135bd 100644 --- a/plugins/triple_oscillator/triple_oscillator.cpp +++ b/plugins/triple_oscillator/triple_oscillator.cpp @@ -456,7 +456,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "pm_active" ) ); pm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_inactive" ) ); - toolTip::add( pm_osc1_btn, tr( "use phase modulation for " + toolTip::add( pm_osc1_btn, tr( "Use phase modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); @@ -466,7 +466,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "am_active" ) ); am_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "am_inactive" ) ); - toolTip::add( am_osc1_btn, tr( "use amplitude modulation for " + toolTip::add( am_osc1_btn, tr( "Use amplitude modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); @@ -476,7 +476,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "mix_active" ) ); mix_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_inactive" ) ); - toolTip::add( mix_osc1_btn, tr( "mix output of oscillator 1 & 2" ) ); + toolTip::add( mix_osc1_btn, tr( "Mix output of oscillator 1 & 2" ) ); pixmapButton * sync_osc1_btn = new pixmapButton( this, NULL ); sync_osc1_btn->move( mod_x + 105, mod1_y ); @@ -484,7 +484,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "sync_active" ) ); sync_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sync_inactive" ) ); - toolTip::add( sync_osc1_btn, tr( "synchronize oscillator 1 with " + toolTip::add( sync_osc1_btn, tr( "Synchronize oscillator 1 with " "oscillator 2" ) ); pixmapButton * fm_osc1_btn = new pixmapButton( this, NULL ); @@ -493,7 +493,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "fm_active" ) ); fm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_inactive" ) ); - toolTip::add( fm_osc1_btn, tr( "use frequency modulation for " + toolTip::add( fm_osc1_btn, tr( "Use frequency modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); @@ -512,7 +512,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "pm_active" ) ); pm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_inactive" ) ); - toolTip::add( pm_osc2_btn, tr( "use phase modulation for " + toolTip::add( pm_osc2_btn, tr( "Use phase modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); @@ -522,7 +522,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "am_active" ) ); am_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "am_inactive" ) ); - toolTip::add( am_osc2_btn, tr( "use amplitude modulation for " + toolTip::add( am_osc2_btn, tr( "Use amplitude modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); @@ -532,7 +532,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "mix_active" ) ); mix_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_inactive" ) ); - toolTip::add( mix_osc2_btn, tr("mix output of oscillator 2 & 3" ) ); + toolTip::add( mix_osc2_btn, tr("Mix output of oscillator 2 & 3" ) ); pixmapButton * sync_osc2_btn = new pixmapButton( this, NULL ); sync_osc2_btn->move( mod_x + 105, mod2_y ); @@ -540,7 +540,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "sync_active" ) ); sync_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sync_inactive" ) ); - toolTip::add( sync_osc2_btn, tr( "synchronize oscillator 2 with " + toolTip::add( sync_osc2_btn, tr( "Synchronize oscillator 2 with " "oscillator 3" ) ); pixmapButton * fm_osc2_btn = new pixmapButton( this, NULL ); @@ -549,7 +549,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "fm_active" ) ); fm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_inactive" ) ); - toolTip::add( fm_osc2_btn, tr( "use frequency modulation for " + toolTip::add( fm_osc2_btn, tr( "Use frequency modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); @@ -658,7 +658,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "detuning specifies the size of the difference " "between the phase-offset of left and right " "channel. This is very good for creating wide " - "stereo-sounds." ).arg( i+1 ) ); + "stereo sounds." ).arg( i+1 ) ); int btn_y = 96 + i * osc_h; @@ -670,7 +670,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, sin_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sin_shape_inactive" ) ); toolTip::add( sin_wave_btn, - tr( "Click here if you want a sine-wave for " + tr( "Use a sine-wave for " "current oscillator." ) ); pixmapButton * triangle_wave_btn = @@ -681,7 +681,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, triangle_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "triangle_shape_inactive" ) ); toolTip::add( triangle_wave_btn, - tr( "Click here if you want a triangle-wave " + tr( "Use a triangle-wave " "for current oscillator." ) ); pixmapButton * saw_wave_btn = new pixmapButton( this, NULL ); @@ -691,7 +691,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, saw_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "saw_shape_inactive" ) ); toolTip::add( saw_wave_btn, - tr( "Click here if you want a saw-wave for " + tr( "Use a saw-wave for " "current oscillator." ) ); pixmapButton * sqr_wave_btn = new pixmapButton( this, NULL ); @@ -701,7 +701,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, sqr_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "square_shape_inactive" ) ); toolTip::add( sqr_wave_btn, - tr( "Click here if you want a square-wave for " + tr( "Use a square-wave for " "current oscillator." ) ); pixmapButton * moog_saw_wave_btn = @@ -712,7 +712,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, moog_saw_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "moog_saw_shape_inactive" ) ); toolTip::add( moog_saw_wave_btn, - tr( "Click here if you want a moog-saw-wave " + tr( "Use a moog-like saw-wave " "for current oscillator." ) ); pixmapButton * exp_wave_btn = new pixmapButton( this, NULL ); @@ -722,7 +722,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, exp_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "exp_shape_inactive" ) ); toolTip::add( exp_wave_btn, - tr( "Click here if you want an exponential " + tr( "Use an exponential " "wave for current oscillator." ) ); pixmapButton * white_noise_btn = new pixmapButton( this, NULL ); @@ -732,7 +732,7 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, white_noise_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "white_noise_shape_inactive" ) ); toolTip::add( white_noise_btn, - tr( "Click here if you want a white-noise for " + tr( "Use white-noise for " "current oscillator." ) ); pixmapButton * uwb = new pixmapButton( this, NULL ); @@ -741,8 +741,8 @@ tripleOscillatorView::tripleOscillatorView( instrument * _instrument, "usr_shape_active" ) ); uwb->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "usr_shape_inactive" ) ); - toolTip::add( uwb, tr( "Click here if you want a user-defined " - "wave-shape for current oscillator." ) ); + toolTip::add( uwb, tr( "Use a user-defined " + "waveform for current oscillator." ) ); automatableButtonGroup * wsbg = new automatableButtonGroup( this ); diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index f11673b8e..e77f9a773 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -560,7 +560,7 @@ vibedView::vibedView( instrument * _instrument, m_sinWaveBtn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); toolTip::add( m_sinWaveBtn, - tr( "Click here if you want a sine-wave for " + tr( "Use a sine-wave for " "current oscillator." ) ); connect( m_sinWaveBtn, SIGNAL (clicked ( void ) ), this, SLOT ( sinWaveClicked( void ) ) ); @@ -573,7 +573,7 @@ vibedView::vibedView( instrument * _instrument, m_triangleWaveBtn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); toolTip::add( m_triangleWaveBtn, - tr( "Click here if you want a triangle-wave " + tr( "Use a triangle-wave " "for current oscillator." ) ); connect( m_triangleWaveBtn, SIGNAL ( clicked ( void ) ), this, SLOT ( triangleWaveClicked( ) ) ); @@ -586,7 +586,7 @@ vibedView::vibedView( instrument * _instrument, m_sawWaveBtn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); toolTip::add( m_sawWaveBtn, - tr( "Click here if you want a saw-wave for " + tr( "Use a saw-wave for " "current oscillator." ) ); connect( m_sawWaveBtn, SIGNAL (clicked ( void ) ), this, SLOT ( sawWaveClicked( void ) ) ); @@ -599,7 +599,7 @@ vibedView::vibedView( instrument * _instrument, m_sqrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); toolTip::add( m_sqrWaveBtn, - tr( "Click here if you want a square-wave for " + tr( "Use a square-wave for " "current oscillator." ) ); connect( m_sqrWaveBtn, SIGNAL ( clicked ( void ) ), this, SLOT ( sqrWaveClicked( void ) ) ); @@ -612,7 +612,7 @@ vibedView::vibedView( instrument * _instrument, m_whiteNoiseWaveBtn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); toolTip::add( m_whiteNoiseWaveBtn, - tr( "Click here if you want a white-noise for " + tr( "Use white-noise for " "current oscillator." ) ); connect( m_whiteNoiseWaveBtn, SIGNAL ( clicked ( void ) ), this, SLOT ( noiseWaveClicked( void ) ) ); @@ -625,8 +625,8 @@ vibedView::vibedView( instrument * _instrument, m_usrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "usr_wave_inactive" ) ); toolTip::add( m_usrWaveBtn, - tr( "Click here if you want a user-defined " - "wave-shape for current oscillator." ) ); + tr( "Use a user-defined " + "waveform for current oscillator." ) ); connect( m_usrWaveBtn, SIGNAL ( clicked ( void ) ), this, SLOT ( usrWaveClicked( void ) ) ); diff --git a/src/core/envelope_and_lfo_parameters.cpp b/src/core/envelope_and_lfo_parameters.cpp index 658ed9095..3d63eb39e 100644 --- a/src/core/envelope_and_lfo_parameters.cpp +++ b/src/core/envelope_and_lfo_parameters.cpp @@ -52,26 +52,26 @@ envelopeAndLFOParameters::envelopeAndLFOParameters( model * _parent ) : model( _parent ), m_used( FALSE ), - m_predelayModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Predelay-time" ) ), - m_attackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Attack-time" ) ), - m_holdModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Hold-time" ) ), - m_decayModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Decay-time" ) ), - m_sustainModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Sustain-level" ) ), - m_releaseModel( 0.1, 0.0, 1.0, 0.001, this, tr( "Release-time" ) ), - m_amountModel( 0.0, -1.0, 1.0, 0.005, this, tr( "Modulation amount" ) ), + m_predelayModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Predelay" ) ), + m_attackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Attack" ) ), + m_holdModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Hold" ) ), + m_decayModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Decay" ) ), + m_sustainModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Sustain" ) ), + m_releaseModel( 0.1, 0.0, 1.0, 0.001, this, tr( "Release" ) ), + m_amountModel( 0.0, -1.0, 1.0, 0.005, this, tr( "Modulation" ) ), m_valueForZeroAmount( _value_for_zero_amount ), m_pahdEnv( NULL ), m_rEnv( NULL ), m_lfoPredelayModel( 0.0, 0.0, 1.0, 0.001, this, - tr( "LFO-predelay-time" ) ), - m_lfoAttackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "LFO-attack-time" ) ), + tr( "LFO Predelay" ) ), + m_lfoAttackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "LFO Attack" ) ), m_lfoSpeedModel( 0.1, 0.001, 1.0, 0.0001, SECS_PER_LFO_OSCILLATION * 1000.0, this, - tr( "LFO-speed" ) ), + tr( "LFO speed" ) ), m_lfoAmountModel( 0.0, -1.0, 1.0, 0.005, this, - tr( "LFO-modulation-amount" ) ), + tr( "LFO Modulation" ) ), m_lfoWaveModel( SineWave, 0, NumLfoShapes, this, - tr( "LFO wave shape" ) ), + tr( "LFO Wave Shape" ) ), m_x100Model( FALSE, this, tr( "Freq x 100" ) ), m_controlEnvAmountModel( FALSE, this, tr( "Modulate Env-Amount" ) ), m_lfoFrame( 0 ), diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp index 194122d07..395d5257d 100644 --- a/src/core/mmp.cpp +++ b/src/core/mmp.cpp @@ -133,12 +133,9 @@ multimediaProject::multimediaProject( const QString & _in_file_name, QMessageBox::critical( NULL, songEditor::tr( "Error in " "multimedia-project" ), songEditor::tr( "The multimedia-" - "project %1 seems to " - "contain errors. LMMS " - "will try its best " - "to recover as much as " - "possible data from " - "this file." + "project %1 seems to contain errors. LMMS " + "will try its best to recover as much " + "data as possible data from this file." ).arg( _in_file_name ) ); return; } diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index 072e12b72..b3de5d00c 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -154,12 +154,12 @@ automationEditor::automationEditor( void ) : this, SLOT( stop() ), m_toolBar ); m_playButton->setWhatsThis( - tr( "Click here, if you want to play the current pattern. " - "This is useful while editing it. The pattern is " - "automatically looped when its end is reached." ) ); + tr( "Click here if you want to play the current pattern. " + "This is useful while editing it. The pattern is " + "automatically looped when the end is reached." ) ); m_stopButton->setWhatsThis( - tr( "Click here, if you want to stop playing of current " - "pattern." ) ); + tr( "Click here if you want to stop playing of the " + "current pattern." ) ); @@ -212,19 +212,19 @@ automationEditor::automationEditor( void ) : tool_button_group->setExclusive( TRUE ); m_drawButton->setWhatsThis( - tr( "If you click here, draw-mode will be activated. In this " - "mode you can add and move single values. This " - "is the default-mode which is used most of the time. " + tr( "Click here and draw-mode will be activated. In this " + "mode you can add and move single values. This " + "is the default mode which is used most of the time. " "You can also press 'Shift+D' on your keyboard to " "activate this mode." ) ); m_eraseButton->setWhatsThis( - tr( "If you click here, erase-mode will be activated. In this " + tr( "Click here and erase-mode will be activated. In this " "mode you can erase single values. You can also press " "'Shift+E' on your keyboard to activate this mode." ) ); m_selectButton->setWhatsThis( - tr( "If you click here, select-mode will be activated. In this " + tr( "Click here and select-mode will be activated. In this " "mode you can select values. This is neccessary " - "if you want to cut, copy, paste, delete or move " + "if you want to cut, copy, paste, delete, or move " "values. You can also press 'Shift+S' on your keyboard " "to activate this mode." ) ); m_moveButton->setWhatsThis( @@ -250,17 +250,16 @@ automationEditor::automationEditor( void ) : m_toolBar ); m_cutButton->setWhatsThis( - tr( "If you click here, selected values will be cut into the " - "clipboard. You can paste them anywhere in any pattern " - "by clicking on the paste-button." ) ); + tr( "Click here and selected values will be cut into the " + "clipboard. You can paste them anywhere in any pattern " + "by clicking on the paste button." ) ); m_copyButton->setWhatsThis( - tr( "If you click here, selected values will be copied into " - "the clipboard. You can paste them anywhere in any " - "pattern by clicking on the paste-button." ) ); + tr( "Click here and selected values will be copied into " + "the clipboard. You can paste them anywhere in any " + "pattern by clicking on the paste button." ) ); m_pasteButton->setWhatsThis( - tr( "If you click here, the values from the clipboard will be " - "pasted at the first visible tact." ) ); - + tr( "Click here and the values from the clipboard will be " + "pasted at the first visible measure." ) ); // setup zooming-stuff diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index c63113856..5760c22be 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -69,7 +69,7 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) : this, SLOT( play() ), m_toolBar ); m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), - tr( "Stop playing of current beat/bassline (Space)" ), + tr( "Stop playback of current beat/bassline (Space)" ), this, SLOT( stop() ), m_toolBar ); toolButton * add_bb_track = new toolButton( @@ -86,11 +86,11 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) : m_playButton->setWhatsThis( - tr( "Click here, if you want to play the current " - "beat/bassline. The beat/bassline is automatically " + tr( "Click here to play the current " + "beat/bassline. The beat/bassline is automatically " "looped when its end is reached." ) ); m_stopButton->setWhatsThis( - tr( "Click here, if you want to stop playing of current " + tr( "Click here to stop playing of current " "beat/bassline." ) ); QLabel * l = new QLabel( m_toolBar ); diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp index a275812e2..404942826 100644 --- a/src/gui/lfo_controller_dialog.cpp +++ b/src/gui/lfo_controller_dialog.cpp @@ -99,16 +99,16 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent m_amountKnob->setHintText( tr( "Modulation amount:" ) + " ", "" ); m_amountKnob->setWhatsThis( tr( "Use this knob for setting modulation amount of the " - "current LFO. The bigger this value the more the " - "selected size (e.g. volume or cutoff-frequency) will " - "be influenced by this LFO." ) ); + "LFO. The bigger this value, the more the connected " + "control (e.g. volume or cutoff-frequency) will " + "be influenced by the LFO." ) ); m_phaseKnob = new knob( knobBright_26, this ); m_phaseKnob->setLabel( tr( "PHS" ) ); m_phaseKnob->move( CD_LFO_PHASE_CD_KNOB_X, CD_LFO_CD_KNOB_Y ); m_phaseKnob->setHintText( tr( "Phase offset:" ) + " ", "" + tr( "degrees" ) ); m_phaseKnob->setWhatsThis( - tr( "With this knob you can set the phase-offset of " + tr( "With this knob you can set the phase offset of " "the LFO. That means you can move the " "point within an oscillation where the " "oscillator begins to oscillate. For example " @@ -124,8 +124,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent sin_wave_btn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); toolTip::add( sin_wave_btn, - tr( "Click here if you want a sine-wave for " - "current oscillator." ) ); + tr( "Click here for a sine-wave for." ) ); pixmapButton * triangle_wave_btn = new pixmapButton( this, NULL ); @@ -135,8 +134,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent triangle_wave_btn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); toolTip::add( triangle_wave_btn, - tr( "Click here if you want a triangle-wave " - "for current oscillator." ) ); + tr( "Click here for a triangle-wave." ) ); pixmapButton * saw_wave_btn = new pixmapButton( this, NULL ); saw_wave_btn->move( CD_LFO_SHAPES_X + 30, CD_LFO_SHAPES_Y ); @@ -145,8 +143,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent saw_wave_btn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); toolTip::add( saw_wave_btn, - tr( "Click here if you want a saw-wave for " - "current oscillator." ) ); + tr( "Click here for a saw-wave." ) ); pixmapButton * sqr_wave_btn = new pixmapButton( this, NULL ); sqr_wave_btn->move( CD_LFO_SHAPES_X + 45, CD_LFO_SHAPES_Y ); @@ -155,8 +152,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent sqr_wave_btn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); toolTip::add( sqr_wave_btn, - tr( "Click here if you want a square-wave for " - "current oscillator." ) ); + tr( "Click here for a square-wave." ) ); pixmapButton * moog_saw_wave_btn = new pixmapButton( this, NULL ); @@ -166,8 +162,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent moog_saw_wave_btn->setInactiveGraphic( embed::getIconPixmap( "moog_saw_wave_inactive" ) ); toolTip::add( moog_saw_wave_btn, - tr( "Click here if you want a moog-saw-wave " - "for current oscillator." ) ); + tr( "Click here for a a moog saw-wave." ) ); pixmapButton * exp_wave_btn = new pixmapButton( this, NULL ); exp_wave_btn->move( CD_LFO_SHAPES_X + 15, CD_LFO_SHAPES_Y + 15 ); @@ -176,8 +171,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent exp_wave_btn->setInactiveGraphic( embed::getIconPixmap( "exp_wave_inactive" ) ); toolTip::add( exp_wave_btn, - tr( "Click here if you want an exponential " - "wave for current oscillator." ) ); + tr( "Click here for an exponential wave." ) ); pixmapButton * white_noise_btn = new pixmapButton( this, NULL ); white_noise_btn->move( CD_LFO_SHAPES_X + 30, CD_LFO_SHAPES_Y + 15 ); @@ -186,8 +180,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent white_noise_btn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); toolTip::add( white_noise_btn, - tr( "Click here if you want a white-noise for " - "current oscillator." ) ); + tr( "Click here for white-noise for." ) ); pixmapButton * uwb = new pixmapButton( this, NULL ); uwb->move( CD_LFO_SHAPES_X + 45, CD_LFO_SHAPES_Y + 15 ); @@ -196,8 +189,8 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent uwb->setInactiveGraphic( embed::getIconPixmap( "usr_wave_inactive" ) ); uwb->setEnabled( false ); - toolTip::add( uwb, tr( "Click here if you want a user-defined " - "wave-shape for current oscillator." ) ); + toolTip::add( uwb, tr( "Click here for a user-defined " + "shape." ) ); m_waveBtnGrp = new automatableButtonGroup( this ); m_waveBtnGrp->addButton( sin_wave_btn ); diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp index 5270abb62..c212e79a0 100644 --- a/src/gui/main_window.cpp +++ b/src/gui/main_window.cpp @@ -366,7 +366,7 @@ void mainWindow::finalize( void ) "edit song-playlist and specify when which track " "should be played. " "You can also insert and move samples (e.g. " - "rap-samples) directly into the playlist." ) ); + "rap samples) directly into the playlist." ) ); toolButton * bb_editor_window = new toolButton( @@ -379,9 +379,9 @@ void mainWindow::finalize( void ) bb_editor_window->setWhatsThis( tr( "By pressing this button, you can show or hide the " "Beat+Bassline Editor. The Beat+Bassline Editor is " - "needed for creating beats, opening, adding and " - "removing channels, cutting, copying and pasting " - "beat- and bassline-patterns and other things like " + "needed for creating beats, and for opening, adding, and " + "removing channels, and for cutting, copying and pasting " + "beat and bassline-patterns, and for other things like " "that." ) ); @@ -393,9 +393,9 @@ void mainWindow::finalize( void ) m_toolBar ); piano_roll_window->setShortcut( Qt::Key_F7 ); piano_roll_window->setWhatsThis( - tr( "By pressing this button, you can show or hide the " + tr( "Click here to show or hide the " "Piano-Roll. With the help of the Piano-Roll " - "you can edit melody-patterns in an easy way." + "you can edit melodies in an easy way." ) ); toolButton * automation_editor_window = new toolButton( @@ -407,7 +407,7 @@ void mainWindow::finalize( void ) m_toolBar ); automation_editor_window->setShortcut( Qt::Key_F8 ); automation_editor_window->setWhatsThis( - tr( "By pressing this button, you can show or hide the " + tr( "Click here to show or hide the " "Automation Editor. With the help of the " "Automation Editor you can edit dynamic values " "in an easy way." @@ -420,7 +420,7 @@ void mainWindow::finalize( void ) m_toolBar ); fx_mixer_window->setShortcut( Qt::Key_F9 ); fx_mixer_window->setWhatsThis( - tr( "By pressing this button, you can show or hide the " + tr( "Click here to show or hide the " "FX Mixer. The FX Mixer is a very powerful tool " "for managing effects for your song. You can insert " "effects into different effect-channels." ) ); @@ -433,7 +433,7 @@ void mainWindow::finalize( void ) m_toolBar ); project_notes_window->setShortcut( Qt::Key_F10 ); project_notes_window->setWhatsThis( - tr( "By pressing this button, you can show or hide the " + tr( "Click here to show or hide the " "project notes window. In this window you can put " "down your project notes.") ); diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index 64e490f9f..4e8512483 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -232,25 +232,23 @@ pianoRoll::pianoRoll( void ) : this, SLOT( stop() ), m_toolBar ); m_playButton->setWhatsThis( - tr( "Click here, if you want to play the current pattern. " + tr( "Click here to play the current pattern. " "This is useful while editing it. The pattern is " "automatically looped when its end is reached." ) ); m_recordButton->setWhatsThis( - tr( "Click here, if you want to record notes from a MIDI-" + tr( "Click here to record notes from a MIDI-" "device or the virtual test-piano of the according " "channel-window to the current pattern. When recording " "all notes you play will be written to this pattern " "and you can play and edit them afterwards." ) ); m_recordAccompanyButton->setWhatsThis( - tr( "Click here, if you want to record notes from a MIDI-" + tr( "Click here to record notes from a MIDI-" "device or the virtual test-piano of the according " "channel-window to the current pattern. When recording " "all notes you play will be written to this pattern " "and you will hear the song or BB track in the background." ) ); m_stopButton->setWhatsThis( - tr( "Click here, if you want to stop playing of current " - "pattern." ) ); - + tr( "Click here to stop playback of current pattern." ) ); removeSelection(); @@ -302,23 +300,23 @@ pianoRoll::pianoRoll( void ) : tool_button_group->setExclusive( TRUE ); m_drawButton->setWhatsThis( - tr( "If you click here, draw-mode will be activated. In this " + tr( "Click here and draw mode will be activated. In this " "mode you can add, resize and move single notes. This " - "is the default-mode which is used most of the time. " + "is the default mode which is used most of the time. " "You can also press 'Shift+D' on your keyboard to " "activate this mode." ) ); m_eraseButton->setWhatsThis( - tr( "If you click here, erase-mode will be activated. In this " + tr( "Click here and erase mode will be activated. In this " "mode you can erase single notes. You can also press " "'Shift+E' on your keyboard to activate this mode." ) ); m_selectButton->setWhatsThis( - tr( "If you click here, select-mode will be activated. " + tr( "Click here and select mode will be activated. " "In this mode you can select notes. This is neccessary " "if you want to cut, copy, paste, delete or move " "notes. You can also press 'Shift+S' on your keyboard " "to activate this mode." ) ); m_moveButton->setWhatsThis( - tr( "If you click here, move-mode will be activated. In this " + tr( "Click here and move-mode will be activated. In this " "mode you can move the notes you selected in select-" "mode. You can also press 'Shift+M' on your keyboard " "to activate this mode." ) ); @@ -340,16 +338,16 @@ pianoRoll::pianoRoll( void ) : m_toolBar ); m_cutButton->setWhatsThis( - tr( "If you click here, selected notes will be cut into the " + tr( "Click here and the selected notes will be cut into the " "clipboard. You can paste them anywhere in any pattern " - "by clicking on the paste-button." ) ); + "by clicking on the paste button." ) ); m_copyButton->setWhatsThis( - tr( "If you click here, selected notes will be copied into the " + tr( "Click here and the selected notes will be copied into the " "clipboard. You can paste them anywhere in any pattern " - "by clicking on the paste-button." ) ); + "by clicking on the paste button." ) ); m_pasteButton->setWhatsThis( - tr( "If you click here, the notes from the clipboard will be " - "pasted at the first visible tact." ) ); + tr( "Click here and the notes from the clipboard will be " + "pasted at the first visible measure." ) ); diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 7caf8386f..17384d060 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -92,9 +92,9 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : m_tempoSpinBox->setWhatsThis( tr( "The tempo of a song is specified in beats per minute " "(BPM). If you want to change the tempo of your " - "song, change this value. Every tact has four beats, " - "so the tempo in BPM specifies, how many tacts / 4 " - "should be played within a minute (or how many tacts " + "song, change this value. Every measure has four beats, " + "so the tempo in BPM specifies, how many measures / 4 " + "should be played within a minute (or how many measures " "should be played within four minutes)." ) ); int col = engine::getMainWindow()->addWidgetToToolBar( m_tempoSpinBox, diff --git a/src/gui/widgets/effect_view.cpp b/src/gui/widgets/effect_view.cpp index 3a3fbba3f..6bc169d22 100644 --- a/src/gui/widgets/effect_view.cpp +++ b/src/gui/widgets/effect_view.cpp @@ -68,8 +68,8 @@ effectView::effectView( effect * _model, QWidget * _parent ) : m_wetDry->move( 27, 5 ); m_wetDry->setHintText( tr( "Wet Level:" ) + " ", "" ); m_wetDry->setWhatsThis( tr( "The Wet/Dry knob sets the ratio between " - "the input signal and the effect that " - "shows up in the output." ) ); + "the input signal and the effect signal that " + "forms the output." ) ); m_autoQuit = new tempoSyncKnob( knobBright_26, this ); @@ -79,7 +79,7 @@ effectView::effectView( effect * _model, QWidget * _parent ) : m_autoQuit->setWhatsThis( tr( "The Decay knob controls how many buffers of silence must pass before the " "plugin stops processing. Smaller values will reduce the CPU overhead but " -"run the risk of clipping the tail on delay effects." ) ); +"run the risk of clipping the tail on delay and reverb effects." ) ); m_gate = new knob( knobBright_26, this ); @@ -125,12 +125,12 @@ effectView::effectView( effect * _model, QWidget * _parent ) : "The Wet/Dry knob controls the balance between the input signal and the " "effected signal that is the resulting output from the effect. The input " -"for one stage is the output from the previous stage, so the 'dry' signal " +"for the stage is the output from the previous stage. So, the 'dry' signal " "for effects lower in the chain contains all of the previous effects.\n\n" "The Decay knob controls how long the signal will continue to be processed " "after the notes have been released. The effect will stop processing signals " -"when the signal has dropped below a given threshold for a given length of " +"when the volume has dropped below a given threshold for a given length of " "time. This knob sets the 'given length of time'. Longer times will require " "more CPU, so this number should be set low for most effects. It needs to be " "bumped up for effects that produce lengthy periods of silence, e.g. " diff --git a/src/gui/widgets/envelope_and_lfo_view.cpp b/src/gui/widgets/envelope_and_lfo_view.cpp index 84b6f3de8..91afd5026 100644 --- a/src/gui/widgets/envelope_and_lfo_view.cpp +++ b/src/gui/widgets/envelope_and_lfo_view.cpp @@ -184,7 +184,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : m_lfoPredelayKnob = new knob( knobBright_26, this ); m_lfoPredelayKnob->setLabel( tr( "DEL" ) ); m_lfoPredelayKnob->move( LFO_PREDELAY_KNOB_X, LFO_KNOB_Y ); - m_lfoPredelayKnob->setHintText( tr( "LFO-predelay:" ) + " ", "" ); + m_lfoPredelayKnob->setHintText( tr( "LFO predelay:" ) + " ", "" ); m_lfoPredelayKnob->setWhatsThis( tr( "Use this knob for setting predelay-time of the current " "LFO. The bigger this value the the time until the " @@ -194,7 +194,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : m_lfoAttackKnob = new knob( knobBright_26, this ); m_lfoAttackKnob->setLabel( tr( "ATT" ) ); m_lfoAttackKnob->move( LFO_ATTACK_KNOB_X, LFO_KNOB_Y ); - m_lfoAttackKnob->setHintText( tr( "LFO-attack:" ) + " ", "" ); + m_lfoAttackKnob->setHintText( tr( "LFO- attack:" ) + " ", "" ); m_lfoAttackKnob->setWhatsThis( tr( "Use this knob for setting attack-time of the current LFO. " "The bigger this value the longer the LFO needs to " @@ -204,7 +204,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : m_lfoSpeedKnob = new tempoSyncKnob( knobBright_26, this ); m_lfoSpeedKnob->setLabel( tr( "SPD" ) ); m_lfoSpeedKnob->move( LFO_SPEED_KNOB_X, LFO_KNOB_Y ); - m_lfoSpeedKnob->setHintText( tr( "LFO-speed:" ) + " ", "" ); + m_lfoSpeedKnob->setHintText( tr( "LFO speed:" ) + " ", "" ); m_lfoSpeedKnob->setWhatsThis( tr( "Use this knob for setting speed of the current LFO. The " "bigger this value the faster the LFO oscillates and " @@ -229,8 +229,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : sin_lfo_btn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); sin_lfo_btn->setWhatsThis( - tr( "Click here if you want a sine-wave for current " - "oscillator." ) ); + tr( "Click here for a sine-wave." ) ); pixmapButton * triangle_lfo_btn = new pixmapButton( this, NULL ); triangle_lfo_btn->move( LFO_SHAPES_X+15, LFO_SHAPES_Y ); @@ -239,8 +238,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : triangle_lfo_btn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); triangle_lfo_btn->setWhatsThis( - tr( "Click here if you want a triangle-wave for current " - "oscillator." ) ); + tr( "Click here for a triangle-wave." ) ); pixmapButton * saw_lfo_btn = new pixmapButton( this, NULL ); saw_lfo_btn->move( LFO_SHAPES_X+30, LFO_SHAPES_Y ); @@ -249,8 +247,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : saw_lfo_btn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); saw_lfo_btn->setWhatsThis( - tr( "Click here if you want a saw-wave for current " - "oscillator." ) ); + tr( "Click here for a saw-wave for current." ) ); pixmapButton * sqr_lfo_btn = new pixmapButton( this, NULL ); sqr_lfo_btn->move( LFO_SHAPES_X+45, LFO_SHAPES_Y ); @@ -259,8 +256,7 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : sqr_lfo_btn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); sqr_lfo_btn->setWhatsThis( - tr( "Click here if you want a square-wave for current " - "oscillator." ) ); + tr( "Click here for a square-wave." ) ); m_userLfoBtn = new pixmapButton( this, NULL ); m_userLfoBtn->move( LFO_SHAPES_X+60, LFO_SHAPES_Y ); @@ -269,9 +265,9 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : m_userLfoBtn->setInactiveGraphic( embed::getIconPixmap( "usr_wave_inactive" ) ); m_userLfoBtn->setWhatsThis( - tr( "Click here if you want a user-defined wave for current " - "oscillator. Afterwards drag an according sample-" - "file into LFO-graph." ) ); + tr( "Click here for a user-defined wave. " + "Afterwards, drag an according sample-" + "file onto the LFO graph." ) ); connect( m_userLfoBtn, SIGNAL( toggled( bool ) ), this, SLOT( lfoUserWaveChanged() ) ); @@ -289,8 +285,8 @@ envelopeAndLFOView::envelopeAndLFOView( QWidget * _parent ) : m_x100Cb->move( LFO_PREDELAY_KNOB_X, LFO_GRAPH_Y + 36 ); m_x100Cb->setWhatsThis( tr( "Click here if the frequency of this LFO should be " - "multiplied with 100." ) ); - toolTip::add( m_x100Cb, tr( "multiply LFO-frequency with 100" ) ); + "multiplied by 100." ) ); + toolTip::add( m_x100Cb, tr( "multiply LFO-frequency by 100" ) ); m_controlEnvAmountCb = new ledCheckBox( tr( "MODULATE ENV-AMOUNT" ), diff --git a/src/gui/widgets/instrument_function_views.cpp b/src/gui/widgets/instrument_function_views.cpp index b88c9c206..6df00764d 100644 --- a/src/gui/widgets/instrument_function_views.cpp +++ b/src/gui/widgets/instrument_function_views.cpp @@ -76,7 +76,7 @@ chordCreatorView::chordCreatorView( chordCreator * _cc, QWidget * _parent ) : m_chordRangeKnob->setWhatsThis( tr( "Use this knob for setting the chord range in octaves. " "The selected chord will be played within specified " - "amount of octaves." ) ); + "number of octaves." ) ); } @@ -123,13 +123,13 @@ arpeggiatorView::arpeggiatorView( arpeggiator * _arp, QWidget * _parent ) : ARP_GROUPBOX_HEIGHT ); m_arpGroupBox->setWhatsThis( - tr( "An arpeggio is a type of playing (especially plucked) " + tr( "An arpeggio is a method playing (especially plucked) " "instruments, which makes the music much livelier. " "The strings of such instruments (e.g. harps) are " - "plucked like chords, the only difference is, that " + "plucked like chords. The only difference is that " "this is done in a sequential order, so the notes are " "not played at the same time. Typical arpeggios are " - "major or minor triads. But there're a lot of other " + "major or minor triads, but there are a lot of other " "possible chords, you can select." ) ); @@ -143,7 +143,7 @@ arpeggiatorView::arpeggiatorView( arpeggiator * _arp, QWidget * _parent ) : m_arpRangeKnob->setWhatsThis( tr( "Use this knob for setting the arpeggio range in octaves. " "The selected arpeggio will be played within specified " - "amount of octaves." ) ); + "number of octaves." ) ); m_arpTimeKnob->setLabel( tr( "TIME" ) ); @@ -163,7 +163,7 @@ arpeggiatorView::arpeggiatorView( arpeggiator * _arp, QWidget * _parent ) : tr( "Use this knob for setting the arpeggio gate. The " "arpeggio gate specifies the percent of a whole " "arpeggio-tone that should be played. With this you " - "can make cool staccato-arpeggios." ) ); + "can make cool staccato arpeggios." ) ); m_arpDirectionLbl = new QLabel( tr( "Direction:" ), m_arpGroupBox ); m_arpDirectionLbl->setGeometry( 10, 60, 64, 10 ); diff --git a/src/gui/widgets/instrument_sound_shaping_view.cpp b/src/gui/widgets/instrument_sound_shaping_view.cpp index 519cf9616..ec6e99a8e 100644 --- a/src/gui/widgets/instrument_sound_shaping_view.cpp +++ b/src/gui/widgets/instrument_sound_shaping_view.cpp @@ -58,15 +58,15 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) : TARGETS_TABWIDGET_HEIGTH ); m_targetsTabWidget->setWhatsThis( tr( "These tabs contain envelopes. They're very important for " - "modifying a sound, for not saying that they're almost " + "modifying a sound, in that they are almost " "always neccessary for substractive synthesis. For " - "example if you have a volume-envelope, you can set " - "when the sound should have which volume-level. " - "Maybe you want to create some soft strings. Then your " + "example if you have a volume envelope, you can set " + "when the sound should have a specific volume. " + "If you want to create some soft strings then your " "sound has to fade in and out very softly. This can be " - "done by setting a large attack- and release-time. " - "It's the same for other envelope-targets like " - "panning, cutoff-frequency of used filter and so on. " + "done by setting large attack and release times. " + "It's the same for other envelope targets like " + "panning, cutoff frequency for the used filter and so on. " "Just monkey around with it! You can really make cool " "sounds out of a saw-wave with just some " "envelopes...!" ) ); @@ -102,12 +102,12 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) : m_filterCutKnob->setHintText( tr( "cutoff-frequency:" ) + " ", " " + tr( "Hz" ) ); m_filterCutKnob->setWhatsThis( - tr( "Use this knob for setting the cutoff-frequency for the " - "selected filter. The cutoff-frequency specifies the " + tr( "Use this knob for setting the cutoff frequency for the " + "selected filter. The cutoff frequency specifies the " "frequency for cutting the signal by a filter. For " "example a lowpass-filter cuts all frequencies above " - "the cutoff-frequency. A highpass-filter cuts all " - "frequencies below cutoff-frequency and so on..." ) ); + "the cutoff frequency. A highpass-filter cuts all " + "frequencies below cutoff frequency, and so on..." ) ); m_filterResKnob = new knob( knobBright_26, m_filterGroupBox ); @@ -116,7 +116,7 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) : m_filterResKnob->setHintText( tr( "Q/Resonance:" ) + " ", "" ); m_filterResKnob->setWhatsThis( tr( "Use this knob for setting Q/Resonance for the selected " - "filter. Q/Resonance tells the filter, how much it " + "filter. Q/Resonance tells the filter how much it " "should amplify frequencies near Cutoff-frequency." ) ); } @@ -147,4 +147,4 @@ void instrumentSoundShapingView::modelChanged( void ) #include "moc_instrument_sound_shaping_view.cxx" - +