diff options
| -rw-r--r-- | TamTamEdit.activity/Edit/EditToolbars.py | 22 | ||||
| -rw-r--r-- | TamTamJam.activity/Jam/Popup.py | 8 | ||||
| -rw-r--r-- | TamTamJam.activity/Jam/Toolbars.py | 4 | ||||
| -rw-r--r-- | TamTamSynthLab.activity/SynthLab/SynthLabConstants.py | 58 | ||||
| -rw-r--r-- | common/Tooltips.py | 4 |
5 files changed, 48 insertions, 48 deletions
diff --git a/TamTamEdit.activity/Edit/EditToolbars.py b/TamTamEdit.activity/Edit/EditToolbars.py index e20ffb8..beb9556 100644 --- a/TamTamEdit.activity/Edit/EditToolbars.py +++ b/TamTamEdit.activity/Edit/EditToolbars.py @@ -84,7 +84,7 @@ class mainToolbar(gtk.Toolbar): _insertSeparator(1) #Pointer button - self._pointerPalette = pointerPalette(_('Select Tool'), self.edit) + self._pointerPalette = pointerPalette(_('Select tool'), self.edit) self.pointerButton = RadioToolButton(group = None) self.pointerButton.set_named_icon('edit-pointer') self.pointerButton.set_palette(self._pointerPalette) @@ -849,7 +849,7 @@ class propertiesPalette(Palette): self.edit = edit self.filterTypes = [_('None'), _('Lowpass'), _('Bandpass'), _('Highpass')] - self.geneTypes = [_('Line'),_('Drunk'),_('Drone and Jump'),_('Repeater'),_('Loop Segments')] + self.geneTypes = [_('Line'),_('Drunk'),_('Drone and Jump'),_('Repeater'),_('Loop segments')] self.colors = [_('Purple'), _('Green'), _('Blue'), _('Yellow')] self.currentFilterType = self.filterTypes[0] @@ -912,7 +912,7 @@ class propertiesPalette(Palette): self.transposeBox.pack_end(self.transposeDownButton, False, False, padding = 5) self.volumeBox = gtk.HBox() - self.volumeLabel = gtk.Label(_('Volume: ')) + self.volumeLabel = gtk.Label(_('Volume') + ': ') self.volumeDownButton = ImageButton(Config.TAM_TAM_ROOT + '/icons/arrow-down.svg') self.volumeDownButton.connect('clicked', self.stepVolume, -0.1) self.volumeUpButton = ImageButton(Config.TAM_TAM_ROOT + '/icons/arrow-up.svg') @@ -942,7 +942,7 @@ class propertiesPalette(Palette): self.panBox.pack_end(self.panSlider, False, False, padding = 5) self.reverbBox = gtk.HBox() - self.reverbLabel = gtk.Label(_('Reverb: ')) + self.reverbLabel = gtk.Label(_('Reverb') + ': ') self.reverbSliderAdj = gtk.Adjustment(0.1, 0, 1, 0.1, 0.1, 0) self.reverbSliderAdj.connect("value-changed", self.handleReverb) self.reverbSlider = gtk.HScale(adjustment = self.reverbSliderAdj) @@ -958,7 +958,7 @@ class propertiesPalette(Palette): self.reverbBox.pack_end(self.reverbSlider, False, False, padding = 5) self.attackDurBox = gtk.HBox() - self.attackDurLabel = gtk.Label(_('Attack duration: ')) + self.attackDurLabel = gtk.Label(_('Attack duration') + ': ') self.attackDurSliderAdj = gtk.Adjustment(0.04, 0.03, 1, .01, .01, 0) self.attackDurSliderAdj.connect('value-changed', self.handleAttack) self.attackDurSlider = gtk.HScale(adjustment = self.attackDurSliderAdj) @@ -974,7 +974,7 @@ class propertiesPalette(Palette): self.attackDurBox.pack_end(self.attackDurSlider, False, False, padding = 5) self.decayDurBox = gtk.HBox() - self.decayDurLabel = gtk.Label(_('Decay duration: ')) + self.decayDurLabel = gtk.Label(_('Decay duration') + ': ') self.decayDurSliderAdj = gtk.Adjustment(0.31, 0.03, 1, .01, .01, 0) self.decayDurSliderAdj.connect('value-changed', self.handleDecay) self.decayDurSlider = gtk.HScale(adjustment = self.decayDurSliderAdj) @@ -999,7 +999,7 @@ class propertiesPalette(Palette): self.filterTypeBox.pack_end(self.filterTypeComboBox, False, False, padding = 55) self.filterCutoffBox = gtk.HBox() - self.filterCutoffLabel = gtk.Label(_('Filter cutoff: ')) + self.filterCutoffLabel = gtk.Label(_('Filter cutoff') + ': ') self.filterCutoffSliderAdj = gtk.Adjustment(1000, 100, 7000, 100, 100, 0) self.filterCutoffSliderAdj.connect('value-changed', self.handleFilter) self.filterCutoffSlider = gtk.HScale(adjustment = self.filterCutoffSliderAdj) @@ -1019,7 +1019,7 @@ class propertiesPalette(Palette): self.generationLabel = gtk.Label(_('Generation')) self.generationTypeBox = gtk.HBox() - self.generationTypeLabel = gtk.Label(_('Type: ')) + self.generationTypeLabel = gtk.Label(_('Type') + ': ') self.generationTypeComboBox = BigComboBox() for genetype in self.geneTypes: self.generationTypeComboBox.append_item(self.geneTypes.index(genetype), genetype) @@ -1029,7 +1029,7 @@ class propertiesPalette(Palette): self.generationTypeBox.pack_end(self.generationTypeComboBox, False, False, padding = 55) self.minimumBox = gtk.HBox() - self.minimumLabel = gtk.Label(_('Minimum: ')) + self.minimumLabel = gtk.Label(_('Minimum') + ': ') self.minimumSliderAdj = gtk.Adjustment(0, 0, 100, 1, 1, 0) self.minimumSliderAdj.connect('value-changed', self.handleMinimum) self.minimumSlider = gtk.HScale(adjustment = self.minimumSliderAdj) @@ -1041,7 +1041,7 @@ class propertiesPalette(Palette): self.minimumBox.pack_end(self.minimumSlider, False, False, padding = 52) self.maximumBox = gtk.HBox() - self.maximumLabel = gtk.Label(_('Maximum: ')) + self.maximumLabel = gtk.Label(_('Maximum') + ': ') self.maximumSliderAdj = gtk.Adjustment(100, 0, 100, 1, 1, 0) self.maximumSliderAdj.connect('value-changed', self.handleMaximum) self.maximumSlider = gtk.HScale(adjustment = self.maximumSliderAdj) @@ -1053,7 +1053,7 @@ class propertiesPalette(Palette): self.maximumBox.pack_end(self.maximumSlider, False, False, padding = 52) self.randomBox = gtk.HBox() - self.randomLabel = gtk.Label(_('Random: ')) + self.randomLabel = gtk.Label(_('Random') + ': ') self.randomSliderAdj = gtk.Adjustment(20, 0, 100, 1, 1, 0) self.randomSliderAdj.connect('value-changed', self.handleRandom) self.randomSlider = gtk.HScale(adjustment = self.randomSliderAdj) diff --git a/TamTamJam.activity/Jam/Popup.py b/TamTamJam.activity/Jam/Popup.py index 4f28018..8ff1888 100644 --- a/TamTamJam.activity/Jam/Popup.py +++ b/TamTamJam.activity/Jam/Popup.py @@ -116,7 +116,7 @@ class Instrument( Popup ): #-- Volume -------------------------------------------- self.GUI["volumeBox"] = gtk.HBox() self.GUI["mainBox"].pack_start( self.GUI["volumeBox"], padding = style.DEFAULT_PADDING ) - self.GUI["volumeLabel"] = gtk.Label( _("Volume:") ) + self.GUI["volumeLabel"] = gtk.Label( _("Volume") + ':' ) self.GUI["volumeLabel"].set_size_request( 100, -1 ) self.GUI["volumeLabel"].set_alignment( 0.0, 0.5 ) self.GUI["volumeBox"].pack_start( self.GUI["volumeLabel"], False, padding = style.DEFAULT_PADDING ) @@ -152,7 +152,7 @@ class Instrument( Popup ): #-- Reverb -------------------------------------------- self.GUI["reverbBox"] = gtk.HBox() self.GUI["mainBox"].pack_start( self.GUI["reverbBox"], padding = style.DEFAULT_PADDING ) - self.GUI["reverbLabel"] = gtk.Label( _("Reverb:") ) + self.GUI["reverbLabel"] = gtk.Label( _("Reverb") + ':' ) self.GUI["reverbLabel"].set_size_request( 100, -1 ) self.GUI["reverbLabel"].set_alignment( 0.0, 0.5 ) self.GUI["reverbBox"].pack_start( self.GUI["reverbLabel"], False, padding = style.DEFAULT_PADDING ) @@ -224,7 +224,7 @@ class Drum( Popup ): #-- Volume -------------------------------------------- self.GUI["volumeBox"] = gtk.HBox() self.GUI["mainBox"].pack_start( self.GUI["volumeBox"], padding = style.DEFAULT_PADDING ) - self.GUI["volumeLabel"] = gtk.Label( _("Volume:") ) + self.GUI["volumeLabel"] = gtk.Label( _("Volume") + ':' ) self.GUI["volumeLabel"].set_size_request( 130, -1 ) self.GUI["volumeLabel"].set_alignment( 0.0, 0.5 ) self.GUI["volumeBox"].pack_start( self.GUI["volumeLabel"], False, padding = style.DEFAULT_PADDING ) @@ -242,7 +242,7 @@ class Drum( Popup ): #-- Reverb -------------------------------------------- self.GUI["reverbBox"] = gtk.HBox() self.GUI["mainBox"].pack_start( self.GUI["reverbBox"], padding = style.DEFAULT_PADDING ) - self.GUI["reverbLabel"] = gtk.Label( _("Reverb:") ) + self.GUI["reverbLabel"] = gtk.Label( _("Reverb") + ':' ) self.GUI["reverbLabel"].set_size_request( 130, -1 ) self.GUI["reverbLabel"].set_alignment( 0.0, 0.5 ) self.GUI["reverbBox"].pack_start( self.GUI["reverbLabel"], False, padding = style.DEFAULT_PADDING ) diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py index 624a72c..9069060 100644 --- a/TamTamJam.activity/Jam/Toolbars.py +++ b/TamTamJam.activity/Jam/Toolbars.py @@ -39,7 +39,7 @@ class JamToolbar( gtk.Toolbar ): self.volumeSlider = gtk.HScale( adjustment = self.volumeAdjustment ) self.volumeSlider.set_size_request( 260, -1 ) self.volumeSlider.set_draw_value( False ) - self._add_tooltip( self.volumeSlider, _("Master Volume") ) + self._add_tooltip( self.volumeSlider, _("Master volume") ) self._insert_widget( self.volumeSlider, -1 ) self._insert_widget( self.volumeImg, -1 ) @@ -173,7 +173,7 @@ class PlaybackToolbar( gtk.Toolbar ): self.beatWheel.append( btn ) - label = gtk.Label( _("Sync to:") ) + label = gtk.Label( _("Synch to:") ) self.syncLabel = gtk.ToolItem() self.syncLabel.add( label ) self.insert( self.syncLabel, -1 ) diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py index 66ee4d2..520278d 100644 --- a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py +++ b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py @@ -130,12 +130,12 @@ class SynthLabConstants: MIN = MIN MAX = MAX SCALING = _('Scaling') - SCALING_TYPES = [_('Lin'), _('Log')] + SCALING_TYPES = [_('Linear'), _('Logarithmic')] POLL = _('Poll time') TRACKPADX_INFO = _('The trackpad can be used to modify the sound. This is from left to right.') TRACKPADX_PARA1 = _('The minimum value the trackpad will send.') TRACKPADX_PARA2 = _('The maximum value the trackpad will send.') - TRACKPADX_PARA3 = _('The shape of the value reapartition. In a straight line (linear) or a curved line (logarithmic).') + TRACKPADX_PARA3 = _('The shape of the value repartition. In a straight line (linear) or a curved line (logarithmic).') TRACKPADX_PARA4= _('The time interval between each event coming from the trackpad.') TRACKPADY = _('Trackpad Y') @@ -187,7 +187,7 @@ class SynthLabConstants: PLUCK = _('Pluck') FREQ = FREQ - LFILTER = _('Lowpass Filter') + LFILTER = _('Lowpass filter') VIBRATO = _('Vibrato') GAIN = GAIN PLUCK_INFO = _('An electronic string instrument (like a guitar).') @@ -239,7 +239,7 @@ class SynthLabConstants: GAIN = GAIN GRAIN_INFO = _('The grain effect splits the sound in tiny bits which can be rearranged in time.') GRAIN_PARA1 = _('The pitch of grains.') - GRAIN_PARA2 = _('The sample to be used') + GRAIN_PARA2 = _('The sample to be used.') GRAIN_PARA3 = _('The variation in pitch of grains.') GRAIN_PARA4 = _('The volume of the sound.') @@ -263,7 +263,7 @@ class SynthLabConstants: MIC_PARA1 = _('Length of the memory') MIC_PARA2 = _('This parameter can not be modified') MIC_PARA3 = _('Speed playback changes duration and pitch of the sound') - MIC_PARA4 = _('The volume of the sound') + MIC_PARA4 = _('The volume of the sound.') #Effects DELAY = _('Delay') @@ -314,7 +314,7 @@ class SynthLabConstants: REVERB = _('Reverb') REVERBD = _('Length') - REVERBF = _('Lowpass Filter') + REVERBF = _('Lowpass filter') REVERBL = _('Reverb Level') GAIN = GAIN REVERB_INFO = _('Reverberation is the length a sound stays in a room.') @@ -360,26 +360,26 @@ class SynthLabConstants: [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH, MIC], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON, EQ4BAND, CHORUS], [ADSR]] - SYNTHPARA = { _('lfo'): [AMP, FREQ, WAVEFORM, OFFSET, LFO_INFO, LFO_PARA1, LFO_PARA2, LFO_PARA3, LFO_PARA4], - _('rand'): [MIN, MAX, FREQ, SEED, RANDOM_INFO, RANDOM_PARA1, RANDOM_PARA2, RANDOM_PARA3, RANDOM_PARA4], - _('adsr'): [ATTACK, DECAY, SUSTAIN, RELEASE, ADSR_INFO, ADSR_PARA1, ADSR_PARA2, ADSR_PARA3, ADSR_PARA4], - _('trackpadX'): [MIN, MAX, SCALING, POLL, TRACKPADX_INFO, TRACKPADX_PARA1, TRACKPADX_PARA2, TRACKPADX_PARA3, TRACKPADX_PARA4], - _('trackpadY'): [MIN, MAX, SCALING, POLL, TRACKPADY_INFO, TRACKPADY_PARA1, TRACKPADY_PARA2, TRACKPADY_PARA3, TRACKPADY_PARA4], - _('fm'): [CAR, MOD, INDEX, GAIN, FM_INFO, FM_PARA1, FM_PARA2, FM_PARA3, FM_PARA4], - _('buzz'): [FREQ, NHARM, FSLOPE, GAIN, BUZZ_INFO, BUZZ_PARA1, BUZZ_PARA2, BUZZ_PARA3, BUZZ_PARA4], - _('vco'): [FREQ, WAVEFORM, FSLOPE, GAIN, VCO_INFO, VCO_PARA1, VCO_PARA2, VCO_PARA3, VCO_PARA4], - _('pluck'): [FREQ, LFILTER, VIBRATO, GAIN, PLUCK_INFO, PLUCK_PARA1, PLUCK_PARA2, PLUCK_PARA3, PLUCK_PARA4], - _('noise'): [NOISETYPE, FREQ, BANDWITH, GAIN, NOISE_INFO, NOISE_PARA1, NOISE_PARA2, NOISE_PARA3, NOISE_PARA4], - _('sample'): [FREQ, SAMPLEN, LFILTER, GAIN, SAMPLE_INFO, SAMPLE_PARA1, SAMPLE_PARA2, SAMPLE_PARA3, SAMPLE_PARA4], - _('voice'): [FREQ, VOWEL, VIBRATO, GAIN, VOICE_INFO, VOICE_PARA1, VOICE_PARA2, VOICE_PARA3, VOICE_PARA4], - _('grain'): [FREQ, SAMPLEN, INDEX, GAIN, GRAIN_INFO, GRAIN_PARA1, GRAIN_PARA2, GRAIN_PARA3, GRAIN_PARA4], - _('addSynth'): [FREQ, SPREAD, WAVE, GAIN, ADDSYNTH_INFO, ADDSYNTH_PARA1, ADDSYNTH_PARA2, ADDSYNTH_PARA3, ADDSYNTH_PARA4], - _('mic'): [DURATION, BIN, SPEED, GAIN, MIC_INFO, MIC_PARA1, MIC_PARA2, MIC_PARA3, MIC_PARA4], - _('wguide'): [FREQ, LFILTER, FEEDBACK, GAIN, DELAY_INFO, DELAY_PARA1, DELAY_PARA2, DELAY_PARA3, DELAY_PARA4], - _('distort'): [FREQ, RESON, DISTL, GAIN, DIST_INFO, DIST_PARA1, DIST_PARA2, DIST_PARA3, DIST_PARA4], - _('filter'): [FREQ, FSLOPE, FTYPE, GAIN, FILTER_INFO, FILTER_PARA1, FILTER_PARA2, FILTER_PARA3, FILTER_PARA4], - _('ring'): [FREQ, MIX, WAVEFORM, GAIN, RINGMOD_INFO, RINGMOD_PARA1, RINGMOD_PARA2, RINGMOD_PARA3, RINGMOD_PARA4], - _('reverb'): [REVERBD, REVERBF, REVERBL, GAIN, REVERB_INFO, REVERB_PARA1, REVERB_PARA2, REVERB_PARA3, REVERB_PARA4], - _('harmon'): [FREQ, DRYDELAY, MIX, GAIN, HARMON_INFO, HARMON_PARA1, HARMON_PARA2, HARMON_PARA3, HARMON_PARA4], - _('eq4band'): [FREQ1, FREQ2, FREQ3, FREQ4, EQ4BAND_INFO, EQ4BAND_PARA1, EQ4BAND_PARA2, EQ4BAND_PARA3, EQ4BAND_PARA4], - _('chorus'): [LFODEPTH, LFOFREQ, DELAY, FEEDBACK, CHORUS_INFO, CHORUS_PARA1, CHORUS_PARA2, CHORUS_PARA3, CHORUS_PARA4]} + SYNTHPARA = { 'lfo': [AMP, FREQ, WAVEFORM, OFFSET, LFO_INFO, LFO_PARA1, LFO_PARA2, LFO_PARA3, LFO_PARA4], + 'rand': [MIN, MAX, FREQ, SEED, RANDOM_INFO, RANDOM_PARA1, RANDOM_PARA2, RANDOM_PARA3, RANDOM_PARA4], + 'adsr': [ATTACK, DECAY, SUSTAIN, RELEASE, ADSR_INFO, ADSR_PARA1, ADSR_PARA2, ADSR_PARA3, ADSR_PARA4], + 'trackpadX': [MIN, MAX, SCALING, POLL, TRACKPADX_INFO, TRACKPADX_PARA1, TRACKPADX_PARA2, TRACKPADX_PARA3, TRACKPADX_PARA4], + 'trackpadY': [MIN, MAX, SCALING, POLL, TRACKPADY_INFO, TRACKPADY_PARA1, TRACKPADY_PARA2, TRACKPADY_PARA3, TRACKPADY_PARA4], + 'fm': [CAR, MOD, INDEX, GAIN, FM_INFO, FM_PARA1, FM_PARA2, FM_PARA3, FM_PARA4], + 'buzz': [FREQ, NHARM, FSLOPE, GAIN, BUZZ_INFO, BUZZ_PARA1, BUZZ_PARA2, BUZZ_PARA3, BUZZ_PARA4], + 'vco': [FREQ, WAVEFORM, FSLOPE, GAIN, VCO_INFO, VCO_PARA1, VCO_PARA2, VCO_PARA3, VCO_PARA4], + 'pluck': [FREQ, LFILTER, VIBRATO, GAIN, PLUCK_INFO, PLUCK_PARA1, PLUCK_PARA2, PLUCK_PARA3, PLUCK_PARA4], + 'noise': [NOISETYPE, FREQ, BANDWITH, GAIN, NOISE_INFO, NOISE_PARA1, NOISE_PARA2, NOISE_PARA3, NOISE_PARA4], + 'sample': [FREQ, SAMPLEN, LFILTER, GAIN, SAMPLE_INFO, SAMPLE_PARA1, SAMPLE_PARA2, SAMPLE_PARA3, SAMPLE_PARA4], + 'voice': [FREQ, VOWEL, VIBRATO, GAIN, VOICE_INFO, VOICE_PARA1, VOICE_PARA2, VOICE_PARA3, VOICE_PARA4], + 'grain': [FREQ, SAMPLEN, INDEX, GAIN, GRAIN_INFO, GRAIN_PARA1, GRAIN_PARA2, GRAIN_PARA3, GRAIN_PARA4], + 'addSynth': [FREQ, SPREAD, WAVE, GAIN, ADDSYNTH_INFO, ADDSYNTH_PARA1, ADDSYNTH_PARA2, ADDSYNTH_PARA3, ADDSYNTH_PARA4], + 'mic': [DURATION, BIN, SPEED, GAIN, MIC_INFO, MIC_PARA1, MIC_PARA2, MIC_PARA3, MIC_PARA4], + 'wguide': [FREQ, LFILTER, FEEDBACK, GAIN, DELAY_INFO, DELAY_PARA1, DELAY_PARA2, DELAY_PARA3, DELAY_PARA4], + 'distort': [FREQ, RESON, DISTL, GAIN, DIST_INFO, DIST_PARA1, DIST_PARA2, DIST_PARA3, DIST_PARA4], + 'filter': [FREQ, FSLOPE, FTYPE, GAIN, FILTER_INFO, FILTER_PARA1, FILTER_PARA2, FILTER_PARA3, FILTER_PARA4], + 'ring': [FREQ, MIX, WAVEFORM, GAIN, RINGMOD_INFO, RINGMOD_PARA1, RINGMOD_PARA2, RINGMOD_PARA3, RINGMOD_PARA4], + 'reverb': [REVERBD, REVERBF, REVERBL, GAIN, REVERB_INFO, REVERB_PARA1, REVERB_PARA2, REVERB_PARA3, REVERB_PARA4], + 'harmon': [FREQ, DRYDELAY, MIX, GAIN, HARMON_INFO, HARMON_PARA1, HARMON_PARA2, HARMON_PARA3, HARMON_PARA4], + 'eq4band': [FREQ1, FREQ2, FREQ3, FREQ4, EQ4BAND_INFO, EQ4BAND_PARA1, EQ4BAND_PARA2, EQ4BAND_PARA3, EQ4BAND_PARA4], + 'chorus': [LFODEPTH, LFOFREQ, DELAY, FEEDBACK, CHORUS_INFO, CHORUS_PARA1, CHORUS_PARA2, CHORUS_PARA3, CHORUS_PARA4]} diff --git a/common/Tooltips.py b/common/Tooltips.py index 37531e9..ea5bd5d 100644 --- a/common/Tooltips.py +++ b/common/Tooltips.py @@ -96,7 +96,7 @@ class Tooltips: self.PROP['cutoffGen'] = _('Open algorithmic generator') self.PROP['line'] = _('Line') self.PROP['drunk'] = _('Drunk') - self.PROP['droneJump'] = _('Drone and jump') + self.PROP['droneJump'] = _('Drone and Jump') self.PROP['repeater'] = _('Repeater') self.PROP['loopseg'] = _('Loop segments') self.PROP['minSlider'] = _('Minimum value') @@ -137,4 +137,4 @@ class Tooltips: TEMPO = _('Tempo') RECMIC = _('Record with the microphone') RECLAB = _('Open SynthLab to create noise') - MT_RECORDBUTTONS = [_('Record mic into slot 1'), _('Record mic into slot 2'), _('Record mic into slot 3'), _('Record mic into slot 4')] + MT_RECORDBUTTONS = [_('Record microphone into slot 1'), _('Record microphone into slot 2'), _('Record microphone into slot 3'), _('Record microphone into slot 4')] |