From e15d47a854b5a2786968fd8a783abc6a16d945d3 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Tue, 21 Dec 2010 04:31:02 +0000 Subject: Make sure cmake enters share/locale last. cliplist links to widgets. --- muse2/CMakeLists.txt | 4 ++- muse2/ChangeLog | 3 ++ muse2/muse/cliplist/CMakeLists.txt | 1 + muse2/share/CMakeLists.txt | 4 ++- muse2/share/locale/muse_de.ts | 37 ++++++++++++++++++++---- muse2/share/locale/muse_es.ts | 42 +++++++++++++++++++-------- muse2/share/locale/muse_fr.ts | 42 +++++++++++++++++++-------- muse2/share/locale/muse_pl.ts | 42 +++++++++++++++++++-------- muse2/share/locale/muse_ru.ts | 59 +++++++++++++++++++++++++++++--------- muse2/share/locale/muse_sv_SE.ts | 42 +++++++++++++++++++-------- 10 files changed, 206 insertions(+), 70 deletions(-) diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt index a7d86d17..41bc9fec 100644 --- a/muse2/CMakeLists.txt +++ b/muse2/CMakeLists.txt @@ -355,7 +355,9 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g -DQT_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}") # subdirs(al awl grepmidi plugins midiplugins muse share synti) # subdirs(al lib grepmidi plugins xpm muse share demos doc synti utils) #subdirs(al lib grepmidi plugins muse share demos synti ) -subdirs(al awl grepmidi plugins muse share synti packaging utils demos) +# NOTE: share/ directory needs to be at the end so that the translations +# are scanned before coming to share/locale +subdirs(al awl grepmidi plugins muse synti packaging utils demos share) ## Install doc files file (GLOB doc_files diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 77825d3d..c12cbfb4 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -6,6 +6,9 @@ - Don't pack the binary and subversion directories when doing "make package_source". (Orcan) - Updated the Russian translation again thanks to Alex, alex54m -> mail.ru - Fix a typo in awl/CMakeLists.txt that disabled the translations for awl. (Orcan) + - Updated all the .ts files with the latest strings. Made sure that share/locale/CMakeLists + is scanned last so that all the translations are collected before coming to that. (Orcan) + - Fix: cliplist target should depend on widgets target. (Orcan) 19.12.2010: - Fixed not saving part colours and part canvas background appearance settings. (Tim) *Feature: Added 'global opaqueness' (transparency) appearance setting. (Tim) diff --git a/muse2/muse/cliplist/CMakeLists.txt b/muse2/muse/cliplist/CMakeLists.txt index 33936c48..7633b8bb 100644 --- a/muse2/muse/cliplist/CMakeLists.txt +++ b/muse2/muse/cliplist/CMakeLists.txt @@ -63,6 +63,7 @@ set_target_properties( cliplist target_link_libraries ( cliplist ${QT_LIBRARIES} awl + widgets ) ## diff --git a/muse2/share/CMakeLists.txt b/muse2/share/CMakeLists.txt index 817e2910..c8d89cf9 100644 --- a/muse2/share/CMakeLists.txt +++ b/muse2/share/CMakeLists.txt @@ -18,15 +18,17 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= +# NOTE: locale/ directory needs to be at the end so that the translations +# are scanned before coming to share/locale subdirs( drummaps html instruments - locale plugins pybridge scripts templates wallpapers + locale ) diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts index 2ae5719a..81567349 100644 --- a/muse2/share/locale/muse_de.ts +++ b/muse2/share/locale/muse_de.ts @@ -417,6 +417,10 @@ Word-breaking but only with spaces. Qt style sheets (*.qss) + + Global opaqueness (inverse of transparency). + + AppearanceDialogBase @@ -644,6 +648,10 @@ Word-breaking but only with spaces. Font 6 Schriftart 6 + + Global opaqueness + + Arranger @@ -4171,7 +4179,7 @@ Configuration Help Browser: - Hilfe Browser: + Hilfe Browser: Application @@ -4380,6 +4388,14 @@ Shorter periods are desirable. Move single armed track with selection + + On Launch + + + + Behavior + + LMaster @@ -7568,6 +7584,15 @@ Do you still want to import it? &No &Nein + + Unable to launch help + + + + For some reason MusE has to launch the default +browser on your machine. + + NoteInfo @@ -9116,6 +9141,10 @@ click on the Restart button. + + Automation: + + SongInfo @@ -9287,13 +9316,9 @@ click on the Restart button. TimeCanvas - - Ctrl - - Add Controller View - Kontrolleransicht hinzufügen + Kontrolleransicht hinzufügen diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts index 7fb9aebf..3addbc56 100644 --- a/muse2/share/locale/muse_es.ts +++ b/muse2/share/locale/muse_es.ts @@ -438,6 +438,10 @@ Word-breaking but only with spaces. Qt style sheets (*.qss) + + Global opaqueness (inverse of transparency). + + AppearanceDialogBase @@ -685,6 +689,10 @@ Word-breaking but only with spaces. Font 6 + + Global opaqueness + + Arranger @@ -4396,7 +4404,7 @@ Configuration Help Browser: - Navegador de ayuda: + Navegador de ayuda: Application @@ -4605,6 +4613,14 @@ Shorter periods are desirable. Move single armed track with selection + + On Launch + + + + Behavior + + IIWUGuiBase @@ -8059,6 +8075,15 @@ Do you still want to import it? &No + + Unable to launch help + + + + For some reason MusE has to launch the default +browser on your machine. + + NoteInfo @@ -10014,6 +10039,10 @@ click on the Restart button. + + Automation: + + SongInfo @@ -10206,17 +10235,6 @@ click on the Restart button. tempo/firma - - TimeCanvas - - Ctrl - - - - Add Controller View - - - Toolbar1 diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts index c978b3d1..af64bc63 100644 --- a/muse2/share/locale/muse_fr.ts +++ b/muse2/share/locale/muse_fr.ts @@ -466,6 +466,10 @@ Word-breaking but only with spaces. Qt style sheets (*.qss) + + Global opaqueness (inverse of transparency). + + AppearanceDialogBase @@ -714,6 +718,10 @@ dans l'Arrangeur Font 6 Couleurs {6?} + + Global opaqueness + + Arranger @@ -4376,7 +4384,7 @@ l'interface Help Browser: - Navigateur pour l'aide: + Navigateur pour l'aide: Application @@ -4585,6 +4593,14 @@ Shorter periods are desirable. Move single armed track with selection + + On Launch + + + + Behavior + + LMaster @@ -7910,6 +7926,15 @@ Do you still want to import it? &No + + Unable to launch help + + + + For some reason MusE has to launch the default +browser on your machine. + + NoteInfo @@ -9859,6 +9884,10 @@ click on the Restart button. + + Automation: + + SongInfo @@ -10052,17 +10081,6 @@ disponibles Tempo/Sig - - TimeCanvas - - Ctrl - - - - Add Controller View - - - Toolbar1 diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts index 0c2b329b..47038827 100644 --- a/muse2/share/locale/muse_pl.ts +++ b/muse2/share/locale/muse_pl.ts @@ -431,6 +431,10 @@ Word-breaking but only with spaces. Qt style sheets (*.qss) + + Global opaqueness (inverse of transparency). + + AppearanceDialogBase @@ -658,6 +662,10 @@ Word-breaking but only with spaces. Font 6 Czcionka 6 + + Global opaqueness + + Arranger @@ -4187,7 +4195,7 @@ RTC (Rzeczywista Rozdzielczość Zegara) Help Browser: - Przeglądarka pomocy: + Przeglądarka pomocy: Application @@ -4396,6 +4404,14 @@ Shorter periods are desirable. Move single armed track with selection + + On Launch + + + + Behavior + + LMaster @@ -7577,6 +7593,15 @@ Do you still want to import it? &No &Nie + + Unable to launch help + + + + For some reason MusE has to launch the default +browser on your machine. + + NoteInfo @@ -9121,6 +9146,10 @@ click on the Restart button. + + Automation: + + SongInfo @@ -9290,17 +9319,6 @@ click on the Restart button. Tempo/Metrum - - TimeCanvas - - Ctrl - - - - Add Controller View - - - Toolbar1 diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts index 784a9006..9264bb8e 100644 --- a/muse2/share/locale/muse_ru.ts +++ b/muse2/share/locale/muse_ru.ts @@ -1,4 +1,6 @@ - + + + @default @@ -439,6 +441,10 @@ Word-breaking but only with spaces. Qt style sheets (*.qss) Таблицы стилей Qt (*.qss) + + Global opaqueness (inverse of transparency). + + AppearanceDialogBase @@ -666,6 +672,10 @@ Word-breaking but only with spaces. Font 6 Шрифт 6 + + Global opaqueness + + Arranger @@ -1895,15 +1905,15 @@ Right-click to show GUI. Release Rate - + 2° Decay Rate - + 1° Decay Level - + 1° Decay Rate @@ -2568,7 +2578,7 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t Vol - + Громк Channel Ctrl @@ -2576,7 +2586,7 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t Release - + Послезвучие Attack @@ -4374,7 +4384,7 @@ Configuration Help Browser: - В чём читать справку: + В чём читать справку: GUI Refresh Rate @@ -4598,6 +4608,14 @@ Shorter periods are desirable. Move single armed track with selection Назначать "для записи" выбранный трек + + On Launch + + + + Behavior + + LMaster @@ -6565,14 +6583,14 @@ You can specify more than one channel for recording: 1 2 3 record from channel 1 2 and 3 1-3 same - 1-3 5 record from channel 1 2 3 and 5 + 1-3 5 record from channel 1 2 3 and 5 События со всех настроенных каналов записываются в этот трек. Вы можете указать несколько каналов для записи: 1 2 3 записывать с каналов 1, 2 и 3 1-3 то же самое - 1-3 5 записывать с каналов 1, 2, 3 и 5 + 1-3 5 записывать с каналов 1, 2, 3 и 5 record: @@ -7809,6 +7827,15 @@ Do you still want to import it? &No &Нет + + Unable to launch help + + + + For some reason MusE has to launch the default +browser on your machine. + + NewPreset @@ -8773,7 +8800,7 @@ exists. Overwrite? Степень - Don´t Quantize + Don´t Quantize Не Квантовать @@ -9517,6 +9544,10 @@ click on the Restart button. MusE не может запустить скрипт + + Automation: + + SongInfo @@ -9690,12 +9721,12 @@ click on the Restart button. TimeCanvas Ctrl - Ctrl + Ctrl Add Controller View - Добавить Панель Контроллеров + Добавить Панель Контроллеров @@ -10055,7 +10086,7 @@ click on the Restart button. On Вкл - + VAM 1.0beta2 Virtual Analog for MusE Released under GPL. @@ -10069,7 +10100,7 @@ Copyright(C) 2002 Jotsif Lindman Hörnlund ( jotsif@linux.nu ) - + VAM 1.0beta3 Virtual Analog for MusE Released under GPL. diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts index 7c44b7f6..4ae7dfc0 100644 --- a/muse2/share/locale/muse_sv_SE.ts +++ b/muse2/share/locale/muse_sv_SE.ts @@ -456,6 +456,10 @@ Word-breaking but only with spaces. Qt style sheets (*.qss) + + Global opaqueness (inverse of transparency). + + AppearanceDialogBase @@ -703,6 +707,10 @@ Word-breaking but only with spaces. Font 6 Typsnitt 6 + + Global opaqueness + + Arranger @@ -4412,7 +4420,7 @@ Configuration Help Browser: - Hjälpläsare: + Hjälpläsare: GUI Refresh Rate @@ -4629,6 +4637,14 @@ Shorter periods are desirable. Move single armed track with selection + + On Launch + + + + Behavior + + LMaster @@ -7884,6 +7900,15 @@ Do you still want to import it? &No &Nej + + Unable to launch help + + + + For some reason MusE has to launch the default +browser on your machine. + + NewPreset @@ -9773,6 +9798,10 @@ click on the Restart button. + + Automation: + + SongInfo @@ -9980,17 +10009,6 @@ ljudfilerna skall hamna. - - TimeCanvas - - Ctrl - - - - Add Controller View - - - Toolbar1 -- cgit v1.2.3