Merge branch 'stable-1.2'

# Conflicts:
#	cmake/modules/BuildPlugin.cmake
#	plugins/CMakeLists.txt
#	plugins/LadspaEffect/swh/CMakeLists.txt
#	plugins/LadspaEffect/tap/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
#	plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
#	src/gui/MainWindow.cpp
This commit is contained in:
Lukas W
2018-07-06 12:42:15 +02:00
28 changed files with 216 additions and 115 deletions

View File

@@ -3939,7 +3939,7 @@ Besök https://lmms.io/documentation/ för dokumentation (Engelska).</translatio
</message>
<message>
<source>&amp;View</source>
<translation>%Visa</translation>
<translation>&amp;Visa</translation>
</message>
<message>
<source>Toggle metronome</source>
@@ -9950,4 +9950,4 @@ The LED in the lower right corner of the waveform editor determines whether the
<translation>Utgångsförstärkning</translation>
</message>
</context>
</TS>
</TS>