From 6e87b2600bfad246a3d9696c6a860fc43e01686d Mon Sep 17 00:00:00 2001 From: Anonymouqs Date: Tue, 6 Mar 2018 06:27:11 -0600 Subject: [PATCH 1/6] Change Phrygolydian to Phygrian Corrects a spelling error --- data/locale/ar.ts | 2 +- data/locale/bs.ts | 2 +- data/locale/ca.ts | 2 +- data/locale/cs.ts | 2 +- data/locale/de.ts | 2 +- data/locale/en.ts | 2 +- data/locale/es.ts | 2 +- data/locale/fa.ts | 4 ++-- data/locale/fr.ts | 2 +- data/locale/gl.ts | 2 +- data/locale/hu_HU.ts | 2 +- data/locale/it.ts | 2 +- data/locale/ja.ts | 2 +- data/locale/ko.ts | 2 +- data/locale/nl.ts | 2 +- data/locale/pl.ts | 2 +- data/locale/pt.ts | 2 +- data/locale/ru.ts | 2 +- data/locale/sl.ts | 2 +- data/locale/sr.ts | 2 +- data/locale/sv.ts | 2 +- data/locale/uk.ts | 2 +- data/locale/zh_CN.ts | 2 +- data/locale/zh_TW.ts | 2 +- src/core/InstrumentFunctions.cpp | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/locale/ar.ts b/data/locale/ar.ts index e618e2877be..e9f2de67c39 100644 --- a/data/locale/ar.ts +++ b/data/locale/ar.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/bs.ts b/data/locale/bs.ts index cd28c14a622..14081e39acb 100644 --- a/data/locale/bs.ts +++ b/data/locale/bs.ts @@ -3524,7 +3524,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 8432a73e73b..83d58c4217a 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/cs.ts b/data/locale/cs.ts index ebaee2c0024..38660dbb7d2 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri dórská - Phrygolydian + Phrygian frygická diff --git a/data/locale/de.ts b/data/locale/de.ts index ccc4e44385c..b88e34b2c13 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -2909,7 +2909,7 @@ Sie können FX Kanäle im Kontextmenü entfernen und verschieben, welches durch Dorisch - Phrygolydian + Phrygian Phrygisch diff --git a/data/locale/en.ts b/data/locale/en.ts index 12b1b30ccee..117dbd315a7 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -3651,7 +3651,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/es.ts b/data/locale/es.ts index d50953d8e11..284b1dcec3d 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -2910,7 +2910,7 @@ Puedes quitar y mover los canales FX a través del menú contextual. Accede a es modo Dórico - Phrygolydian + Phrygian modo Frigio diff --git a/data/locale/fa.ts b/data/locale/fa.ts index 7593cb57e0d..2860d38fd47 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -2660,8 +2660,8 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygolydian - Phrygolydian + Phrygian + Phrygian Lydian diff --git a/data/locale/fr.ts b/data/locale/fr.ts index ae72c61ddd9..cc3a6989b3c 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -2917,7 +2917,7 @@ Vous pouvez supprimer et déplacer les canaux d'effets dans le menu context Dorienne - Phrygolydian + Phrygian Phrygo-lydienne diff --git a/data/locale/gl.ts b/data/locale/gl.ts index 0956b91731c..6bf04932d02 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -2903,7 +2903,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorio - Phrygolydian + Phrygian Frixio-lidio diff --git a/data/locale/hu_HU.ts b/data/locale/hu_HU.ts index 6bde2330809..10eb6cf47a3 100644 --- a/data/locale/hu_HU.ts +++ b/data/locale/hu_HU.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/it.ts b/data/locale/it.ts index f019943ab08..d5cc528beba 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -2915,7 +2915,7 @@ Puoi rimuovere e muovere i canali con il menù contestuale, cliccando con il tas Dorica - Phrygolydian + Phrygian Frigia diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 4b355e2c3d0..d136e8e232a 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/ko.ts b/data/locale/ko.ts index c82a2f8bffa..12322d289c7 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 4b2da31bc31..70f61912b10 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -2924,7 +2924,7 @@ U kunt FX-kanalen verwijderen en verplaatsen in het contextmenu, dat toegankelij Dorisch - Phrygolydian + Phrygian Frygolydisch diff --git a/data/locale/pl.ts b/data/locale/pl.ts index 2e8f989ce5a..1204de61966 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -2907,7 +2907,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/pt.ts b/data/locale/pt.ts index 58a5318e4c9..6a78d728b12 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -2905,7 +2905,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dório - Phrygolydian + Phrygian Frígio diff --git a/data/locale/ru.ts b/data/locale/ru.ts index 4ef85094a40..cf82cad2fdb 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -2912,7 +2912,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/sl.ts b/data/locale/sl.ts index 57de86f3fc6..8186920bc97 100644 --- a/data/locale/sl.ts +++ b/data/locale/sl.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/sr.ts b/data/locale/sr.ts index 1d38c5d24d9..cffeeed0291 100644 --- a/data/locale/sr.ts +++ b/data/locale/sr.ts @@ -2833,7 +2833,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 173b1f76ee7..15fba222c75 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phrygian diff --git a/data/locale/uk.ts b/data/locale/uk.ts index 583dbf13615..41ab6b386b4 100644 --- a/data/locale/uk.ts +++ b/data/locale/uk.ts @@ -2910,7 +2910,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Дорійська - Phrygolydian + Phrygian Фруголідійська diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts index 333cad64ff6..0743657ee49 100644 --- a/data/locale/zh_CN.ts +++ b/data/locale/zh_CN.ts @@ -2904,7 +2904,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygolydian + Phrygian diff --git a/data/locale/zh_TW.ts b/data/locale/zh_TW.ts index 54b9a39530e..172c8cf19c4 100644 --- a/data/locale/zh_TW.ts +++ b/data/locale/zh_TW.ts @@ -2899,7 +2899,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygolydian + Phrygian diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 2860045b8df..3c69d52befc 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -125,7 +125,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, From 22f8db4c9c8465032762e2f564f7b81254a4ea67 Mon Sep 17 00:00:00 2001 From: Anonymouqs Date: Tue, 6 Mar 2018 06:29:37 -0600 Subject: [PATCH 2/6] Revert "Change Phrygolydian to Phygrian" This reverts commit 6e87b2600bfad246a3d9696c6a860fc43e01686d. --- data/locale/ar.ts | 2 +- data/locale/bs.ts | 2 +- data/locale/ca.ts | 2 +- data/locale/cs.ts | 2 +- data/locale/de.ts | 2 +- data/locale/en.ts | 2 +- data/locale/es.ts | 2 +- data/locale/fa.ts | 4 ++-- data/locale/fr.ts | 2 +- data/locale/gl.ts | 2 +- data/locale/hu_HU.ts | 2 +- data/locale/it.ts | 2 +- data/locale/ja.ts | 2 +- data/locale/ko.ts | 2 +- data/locale/nl.ts | 2 +- data/locale/pl.ts | 2 +- data/locale/pt.ts | 2 +- data/locale/ru.ts | 2 +- data/locale/sl.ts | 2 +- data/locale/sr.ts | 2 +- data/locale/sv.ts | 2 +- data/locale/uk.ts | 2 +- data/locale/zh_CN.ts | 2 +- data/locale/zh_TW.ts | 2 +- src/core/InstrumentFunctions.cpp | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/locale/ar.ts b/data/locale/ar.ts index e9f2de67c39..e618e2877be 100644 --- a/data/locale/ar.ts +++ b/data/locale/ar.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/bs.ts b/data/locale/bs.ts index 14081e39acb..cd28c14a622 100644 --- a/data/locale/bs.ts +++ b/data/locale/bs.ts @@ -3524,7 +3524,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 83d58c4217a..8432a73e73b 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/cs.ts b/data/locale/cs.ts index 38660dbb7d2..ebaee2c0024 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri dórská - Phrygian + Phrygolydian frygická diff --git a/data/locale/de.ts b/data/locale/de.ts index b88e34b2c13..ccc4e44385c 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -2909,7 +2909,7 @@ Sie können FX Kanäle im Kontextmenü entfernen und verschieben, welches durch Dorisch - Phrygian + Phrygolydian Phrygisch diff --git a/data/locale/en.ts b/data/locale/en.ts index 117dbd315a7..12b1b30ccee 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -3651,7 +3651,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/es.ts b/data/locale/es.ts index 284b1dcec3d..d50953d8e11 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -2910,7 +2910,7 @@ Puedes quitar y mover los canales FX a través del menú contextual. Accede a es modo Dórico - Phrygian + Phrygolydian modo Frigio diff --git a/data/locale/fa.ts b/data/locale/fa.ts index 2860d38fd47..7593cb57e0d 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -2660,8 +2660,8 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygian - Phrygian + Phrygolydian + Phrygolydian Lydian diff --git a/data/locale/fr.ts b/data/locale/fr.ts index cc3a6989b3c..ae72c61ddd9 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -2917,7 +2917,7 @@ Vous pouvez supprimer et déplacer les canaux d'effets dans le menu context Dorienne - Phrygian + Phrygolydian Phrygo-lydienne diff --git a/data/locale/gl.ts b/data/locale/gl.ts index 6bf04932d02..0956b91731c 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -2903,7 +2903,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorio - Phrygian + Phrygolydian Frixio-lidio diff --git a/data/locale/hu_HU.ts b/data/locale/hu_HU.ts index 10eb6cf47a3..6bde2330809 100644 --- a/data/locale/hu_HU.ts +++ b/data/locale/hu_HU.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/it.ts b/data/locale/it.ts index d5cc528beba..f019943ab08 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -2915,7 +2915,7 @@ Puoi rimuovere e muovere i canali con il menù contestuale, cliccando con il tas Dorica - Phrygian + Phrygolydian Frigia diff --git a/data/locale/ja.ts b/data/locale/ja.ts index d136e8e232a..4b355e2c3d0 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/ko.ts b/data/locale/ko.ts index 12322d289c7..c82a2f8bffa 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 70f61912b10..4b2da31bc31 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -2924,7 +2924,7 @@ U kunt FX-kanalen verwijderen en verplaatsen in het contextmenu, dat toegankelij Dorisch - Phrygian + Phrygolydian Frygolydisch diff --git a/data/locale/pl.ts b/data/locale/pl.ts index 1204de61966..2e8f989ce5a 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -2907,7 +2907,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/pt.ts b/data/locale/pt.ts index 6a78d728b12..58a5318e4c9 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -2905,7 +2905,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dório - Phrygian + Phrygolydian Frígio diff --git a/data/locale/ru.ts b/data/locale/ru.ts index cf82cad2fdb..4ef85094a40 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -2912,7 +2912,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/sl.ts b/data/locale/sl.ts index 8186920bc97..57de86f3fc6 100644 --- a/data/locale/sl.ts +++ b/data/locale/sl.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/sr.ts b/data/locale/sr.ts index cffeeed0291..1d38c5d24d9 100644 --- a/data/locale/sr.ts +++ b/data/locale/sr.ts @@ -2833,7 +2833,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 15fba222c75..173b1f76ee7 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygian + Phrygolydian diff --git a/data/locale/uk.ts b/data/locale/uk.ts index 41ab6b386b4..583dbf13615 100644 --- a/data/locale/uk.ts +++ b/data/locale/uk.ts @@ -2910,7 +2910,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Дорійська - Phrygian + Phrygolydian Фруголідійська diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts index 0743657ee49..333cad64ff6 100644 --- a/data/locale/zh_CN.ts +++ b/data/locale/zh_CN.ts @@ -2904,7 +2904,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygian + Phrygolydian diff --git a/data/locale/zh_TW.ts b/data/locale/zh_TW.ts index 172c8cf19c4..54b9a39530e 100644 --- a/data/locale/zh_TW.ts +++ b/data/locale/zh_TW.ts @@ -2899,7 +2899,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygian + Phrygolydian diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 3c69d52befc..2860045b8df 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -125,7 +125,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, From 55fa0815a82ddff74106d816e6d630180ee50fb8 Mon Sep 17 00:00:00 2001 From: Anonymouqs Date: Tue, 6 Mar 2018 06:32:15 -0600 Subject: [PATCH 3/6] Change Phrygolydian to Phygrian Fixes #4219 which was a spelling error. --- data/locale/ar.ts | 2 +- data/locale/bs.ts | 2 +- data/locale/ca.ts | 2 +- data/locale/cs.ts | 2 +- data/locale/de.ts | 2 +- data/locale/en.ts | 2 +- data/locale/es.ts | 2 +- data/locale/fa.ts | 4 ++-- data/locale/fr.ts | 2 +- data/locale/gl.ts | 2 +- data/locale/hu_HU.ts | 2 +- data/locale/it.ts | 2 +- data/locale/ja.ts | 2 +- data/locale/ko.ts | 2 +- data/locale/nl.ts | 2 +- data/locale/pl.ts | 2 +- data/locale/pt.ts | 2 +- data/locale/ru.ts | 2 +- data/locale/sl.ts | 2 +- data/locale/sr.ts | 2 +- data/locale/sv.ts | 2 +- data/locale/uk.ts | 2 +- data/locale/zh_CN.ts | 2 +- data/locale/zh_TW.ts | 2 +- src/core/InstrumentFunctions.cpp | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/locale/ar.ts b/data/locale/ar.ts index e618e2877be..34378a05f83 100644 --- a/data/locale/ar.ts +++ b/data/locale/ar.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/bs.ts b/data/locale/bs.ts index cd28c14a622..fe7159f748a 100644 --- a/data/locale/bs.ts +++ b/data/locale/bs.ts @@ -3524,7 +3524,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 8432a73e73b..7fdb37770c0 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/cs.ts b/data/locale/cs.ts index ebaee2c0024..40c38493664 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri dórská - Phrygolydian + Phygrian frygická diff --git a/data/locale/de.ts b/data/locale/de.ts index ccc4e44385c..1ed8fe4fa42 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -2909,7 +2909,7 @@ Sie können FX Kanäle im Kontextmenü entfernen und verschieben, welches durch Dorisch - Phrygolydian + Phygrian Phrygisch diff --git a/data/locale/en.ts b/data/locale/en.ts index 12b1b30ccee..82c9d95f128 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -3651,7 +3651,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/es.ts b/data/locale/es.ts index d50953d8e11..999875360a4 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -2910,7 +2910,7 @@ Puedes quitar y mover los canales FX a través del menú contextual. Accede a es modo Dórico - Phrygolydian + Phygrian modo Frigio diff --git a/data/locale/fa.ts b/data/locale/fa.ts index 7593cb57e0d..d9c9e6be8a7 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -2660,8 +2660,8 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygolydian - Phrygolydian + Phygrian + Phygrian Lydian diff --git a/data/locale/fr.ts b/data/locale/fr.ts index ae72c61ddd9..34bf5eeabf9 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -2917,7 +2917,7 @@ Vous pouvez supprimer et déplacer les canaux d'effets dans le menu context Dorienne - Phrygolydian + Phygrian Phrygo-lydienne diff --git a/data/locale/gl.ts b/data/locale/gl.ts index 0956b91731c..d2ebe720430 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -2903,7 +2903,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorio - Phrygolydian + Phygrian Frixio-lidio diff --git a/data/locale/hu_HU.ts b/data/locale/hu_HU.ts index 6bde2330809..abfc3fd2588 100644 --- a/data/locale/hu_HU.ts +++ b/data/locale/hu_HU.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/it.ts b/data/locale/it.ts index f019943ab08..15a579769f5 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -2915,7 +2915,7 @@ Puoi rimuovere e muovere i canali con il menù contestuale, cliccando con il tas Dorica - Phrygolydian + Phygrian Frigia diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 4b355e2c3d0..6ae19618407 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/ko.ts b/data/locale/ko.ts index c82a2f8bffa..28e30744917 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 4b2da31bc31..73328c1a07a 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -2924,7 +2924,7 @@ U kunt FX-kanalen verwijderen en verplaatsen in het contextmenu, dat toegankelij Dorisch - Phrygolydian + Phygrian Frygolydisch diff --git a/data/locale/pl.ts b/data/locale/pl.ts index 2e8f989ce5a..c400d5ffb03 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -2907,7 +2907,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/pt.ts b/data/locale/pt.ts index 58a5318e4c9..849a13e8dd4 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -2905,7 +2905,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dório - Phrygolydian + Phygrian Frígio diff --git a/data/locale/ru.ts b/data/locale/ru.ts index 4ef85094a40..db05e55a804 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -2912,7 +2912,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/sl.ts b/data/locale/sl.ts index 57de86f3fc6..8418dfe3148 100644 --- a/data/locale/sl.ts +++ b/data/locale/sl.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/sr.ts b/data/locale/sr.ts index 1d38c5d24d9..e3bf4e3ed43 100644 --- a/data/locale/sr.ts +++ b/data/locale/sr.ts @@ -2833,7 +2833,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 173b1f76ee7..279d82d4bc7 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phrygolydian + Phygrian diff --git a/data/locale/uk.ts b/data/locale/uk.ts index 583dbf13615..0b317eae34e 100644 --- a/data/locale/uk.ts +++ b/data/locale/uk.ts @@ -2910,7 +2910,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Дорійська - Phrygolydian + Phygrian Фруголідійська diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts index 333cad64ff6..7e45934610c 100644 --- a/data/locale/zh_CN.ts +++ b/data/locale/zh_CN.ts @@ -2904,7 +2904,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygolydian + Phygrian diff --git a/data/locale/zh_TW.ts b/data/locale/zh_TW.ts index 54b9a39530e..0eb177ab289 100644 --- a/data/locale/zh_TW.ts +++ b/data/locale/zh_TW.ts @@ -2899,7 +2899,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phrygolydian + Phygrian diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 2860045b8df..45cc42d9d63 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -125,7 +125,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phygrian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, From f5807d4cacd9b4d4747804688ed9e90c0512cea7 Mon Sep 17 00:00:00 2001 From: Anonymouqs Date: Tue, 6 Mar 2018 10:14:30 -0600 Subject: [PATCH 4/6] Revert "Change Phrygolydian to Phygrian" This reverts commit 55fa0815a82ddff74106d816e6d630180ee50fb8. --- data/locale/ar.ts | 2 +- data/locale/bs.ts | 2 +- data/locale/ca.ts | 2 +- data/locale/cs.ts | 2 +- data/locale/de.ts | 2 +- data/locale/en.ts | 2 +- data/locale/es.ts | 2 +- data/locale/fa.ts | 4 ++-- data/locale/fr.ts | 2 +- data/locale/gl.ts | 2 +- data/locale/hu_HU.ts | 2 +- data/locale/it.ts | 2 +- data/locale/ja.ts | 2 +- data/locale/ko.ts | 2 +- data/locale/nl.ts | 2 +- data/locale/pl.ts | 2 +- data/locale/pt.ts | 2 +- data/locale/ru.ts | 2 +- data/locale/sl.ts | 2 +- data/locale/sr.ts | 2 +- data/locale/sv.ts | 2 +- data/locale/uk.ts | 2 +- data/locale/zh_CN.ts | 2 +- data/locale/zh_TW.ts | 2 +- src/core/InstrumentFunctions.cpp | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/locale/ar.ts b/data/locale/ar.ts index 34378a05f83..e618e2877be 100644 --- a/data/locale/ar.ts +++ b/data/locale/ar.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/bs.ts b/data/locale/bs.ts index fe7159f748a..cd28c14a622 100644 --- a/data/locale/bs.ts +++ b/data/locale/bs.ts @@ -3524,7 +3524,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 7fdb37770c0..8432a73e73b 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/cs.ts b/data/locale/cs.ts index 40c38493664..ebaee2c0024 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri dórská - Phygrian + Phrygolydian frygická diff --git a/data/locale/de.ts b/data/locale/de.ts index 1ed8fe4fa42..ccc4e44385c 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -2909,7 +2909,7 @@ Sie können FX Kanäle im Kontextmenü entfernen und verschieben, welches durch Dorisch - Phygrian + Phrygolydian Phrygisch diff --git a/data/locale/en.ts b/data/locale/en.ts index 82c9d95f128..12b1b30ccee 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -3651,7 +3651,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/es.ts b/data/locale/es.ts index 999875360a4..d50953d8e11 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -2910,7 +2910,7 @@ Puedes quitar y mover los canales FX a través del menú contextual. Accede a es modo Dórico - Phygrian + Phrygolydian modo Frigio diff --git a/data/locale/fa.ts b/data/locale/fa.ts index d9c9e6be8a7..7593cb57e0d 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -2660,8 +2660,8 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phygrian - Phygrian + Phrygolydian + Phrygolydian Lydian diff --git a/data/locale/fr.ts b/data/locale/fr.ts index 34bf5eeabf9..ae72c61ddd9 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -2917,7 +2917,7 @@ Vous pouvez supprimer et déplacer les canaux d'effets dans le menu context Dorienne - Phygrian + Phrygolydian Phrygo-lydienne diff --git a/data/locale/gl.ts b/data/locale/gl.ts index d2ebe720430..0956b91731c 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -2903,7 +2903,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorio - Phygrian + Phrygolydian Frixio-lidio diff --git a/data/locale/hu_HU.ts b/data/locale/hu_HU.ts index abfc3fd2588..6bde2330809 100644 --- a/data/locale/hu_HU.ts +++ b/data/locale/hu_HU.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/it.ts b/data/locale/it.ts index 15a579769f5..f019943ab08 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -2915,7 +2915,7 @@ Puoi rimuovere e muovere i canali con il menù contestuale, cliccando con il tas Dorica - Phygrian + Phrygolydian Frigia diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 6ae19618407..4b355e2c3d0 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -2891,7 +2891,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/ko.ts b/data/locale/ko.ts index 28e30744917..c82a2f8bffa 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 73328c1a07a..4b2da31bc31 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -2924,7 +2924,7 @@ U kunt FX-kanalen verwijderen en verplaatsen in het contextmenu, dat toegankelij Dorisch - Phygrian + Phrygolydian Frygolydisch diff --git a/data/locale/pl.ts b/data/locale/pl.ts index c400d5ffb03..2e8f989ce5a 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -2907,7 +2907,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/pt.ts b/data/locale/pt.ts index 849a13e8dd4..58a5318e4c9 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -2905,7 +2905,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dório - Phygrian + Phrygolydian Frígio diff --git a/data/locale/ru.ts b/data/locale/ru.ts index db05e55a804..4ef85094a40 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -2912,7 +2912,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/sl.ts b/data/locale/sl.ts index 8418dfe3148..57de86f3fc6 100644 --- a/data/locale/sl.ts +++ b/data/locale/sl.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/sr.ts b/data/locale/sr.ts index e3bf4e3ed43..1d38c5d24d9 100644 --- a/data/locale/sr.ts +++ b/data/locale/sr.ts @@ -2833,7 +2833,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 279d82d4bc7..173b1f76ee7 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -2889,7 +2889,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri - Phygrian + Phrygolydian diff --git a/data/locale/uk.ts b/data/locale/uk.ts index 0b317eae34e..583dbf13615 100644 --- a/data/locale/uk.ts +++ b/data/locale/uk.ts @@ -2910,7 +2910,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Дорійська - Phygrian + Phrygolydian Фруголідійська diff --git a/data/locale/zh_CN.ts b/data/locale/zh_CN.ts index 7e45934610c..333cad64ff6 100644 --- a/data/locale/zh_CN.ts +++ b/data/locale/zh_CN.ts @@ -2904,7 +2904,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phygrian + Phrygolydian diff --git a/data/locale/zh_TW.ts b/data/locale/zh_TW.ts index 0eb177ab289..54b9a39530e 100644 --- a/data/locale/zh_TW.ts +++ b/data/locale/zh_TW.ts @@ -2899,7 +2899,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri Dorian - Phygrian + Phrygolydian diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 45cc42d9d63..2860045b8df 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -125,7 +125,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phygrian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, From 6b15471f344599fb02481604851dcdaad6b4a7d4 Mon Sep 17 00:00:00 2001 From: Anonymouqs Date: Tue, 6 Mar 2018 10:18:07 -0600 Subject: [PATCH 5/6] Change changes to only change InstrumentFunctions.cpp Refinement of 55fa0815a82ddff74106d816e6d630180ee50fb8 All the changes to the .ts files were undone. This commit name is weird. --- src/core/InstrumentFunctions.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 2860045b8df..95476452cb9 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -45,7 +45,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "aug" ), { 0, 4, 8, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "augsus4" ), { 0, 5, 8, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "tri" ), { 0, 3, 6, 9, -1 } }, - + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "6" ), { 0, 4, 7, 9, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "6sus4" ), { 0, 5, 7, 9, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "6add9" ), { 0, 4, 7, 9, 14, -1 } }, @@ -125,7 +125,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phygrian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, @@ -133,7 +133,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Minor" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Chromatic" ), { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Half-Whole Diminished" ), { 0, 1, 3, 4, 6, 7, 9, 10, -1 } }, - + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "5" ), { 0, 7, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygian dominant" ), { 0, 1, 4, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Persian" ), { 0, 1, 4, 5, 6, 8, 11, -1 } } @@ -262,7 +262,7 @@ void InstrumentFunctionNoteStacking::processNote( NotePlayHandle * _n ) // create sub-note-play-handle, only note is // different - Engine::mixer()->addPlayHandle( + Engine::mixer()->addPlayHandle( NotePlayHandleManager::acquire( _n->instrumentTrack(), _n->offset(), _n->frames(), note_copy, _n, -1, NotePlayHandle::OriginNoteStacking ) ); @@ -569,13 +569,10 @@ void InstrumentFunctionArpeggio::loadSettings( const QDomElement & _this ) // Keep compatibility with version 0.2.1 file format if( _this.hasAttribute( "arpsyncmode" ) ) { - m_arpTimeKnob->setSyncMode( + m_arpTimeKnob->setSyncMode( ( tempoSyncKnob::tempoSyncMode ) _this.attribute( "arpsyncmode" ).toInt() ); }*/ m_arpModeModel.loadSettings( _this, "arpmode" ); } - - - From 513a2c9ad3bf38feca598832a9dbb7df4e17123d Mon Sep 17 00:00:00 2001 From: Anonymouqs Date: Wed, 7 Mar 2018 09:17:36 -0600 Subject: [PATCH 6/6] Phygrian to Phrygian Gosh that word is so confusing to spell --- src/core/InstrumentFunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 95476452cb9..5cf02c9342c 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -125,7 +125,7 @@ InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking: { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phygrian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } },