Merge branch 'stable-1.2'

# Conflicts:
#	.travis.yml
#	.travis/linux..script.sh
#	.travis/linux.win32.script.sh
#	.travis/linux.win64.script.sh
#	.travis/osx..install.sh
#	.travis/osx..script.sh
#	data/locale/en.ts
#	data/locale/id.ts
#	include/Graph.h
#	include/VstSyncController.h
#	include/lmms_math.h
#	plugins/vst_base/RemoteVstPlugin.cpp
#	src/core/RemotePlugin.cpp
#	src/core/Song.cpp
#	src/core/Track.cpp
#	src/gui/SubWindow.cpp
#	src/gui/widgets/Graph.cpp
This commit is contained in:
Hyunjin Song
2019-02-24 20:43:45 +09:00
92 changed files with 5767 additions and 3727 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -7359,7 +7359,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Vst Plugin Preset (*.fxp *.fxb)</source>
<translation>Передустановка VST плагіна (*.fxp, *.fxb)</translation>
<translation>Передустановка VST плагіна (*.fxp *.fxb)</translation>
</message>
<message>
<source>: default</source>