diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Tooltips.py | 25 | ||||
| -rw-r--r-- | common/Util/InstrumentDB.py | 2 | ||||
| -rw-r--r-- | common/Util/Instruments.py | 20 |
3 files changed, 28 insertions, 19 deletions
diff --git a/common/Tooltips.py b/common/Tooltips.py index 42511c2..37531e9 100644 --- a/common/Tooltips.py +++ b/common/Tooltips.py @@ -55,7 +55,7 @@ class Tooltips: self.Edit["2drumMuteButton"] = _("Left click to mute, right click to solo") self.ALGO = {} - self.ALGO["XYButton1"] = _('-- Rythm density, | Rythm regularity' ) + self.ALGO["XYButton1"] = _('-- Rhythm density, | Rhythm regularity' ) self.ALGO["XYButton2"] = _('-- Pitch regularity, | Pitch maximum step' ) self.ALGO["XYButton3"] = _('-- Average duration, | Silence probability') self.ALGO["drunk"] = _('Drunk') @@ -68,7 +68,7 @@ class Tooltips: self.ALGO["phrygienKey"] = _('Phrygian scale') self.ALGO["dorienKey"] = _('Dorian scale') self.ALGO["lydienKey"] = _('Lydian scale') - self.ALGO["myxoKey"] = _('Myxolydian scale') + self.ALGO["myxoKey"] = _('Mixolydian scale') self.ALGO["saveButton"] = _('Save preset') self.ALGO["loadButton"] = _('Load preset') self.ALGO["checkButton"] = _('Generate') @@ -79,7 +79,7 @@ class Tooltips: self.PROP['pitchDown'] = _('Transpose down') self.PROP['volumeUp'] = _('Volume up') self.PROP['volumeDown'] = _('Volume down') - self.PROP['panSlider'] = _('Panoramisation') + self.PROP['panSlider'] = _('Panoramization') self.PROP['reverbSlider'] = _('Reverb') self.PROP['attackSlider'] = _('Attack duration') self.PROP['decaySlider'] = _('Decay duration') @@ -105,7 +105,24 @@ class Tooltips: self.PROP['checkButton'] = _('Apply generator') self.PROP['cancelButton'] = _('Cancel') - + categories = { + # TRANS: Intstrument category + 'all': _('All'), + # TRANS: Intstrument category + 'animals': _('Animals'), + # TRANS: Intstrument category + 'concret': _('Objects'), + # TRANS: Intstrument category + 'keyboard': _('Keyboard'), + # TRANS: Intstrument category + 'people': _('People'), + # TRANS: Intstrument category + 'percussions': _('Percussions'), + # TRANS: Intstrument category + 'strings': _('Strings'), + # TRANS: Intstrument category + 'winds': _('Winds'), + } #miniTamTam VOL = _('Volume') diff --git a/common/Util/InstrumentDB.py b/common/Util/InstrumentDB.py index ac72a19..e7cbce0 100644 --- a/common/Util/InstrumentDB.py +++ b/common/Util/InstrumentDB.py @@ -24,7 +24,7 @@ class Instrument: self.wav = wav self.img = img self.category = category - self.nameTooltip = nameTooltip + self.nameTooltip = nameTooltip or name # build an Instrument instance by parsing a file def loadFromPath(self, path ): diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py index 315e451..8462e0d 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -291,19 +291,11 @@ DRUM6KIT = { 24 : "drum6madal00", 46 : "drum6madal11", 48 : "drum6madal12" } -_addInstrument( "drum1kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM1KIT ) -_addInstrument( "drum2kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM2KIT ) -_addInstrument( "drum3kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM3KIT ) -_addInstrument( "drum4kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM4KIT ) -_addInstrument( "drum5kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM5KIT ) -_addInstrument( "drum6kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM6KIT ) - -DRUMTIPS = [ - _('Jazz / Rock Kit'), - _('African Kit'), - _('Arabic Kit'), - _('South American Kit'), - _('Electronic Kit'), - _('Nepali') ] +_addInstrument( "drum1kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM1KIT, nameTooltip=_('Jazz / Rock Kit') ) +_addInstrument( "drum2kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM2KIT, nameTooltip=_('African Kit') ) +_addInstrument( "drum3kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM3KIT, nameTooltip=_('Arabic Kit') ) +_addInstrument( "drum4kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM4KIT, nameTooltip=_('South American Kit') ) +_addInstrument( "drum5kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM5KIT, nameTooltip=_('Electronic Kit') ) +_addInstrument( "drum6kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM6KIT, nameTooltip=_('Nepali') ) DRUMCOUNT = 6 |