diff --git a/data/locale/ca.qm b/data/locale/ca.qm index b84bc4bde..20b626418 100644 Binary files a/data/locale/ca.qm and b/data/locale/ca.qm differ diff --git a/data/locale/ca.ts b/data/locale/ca.ts index d927e8d5f..7707fdfc2 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/cs.qm b/data/locale/cs.qm index e98c77b81..b45aa4455 100644 Binary files a/data/locale/cs.qm and b/data/locale/cs.qm differ diff --git a/data/locale/cs.ts b/data/locale/cs.ts index 2ac41fad7..c14753662 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -7,10 +7,6 @@ About LMMS O LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Linux MultiMedia Studio) - Version %1 (%2/%3, Qt %4, %5) Verze %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog diff --git a/data/locale/de.qm b/data/locale/de.qm index 534645fe5..04e63be41 100644 Binary files a/data/locale/de.qm and b/data/locale/de.qm differ diff --git a/data/locale/de.ts b/data/locale/de.ts index c606f041c..10b24a6a9 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -7,10 +7,6 @@ About LMMS Über LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Linux MultiMedia Studio) - Version %1 (%2/%3, Qt %4, %5) Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog diff --git a/data/locale/en.ts b/data/locale/en.ts index 4a9197574..b21db762d 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/es.qm b/data/locale/es.qm index 5a0ac55fb..2ecf4746d 100644 Binary files a/data/locale/es.qm and b/data/locale/es.qm differ diff --git a/data/locale/es.ts b/data/locale/es.ts index b8bd57bf1..4e41e1abf 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/fa.qm b/data/locale/fa.qm index 97c0f1f91..dcd394be4 100644 Binary files a/data/locale/fa.qm and b/data/locale/fa.qm differ diff --git a/data/locale/fa.ts b/data/locale/fa.ts index 25cea8360..edc8c3f25 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/fr.qm b/data/locale/fr.qm index da1da6e56..1f7bc5c3f 100644 Binary files a/data/locale/fr.qm and b/data/locale/fr.qm differ diff --git a/data/locale/fr.ts b/data/locale/fr.ts index 5e98960ee..7e6593543 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -7,10 +7,6 @@ About LMMS À propos de LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Linux MultiMedia Studio) - Version %1 (%2/%3, Qt %4, %5) Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog diff --git a/data/locale/gl.qm b/data/locale/gl.qm index 97cee737a..c36f2b4a8 100644 Binary files a/data/locale/gl.qm and b/data/locale/gl.qm differ diff --git a/data/locale/gl.ts b/data/locale/gl.ts index c1eb03551..95bd83445 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -7,10 +7,6 @@ About LMMS Sobre o LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Estudio Multimedia de Linux) - Version %1 (%2/%3, Qt %4, %5) Versión %1 (%2/%3, Qt %4, %5) @@ -51,6 +47,10 @@ Se lle interesa traducir o LMMS a outro idioma ou desexa mellorar as traducións <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog @@ -504,7 +504,7 @@ Se lle interesa traducir o LMMS a outro idioma ou desexa mellorar as traducións Gain: - + Ganancia: RATIO diff --git a/data/locale/it.qm b/data/locale/it.qm index f5b44309d..bff895f95 100644 Binary files a/data/locale/it.qm and b/data/locale/it.qm differ diff --git a/data/locale/it.ts b/data/locale/it.ts index 3598eda17..cecfa1b5a 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -7,10 +7,6 @@ About LMMS About LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Linux MultiMedia Studio) - Version %1 (%2/%3, Qt %4, %5) Versione %1 (%2/%3, Qt %4, %5) @@ -52,6 +48,10 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog diff --git a/data/locale/ja.qm b/data/locale/ja.qm index 65bd82e43..74415c4a0 100644 Binary files a/data/locale/ja.qm and b/data/locale/ja.qm differ diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 4ae7d63b9..b5a2c7f34 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/ko.qm b/data/locale/ko.qm index 254815850..9f1fc76f3 100644 Binary files a/data/locale/ko.qm and b/data/locale/ko.qm differ diff --git a/data/locale/ko.ts b/data/locale/ko.ts index 256053a0e..c98e128b6 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/nl.qm b/data/locale/nl.qm index 024d468b4..1331a3581 100644 Binary files a/data/locale/nl.qm and b/data/locale/nl.qm differ diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 18b63772f..e850fcaef 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/pl.qm b/data/locale/pl.qm index d4d7dac19..1738f343c 100644 Binary files a/data/locale/pl.qm and b/data/locale/pl.qm differ diff --git a/data/locale/pl.ts b/data/locale/pl.ts index b0955adb8..a1689c846 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -7,10 +7,6 @@ About LMMS O programie LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Linux MultiMedia Studio) - Version %1 (%2/%3, Qt %4, %5) Wersja %1 (%2/%3, Qt %4, %5) @@ -55,6 +51,10 @@ Zauważone błędy i propozycje zmian tłumaczenia proszę zgłaszać na e-mail: <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog diff --git a/data/locale/pt.qm b/data/locale/pt.qm index 6f1c4cb18..44388c433 100644 Binary files a/data/locale/pt.qm and b/data/locale/pt.qm differ diff --git a/data/locale/pt.ts b/data/locale/pt.ts index eb1d0c767..ea1b7886c 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -11,10 +11,6 @@ License Licença - - LMMS (Linux MultiMedia Studio) - LMMS (Linux MultiMedia Studio) - Authors Autores @@ -53,6 +49,10 @@ Qualquer sugestão para tradução, entre em contato pela lista de desenvolvedor Esteban Viveros + + LMMS + LMMS + AmplifierControlDialog diff --git a/data/locale/ru.qm b/data/locale/ru.qm index bf450fbdf..31e56c321 100644 Binary files a/data/locale/ru.qm and b/data/locale/ru.qm differ diff --git a/data/locale/ru.ts b/data/locale/ru.ts index d69550985..3ea31a994 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -8,11 +8,6 @@ Об LMMS О программе LMMS - - LMMS (Linux MultiMedia Studio) - Линукс-МультиМедия-Студия - LMMS (Линукс-МультиМедийная-Студия) - Version %1 (%2/%3, Qt %4, %5) Версия %1 (%2/%3, Qt %4, %5) @@ -53,6 +48,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> <html><head/><body><p><a href="http://lmms.sf.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sf.net</span></a></p></body></html> + + LMMS + ЛММС + AmplifierControlDialog @@ -1415,7 +1414,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Mute - + Заглушить Mute this FX channel diff --git a/data/locale/sv.qm b/data/locale/sv.qm index 7974e103f..9fc624405 100644 Binary files a/data/locale/sv.qm and b/data/locale/sv.qm differ diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 7a3d0894f..2c6147fab 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -7,10 +7,6 @@ About LMMS - - LMMS (Linux MultiMedia Studio) - - Version %1 (%2/%3, Qt %4, %5) @@ -49,6 +45,10 @@ If you're interested in translating LMMS in another language or want to imp <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + + AmplifierControlDialog diff --git a/data/locale/zh.qm b/data/locale/zh.qm index 6a0972348..af938fe77 100644 Binary files a/data/locale/zh.qm and b/data/locale/zh.qm differ diff --git a/data/locale/zh.ts b/data/locale/zh.ts index 91b3fc14f..d2b19e6bf 100644 --- a/data/locale/zh.ts +++ b/data/locale/zh.ts @@ -7,10 +7,6 @@ About LMMS 关于LMMS - - LMMS (Linux MultiMedia Studio) - LMMS (Linux 多媒体工作室) - Version %1 (%2/%3, Qt %4, %5) 版本 %1 (%2/%3, Qt %4, %5) @@ -56,6 +52,10 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> <html><head/><body><p><a href="http://lmms.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">http://lmms.sourceforge.net</span></a></p></body></html> + + LMMS + LMMS + AmplifierControlDialog diff --git a/lmms.spec.in b/lmms.spec.in index 15acdc892..db365f068 100644 --- a/lmms.spec.in +++ b/lmms.spec.in @@ -13,7 +13,7 @@ %define with_sf 1%{nil} # Build by setting these defines on the command line, for example: -# rpmbuild --define 'disttag .EL' --define 'repotag .fc6' +# rpmbuild --define 'disttag .EL' --define 'repotag .fc6' %{!?desktop_vendor: %{expand: %%define desktop_vendor rpmfarm}} # This can be changed at build time: # rpmbuild --define 'desktop_vendor RPMfarm' @@ -30,7 +30,7 @@ URL: http://lmms.sourceforge.net/ Group: Applications/Multimedia Provides: lmms = %{version}-%{release} BuildRequires: gcc gcc-c++ libstdc++-devel autoconf automake libtool make -BuildRequires: alsa-lib-devel +BuildRequires: alsa-lib-devel BuildRequires: qt-devel > 3.0 # ------------- BuildRequires: %if %{with_vorbis} @@ -40,7 +40,7 @@ BuildRequires: libvorbis libvorbis-devel BuildRequires: SDL SDL-devel SDL_sound %endif %if %{with_sr} -BuildRequires: libsamplerate libsamplerate-devel +BuildRequires: libsamplerate libsamplerate-devel %endif %if %{with_sf} BuildRequires: libsndfile libsndfile-devel @@ -57,7 +57,7 @@ Requires: qt >= 3.0 alsa-lib Requires: libsamplerate %endif %if %{with_sf} -Requires: libsndfile +Requires: libsndfile %endif %if %{with_jack} Requires: jack-audio-connection-kit @@ -116,13 +116,13 @@ Group: Applications/Multimedia Provides: lmms-data = %{version}-%{release} %description data -This package contains platform-independent data and resources for Linux -MultiMedia Studio (LMMS), e.g. samples, presets and demo-projects. +This package contains platform-independent data and resources for LMMS, e.g. +samples, presets and demo-projects. %description data -l de -Dieses Paket beinhaltet plattform-unabhaengige Daten und Resourcen fuer Linux -MultiMedia Studio (LMMS), wie z.B. Samples, Presets und Demo-Projekte. +Dieses Paket beinhaltet plattform-unabhaengige Daten und Resourcen fuer LMMS, +wie z.B. Samples, Presets und Demo-Projekte. %prep @@ -156,7 +156,7 @@ MultiMedia Studio (LMMS), wie z.B. Samples, Presets und Demo-Projekte. # Create a desktop menu entry %{__cat} > %{name}.desktop << EOF [Desktop Entry] -Name=Linux MultiMedia Studio +Name=LMMS Comment=Powerful sequencer-, synthesizer- and sample-studio for Linux Exec=lmms Icon=%{_datadir}/%{name}/themes/default/icon.png diff --git a/plugins/zynaddsubfx/zynaddsubfx.rc.in b/plugins/zynaddsubfx/zynaddsubfx.rc.in index 3cb13470c..da34d43a2 100644 --- a/plugins/zynaddsubfx/zynaddsubfx.rc.in +++ b/plugins/zynaddsubfx/zynaddsubfx.rc.in @@ -13,7 +13,7 @@ BEGIN BLOCK "040904E4" //language ID = U.S. English, charset = Windows, Multilingual BEGIN - VALUE "Comments", "ZynAddSubFX Plugin - Linux MultiMedia Studio (http://lmms.sf.net)\0" + VALUE "Comments", "ZynAddSubFX Plugin - LMMS (http://lmms.sf.net)\0" VALUE "CompanyName", "LMMS Developers\0" VALUE "FileDescription", "ZynAddSubFX LMMS Plugin\0" VALUE "FileVersion", "2.3.0/@VERSION@\0" diff --git a/src/core/main.cpp b/src/core/main.cpp index 7d66664e0..2ad8bfbcd 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -131,13 +131,13 @@ int main( int argc, char * * argv ) if( QString( argv[i] ) == "--version" || QString( argv[i] ) == "-v" ) { - printf( "\nLinux MultiMedia Studio %s\n(%s %s, Qt %s, %s)\n\n" + printf( "LMMS %s\n(%s %s, Qt %s, %s)\n\n" "Copyright (c) 2004-2014 LMMS developers.\n\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public\n" "License as published by the Free Software Foundation; either\n" "version 2 of the License, or (at your option) any later version.\n\n" - "Try \"%s --help\" for more information.\n\n", LMMS_VERSION, + "Try \"%s --help\" for more information.\n\n", LMMS_VERSION, PLATFORM, MACHINE, QT_VERSION_STR, GCC_VERSION, argv[0] ); @@ -146,7 +146,7 @@ int main( int argc, char * * argv ) else if( argc > i && ( QString( argv[i] ) == "--help" || QString( argv[i] ) == "-h" ) ) { - printf( "\nLinux MultiMedia Studio %s\n" + printf( "LMMS %s\n" "Copyright (c) 2004-2014 LMMS developers.\n\n" "usage: lmms [ -r ] [ options ]\n" " [ -u ]\n" @@ -397,7 +397,7 @@ int main( int argc, char * * argv ) // init style and palette LmmsStyle * lmmsstyle = new LmmsStyle(); QApplication::setStyle( lmmsstyle ); - + LmmsPalette * lmmspal = new LmmsPalette( NULL, lmmsstyle ); QPalette lpal = lmmspal->palette();