Merge branch 'stable-1.2'

# Conflicts:
#	data/locale/cs.ts
#	data/locale/en.ts
#	data/locale/ko.ts
#	data/locale/ru.ts
#	data/locale/uk.ts
#	data/locale/zh_TW.ts
#	include/Engine.h
#	plugins/nes/Nes.cpp
#	src/core/NotePlayHandle.cpp
#	src/core/SampleBuffer.cpp
#	src/tracks/SampleTrack.cpp
This commit is contained in:
Hyunjin Song
2019-06-12 17:41:12 +09:00
35 changed files with 14916 additions and 45037 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -3978,7 +3978,11 @@ Bitte besuchen Sie http://lmms.sf.net/wiki für Dokumentationen über LMMS.</tra
</message>
<message>
<source>E&amp;xport Tracks...</source>
<translation>E&amp;xport Tracks...</translation>
<translation>Tracks e&amp;xportieren...</translation>
</message>
<message>
<source>Export &amp;MIDI...</source>
<translation>&amp;MIDI exportieren...</translation>
</message>
<message>
<source>Online Help</source>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 109 KiB