New upstream version 2.3.2+dfsg1 2.3.2+dfsg1
authormirabilos <tg@debian.org>
Tue, 31 Jul 2018 15:47:06 +0000 (17:47 +0200)
committermirabilos <mirabilos@evolvis.org>
Tue, 31 Jul 2018 15:47:06 +0000 (17:47 +0200)
51 files changed:
CMakeLists.txt
Makefile
Makefile.mingw
Makefile.osx
build/Packaging.cmake
build/package_mac
build/travis/job_macos/script.sh
libmscore/edit.cpp
libmscore/measure.cpp
libmscore/score.h
libmscore/textline.cpp
mscore/data/splash.png
mscore/data/splash.svg
mscore/exportaudio.cpp
mscore/exportmp3.cpp
mscore/inspector/inspectorAmbitus.cpp
mscore/loginmanager.cpp
mscore/loginmanager.h
mscore/musescore.cpp
mscore/musescore.h
mscore/palettebox.cpp
mscore/revision.h
mscore/synthcontrol.cpp
mscore/synthcontrol.h
mtest/libmscore/rhythmicGrouping/groupShortenNotes-ref.mscx [new file with mode: 0644]
mtest/libmscore/rhythmicGrouping/groupShortenNotes.mscx [new file with mode: 0644]
mtest/libmscore/rhythmicGrouping/tst_rhythmicGrouping.cpp
mtest/zerberus/inputControls/inputControls.sfz
share/locale/instruments_ca.ts
share/locale/instruments_cs.ts
share/locale/instruments_de.ts
share/locale/instruments_en_GB.ts
share/locale/instruments_es.ts
share/locale/instruments_fo.ts
share/locale/instruments_he.ts
share/locale/instruments_ja.ts
share/locale/instruments_ko.ts
share/locale/mscore_af.ts
share/locale/mscore_ca.ts
share/locale/mscore_da.ts
share/locale/mscore_de.ts
share/locale/mscore_es.ts
share/locale/mscore_fo.ts
share/locale/mscore_gl.ts
share/locale/mscore_he.ts
share/locale/mscore_ko.ts
share/locale/mscore_pl.ts
zerberus/sfz.cpp
zerberus/voice.cpp
zerberus/zerberus.cpp
zerberus/zone.h

index 021863b..08f8272 100644 (file)
@@ -194,7 +194,7 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 SET(MUSESCORE_NAME "MuseScore")
 SET(MUSESCORE_VERSION_MAJOR  "2")
 SET(MUSESCORE_VERSION_MINOR  "3")
-SET(MUSESCORE_VERSION_PATCH  "1")
+SET(MUSESCORE_VERSION_PATCH  "2")
 SET(MUSESCORE_VERSION       "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
 SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
 #
index f69cd03..e11f040 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ CPUS      := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSOR
 
 PREFIX    = "/usr/local"
 #VERSION   = "2.3b-${REVISION}"
-VERSION = 2.3.1
+VERSION = 2.3.2
 
 # Override SUFFIX and LABEL when multiple versions are installed to avoid conflicts.
 SUFFIX=""# E.g.: SUFFIX="dev" --> "mscore" becomes "mscoredev"
index 215e2ce..d022ac3 100644 (file)
@@ -21,7 +21,7 @@
 
 REVISION  = $(shell type mscore\revision.h)
 #VERSION   = 2.3b-${REVISION}
-VERSION = 2.3.1
+VERSION = 2.3.2
 CPUS = %NUMBER_OF_PROCESSORS%
 BUILD_FOR_WINSTORE="OFF"     # Override with "ON" to enable.
 
index 9c7f544..f258ea8 100644 (file)
@@ -20,7 +20,7 @@
 
 REVISION  = `cat mscore/revision.h`
 #VERSION   = "2.3b-${REVISION}"
-VERSION = 2.3.1
+VERSION = 2.3.2
 PREFIX=../applebuild
 
 XCODEPROJ = mscore.xcodeproj
index 8bc4433..6faad2a 100644 (file)
@@ -61,7 +61,7 @@ IF(MINGW)
 
   file(TO_CMAKE_PATH $ENV{PROGRAMFILES} PROGRAMFILES)
   SET(CPACK_WIX_ROOT "${PROGRAMFILES}/WiX Toolset v3.8")
-  SET(CPACK_WIX_PRODUCT_GUID "6088F9C1-491A-431F-94D1-81FA26AF7620")
+  SET(CPACK_WIX_PRODUCT_GUID "7D01160E-D30F-4E88-8872-4A0A0A782E2E")
   SET(CPACK_WIX_UPGRADE_GUID "6CF17D7E-4CF1-42CF-A23A-B52F7E883D51")
   SET(CPACK_WIX_LICENSE_RTF   "${PROJECT_SOURCE_DIR}/LICENSE.rtf")
   SET(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/mscore/data/mscore.ico")
index a9e2f7e..3ff2705 100755 (executable)
@@ -11,7 +11,7 @@ then
 else
     LONG_NAME=MuseScore
     LONGER_NAME="MuseScore 2"
-    VERSION=2.3.1
+    VERSION=2.3.2
 fi
 
 WORKING_DIRECTORY=applebuild
index 4f89546..de0256d 100755 (executable)
@@ -24,6 +24,12 @@ python build/add-mc-keys.py $MC_CONSUMER_KEY $MC_CONSUMER_SECRET
 fi
 
 make -f Makefile.osx ci
+
+# install lame
+wget -c --no-check-certificate -nv -O musescore_dependencies_macos.zip  http://utils.musescore.org.s3.amazonaws.com/musescore_dependencies_macos.zip
+mkdir -p applebuild/mscore.app/Contents/Resources/Frameworks
+unzip musescore_dependencies_macos.zip -d applebuild/mscore.app/Contents/Resources/Frameworks
+
 if [ "$(grep '^[[:blank:]]*set( *MSCORE_UNSTABLE \+TRUE *)' CMakeLists.txt)" ]
 then # Build is marked UNSTABLE inside CMakeLists.txt
 build/package_mac $BRANCH-$REVISION
index 3ab16f7..2b650ef 100644 (file)
@@ -1516,6 +1516,8 @@ void Score::regroupNotesAndRests(int startTick, int endTick, int track)
                         continue; // this voice is empty here (CR overlaps with CR in other track)
                   if (seg->tick() + curr->actualTicks() > maxTick)
                         break; // outside range
+                  if (curr->tuplet())
+                        break; // do not use Regroup Rhythms inside a tuplet
                   if (curr->isRest()) {
                         // combine consecutive rests
                         ChordRest* lastRest = curr;
@@ -1528,10 +1530,10 @@ void Score::regroupNotesAndRests(int startTick, int endTick, int track)
                               lastRest = cr;
                               }
                         int restTicks = lastRest->tick() + lastRest->duration().ticks() - curr->tick();
-                        if (restTicks > curr->duration().ticks())
+                        if (true)
                               seg = setNoteRest(seg, curr->track(), NoteVal(), Fraction::fromTicks(restTicks), MScore::Direction::AUTO, true);
                         }
-                  else {
+                  else if (curr->isChord()) {
                         // combine tied chords
                         Chord* chord = static_cast<Chord*>(curr);
                         Chord* lastTiedChord = chord;
@@ -1541,7 +1543,7 @@ void Score::regroupNotesAndRests(int startTick, int endTick, int track)
                         if (!lastTiedChord)
                               lastTiedChord = chord;
                         int noteTicks = lastTiedChord->tick() + lastTiedChord->duration().ticks() - chord->tick();
-                        if (noteTicks > chord->duration().ticks()) {
+                        if (true) {
                               // store start/end note for backward/forward ties ending/starting on the group of notes being rewritten
                               int numNotes = chord->notes().size();
                               Note* tieBack[numNotes];
index 70fc830..c398996 100644 (file)
@@ -1621,7 +1621,7 @@ void Measure::adjustToLen(Fraction nf, bool appendRestsIfNecessary)
                               }
                         }
                   }
-            Fraction stretch = score()->staff(staffIdx)->timeStretch(tick());
+            Fraction stretch = s->staff(staffIdx)->timeStretch(tick());
             // if just a single rest
             if (rests == 1 && chords == 0) {
                   // if measure value didn't change, stick to whole measure rest
index 28c24fd..b3c132b 100644 (file)
@@ -285,6 +285,8 @@ class Score : public QObject, public ScoreElement {
       Q_PROPERTY(QString                        poet              READ poet)
       Q_PROPERTY(QString                        subtitle          READ subtitle)
       Q_PROPERTY(QString                        title             READ title)
+      Q_PROPERTY(QString                        mscoreVersion     READ mscoreVersion)
+      Q_PROPERTY(QString                        mscoreRevision    READ mscoreRevision)
 
    public:
       enum class FileError : char {
index 20ac3a9..7467e4d 100644 (file)
@@ -77,8 +77,15 @@ void TextLineSegment::draw(QPainter* painter) const
 
       // color for line (text color comes from the text properties)
       QColor color;
-      if ((selected() && !(score() && score()->printing())) || !tl->visible() || !tl->lineVisible())
+      if ((selected() && !(score() && score()->printing())) || !tl->visible() || !tl->lineVisible()) {
             color = curColor();
+            if (tl->visible() && !tl->lineVisible()) {
+                  if (selected())
+                        color = color.lighter(200);
+                  else
+                        color = Qt::gray;
+                  }
+            }
       else
             color = tl->lineColor();
 
index 05bb7aa..f17c1f6 100644 (file)
Binary files a/mscore/data/splash.png and b/mscore/data/splash.png differ
index 9fd834b..aadbd64 100644 (file)
@@ -1,42 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="1440px" height="900px" viewBox="0 0 1440 900" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background: #F8F2E5;">
-    <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-    <title>splash 2</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#1A75C1" offset="0%"></stop>
-            <stop stop-color="#2A567B" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50.5194131%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#1A75C1" offset="0%"></stop>
-            <stop stop-color="#2A567B" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#1A75C1" offset="0%"></stop>
-            <stop stop-color="#2A567B" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-4">
-            <stop stop-color="#F8F2E5" offset="0%"></stop>
-            <stop stop-color="#D3CDC0" offset="49.9389648%"></stop>
-            <stop stop-color="#F8F2E5" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="MuseScore-Software" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="splash-2">
-            <text id="version" fill="url(#linearGradient-1)" font-family="HelveticaNeue-Thin, Helvetica Neue" font-size="77.4965973" font-style="condensed" font-weight="normal" letter-spacing="1">
-                <tspan x="665.062233" y="574.757709">2.3</tspan>
-            </text>
-            <text id="version-2" fill="url(#linearGradient-1)" font-family="HelveticaNeue-Thin, Helvetica Neue" font-size="38" font-style="condensed" font-weight="normal" letter-spacing="0.490344107">
-                <tspan x="597.668942" y="832.757709">musescore.org</tspan>
-            </text>
-            <g id="Logo-+-sescore" transform="translate(281.734810, 226.252213)">
-                <path d="M134.216083,156.057632 L134.074466,122.623617 C134.074466,117.465243 133.599015,112.787892 132.647588,108.565297 C131.818951,104.382358 130.229226,100.774432 127.878672,97.7876121 C125.677876,94.8144399 122.634305,92.5089826 118.775712,90.8720126 C115.053,89.2350426 110.283822,88.4334243 104.495932,88.4334243 C99.3874458,88.4334243 94.7677635,89.4490306 90.6374088,91.4799859 C86.507054,93.3775526 82.9744174,96.0303865 80.0667272,99.4245821 C77.1865274,102.805387 74.9718551,106.747557 73.4638148,111.224826 C71.9421603,115.554286 71.1810712,120.164686 71.1810712,125.0689 L71.1810712,191.404425 L67.0509783,191.404425 L67.0509783,124.253634 C67.0509783,119.362552 66.629722,114.738762 65.8008234,110.409045 C65.1214199,106.066195 63.7353843,102.271061 61.6704687,98.997121 C59.6052914,95.7563994 56.6976012,93.1774699 52.9748886,91.2796457 C49.2521761,89.3887741 44.4151893,88.4334243 38.4914186,88.4334243 C33.2467897,88.4334243 28.2812769,89.5435543 24.0150415,91.975705 C19.7215775,94.2809048 15.948619,97.5432815 12.9189242,101.612145 C10.0112341,105.554315 7.75598081,110.164972 6.09818377,115.456734 C4.57652925,120.748754 4.14396897,126.338151 4.14396897,132.191535 L4.14396897,191.404425 L2.27373675e-13,191.404425 L2.27373675e-13,132.191536 C2.27373675e-13,112.526733 5.62419576,105.006856 7.68963493,101.612145 C9.75481229,98.2179494 13.1729812,95.0188589 16.1893236,92.4396719 C19.2326326,89.8607425 22.7829737,87.9014587 26.3698055,86.5518662 C30.0925181,85.0552373 34.3471878,84.3506558 38.4914186,84.3506558 C46.7790948,84.0836213 53.6676446,86.1882235 59.184035,90.6716724 C64.8496585,95.0147801 68.5590186,101.041724 70.7600767,108.779027 C72.8386065,101.455795 76.914766,95.5560592 82.9744174,91.0726103 C89.0479448,86.5958566 96.2079943,84.3506558 104.495932,84.3506558 C110.990192,84.3506558 116.357088,85.3062631 120.637199,87.2038298 C124.917049,89.114787 128.354386,91.753973 130.9767,95.1350358 C133.599015,98.4089758 135.46024,102.404707 136.574514,107.162143 C137.674912,111.772543 138.23205,116.917011 138.23205,122.623617 L138.26913,157.65541 C138.323838,162.843555 138.643982,167.454251 140.229418,171.252467 C142.02231,175.461671 144.441196,178.98977 147.457276,181.835992 C150.636728,184.562472 154.22356,186.593943 158.218034,187.930145 C162.362003,189.172872 166.709662,189.773893 171.261273,189.773893 C177.619914,189.773893 183.190762,188.625155 188.027487,186.326136 C192.850859,183.867977 196.858947,180.700387 200.024523,176.758217 C203.325979,172.696049 205.812675,168.00505 207.483562,162.699897 C209.127745,157.421525 209.956382,151.862214 209.956382,146.022477 L209.956382,86.8098446 L214.086998,86.8098446 L214.086998,146.022476 C214.086998,159.702851 211.195449,165.710734 211.195449,165.710734 C209.26589,173.862366 203.794587,180.413633 197.191413,185.69252 C190.697153,190.997673 181.750531,193.635978 171.261273,193.635978 C165.745145,193.635978 160.636396,192.887664 155.948905,191.404425 C151.41117,189.773893 147.402819,187.409209 143.95213,184.294923 C140.650412,181.021241 138.028098,177.078556 136.085187,172.468671 C134.767222,168.993876 134.441004,165.252561 134.2237,161.096661 C134.210085,159.53308 134.210085,157.675684 134.210085,156.058542 L134.216083,156.057632 Z M169.997918,56.7889427 C169.997918,54.2164509 172.130905,52.1319343 174.739344,52.1319343 C177.361658,52.1319343 179.481031,54.2164509 179.481031,56.7889427 C179.481031,59.3681297 177.361658,61.4526463 174.739344,61.4526463 C172.130905,61.4526463 169.997918,59.3681297 169.997918,56.7889427 Z M146.210445,30.7399283 C137.613148,37.7121651 133.068953,47.4754196 133.068953,58.9738869 L136.823129,58.9738869 C136.823129,36.5753572 155.830754,24.8560363 174.606794,24.8560363 C184.139115,24.8560363 192.92107,27.8385991 199.335548,33.2544753 C206.566794,39.3601441 210.389483,48.2535999 210.389483,58.9738869 L214.143659,58.9738869 C214.143659,47.143793 209.868592,37.2813043 201.780924,30.4526109 C194.686236,24.4625614 185.035659,21.1636032 174.606794,21.1636032 C164.0646,21.1636032 153.714573,24.6538756 146.210445,30.7399283 Z" id="Logo" fill="url(#linearGradient-2)"></path>
-                <text id="sescore" fill="url(#linearGradient-3)" font-family="HelveticaNeue-UltraLight, Helvetica Neue" font-size="200.584178" font-weight="200">
-                    <tspan x="221.527605" y="187">sescore</tspan>
-                </text>
-            </g>
-            <rect id="Rectangle-10" fill="url(#linearGradient-4)" x="373.578231" y="463.929515" width="693.157895" height="2.30754663"></rect>
-        </g>
-    </g>
+<svg width="720" height="450" viewBox="0 0 720 450" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="720" height="450" fill="#F8F2E5"/>
+<path d="M1.76879 37C1.84569 35.7695 2.12767 34.6673 2.61473 33.6931C3.10178 32.6934 3.71701 31.7962 4.46042 31.0015C5.22945 30.1812 6.0754 29.425 6.99824 28.7328C7.94672 28.0407 8.90802 27.3742 9.88213 26.7334C10.8306 26.0925 11.7663 25.4516 12.6891 24.8108C13.612 24.1443 14.4323 23.4393 15.15 22.6959C15.8934 21.9525 16.483 21.145 16.9188 20.2734C17.3546 19.3762 17.5725 18.3637 17.5725 17.2357C17.5725 16.3385 17.3931 15.531 17.0342 14.8133C16.6753 14.0699 16.1882 13.4418 15.573 12.9291C14.9834 12.3908 14.2913 11.9807 13.4966 11.6987C12.7276 11.4167 11.9073 11.2757 11.0357 11.2757C9.83086 11.2757 8.77984 11.4936 7.88263 11.9294C6.98542 12.3395 6.24202 12.9163 5.65242 13.6597C5.06283 14.3775 4.61422 15.2362 4.30661 16.236C4.02463 17.2101 3.88364 18.2739 3.88364 19.4275H2.42247C2.57628 16.1975 3.34531 13.8263 4.72958 12.3139C6.13948 10.7758 8.16461 10.0068 10.805 10.0068C11.9329 10.0068 12.9967 10.1606 13.9965 10.4682C14.9962 10.7502 15.8678 11.1988 16.6112 11.814C17.3546 12.4036 17.9442 13.1598 18.38 14.0827C18.8158 14.9799 19.0337 16.0437 19.0337 17.2742C19.0337 18.8379 18.662 20.2222 17.9186 21.427C17.2008 22.6062 16.278 23.6828 15.15 24.657C14.0477 25.6311 12.8429 26.5411 11.5356 27.387C10.2538 28.233 9.03619 29.0789 7.88263 29.9249C6.75471 30.7452 5.7806 31.6167 4.96029 32.5396C4.16562 33.4368 3.71701 34.4365 3.61448 35.5388H19.4566V37H1.76879ZM25.7114 33.0395H27.6724V37H25.7114V33.0395ZM34.9137 28.233C34.8624 29.4634 35.0034 30.5785 35.3367 31.5783C35.6955 32.5524 36.2082 33.3855 36.8747 34.0777C37.5412 34.7442 38.3615 35.2697 39.3357 35.6542C40.3098 36.0131 41.4121 36.1925 42.6425 36.1925C43.6166 36.1925 44.5651 36.0515 45.488 35.7695C46.4108 35.4876 47.2183 35.0774 47.9104 34.5391C48.6282 33.9751 49.1922 33.283 49.6023 32.4627C50.0381 31.6424 50.256 30.7067 50.256 29.6557C50.256 28.3996 49.9996 27.3614 49.487 26.5411C48.9743 25.6952 48.2949 25.0415 47.449 24.58C46.6031 24.1186 45.6418 23.811 44.5651 23.6572C43.5141 23.5034 42.4374 23.4649 41.3352 23.5418V22.2729C42.3093 22.3242 43.2834 22.2858 44.2575 22.1576C45.2572 22.0038 46.1545 21.7218 46.9491 21.3116C47.7438 20.8759 48.3847 20.2863 48.8717 19.5429C49.3844 18.7994 49.6408 17.851 49.6408 16.6974C49.6408 15.7746 49.4229 14.9671 48.9871 14.2749C48.5769 13.5828 48.0258 13.0189 47.3336 12.5831C46.6671 12.1473 45.9109 11.8268 45.065 11.6218C44.2447 11.3911 43.4372 11.2757 42.6425 11.2757C41.489 11.2757 40.4764 11.468 39.6048 11.8525C38.7332 12.237 38.0027 12.7625 37.4131 13.429C36.8491 14.0955 36.4133 14.8902 36.1057 15.813C35.7981 16.7359 35.6186 17.7484 35.5674 18.8507H34.1062C34.1062 17.5434 34.2985 16.3513 34.683 15.2747C35.0931 14.1724 35.6699 13.2367 36.4133 12.4677C37.1567 11.6987 38.0539 11.0963 39.1049 10.6605C40.156 10.2247 41.3352 10.0068 42.6425 10.0068C43.7192 10.0068 44.7574 10.135 45.7571 10.3913C46.7825 10.6477 47.6797 11.045 48.4488 11.5833C49.2434 12.1216 49.8843 12.8138 50.3713 13.6597C50.8584 14.5057 51.1019 15.5182 51.1019 16.6974C51.1019 17.4921 50.9738 18.2355 50.7174 18.9276C50.4867 19.6198 50.1406 20.235 49.6792 20.7733C49.2178 21.3116 48.6666 21.7602 48.0258 22.1191C47.3849 22.4524 46.68 22.6703 45.9109 22.7728V22.8497C46.8081 22.9523 47.6156 23.1958 48.3334 23.5803C49.0512 23.9648 49.6536 24.4647 50.1406 25.0799C50.6533 25.6695 51.0378 26.3617 51.2942 27.1563C51.5762 27.9254 51.7172 28.7585 51.7172 29.6557C51.7172 30.9631 51.4736 32.1038 50.9866 33.0779C50.4995 34.052 49.8458 34.8723 49.0255 35.5388C48.2052 36.1797 47.2439 36.6668 46.1416 37C45.0394 37.3076 43.873 37.4614 42.6425 37.4614C41.1813 37.4614 39.8612 37.2563 38.682 36.8462C37.5284 36.436 36.5415 35.8464 35.7212 35.0774C34.9265 34.2827 34.3241 33.3214 33.9139 32.1935C33.5294 31.04 33.3756 29.7198 33.4525 28.233H34.9137ZM57.7796 33.0395H59.7407V37H57.7796V33.0395ZM65.9053 37C65.9822 35.7695 66.2642 34.6673 66.7512 33.6931C67.2383 32.6934 67.8535 31.7962 68.5969 31.0015C69.366 30.1812 70.2119 29.425 71.1348 28.7328C72.0832 28.0407 73.0445 27.3742 74.0186 26.7334C74.9671 26.0925 75.9028 25.4516 76.8256 24.8108C77.7485 24.1443 78.5688 23.4393 79.2865 22.6959C80.03 21.9525 80.6195 21.145 81.0553 20.2734C81.4911 19.3762 81.709 18.3637 81.709 17.2357C81.709 16.3385 81.5296 15.531 81.1707 14.8133C80.8118 14.0699 80.3247 13.4418 79.7095 12.9291C79.1199 12.3908 78.4278 11.9807 77.6331 11.6987C76.8641 11.4167 76.0438 11.2757 75.1722 11.2757C73.9674 11.2757 72.9164 11.4936 72.0191 11.9294C71.1219 12.3395 70.3785 12.9163 69.7889 13.6597C69.1993 14.3775 68.7507 15.2362 68.4431 16.236C68.1611 17.2101 68.0202 18.2739 68.0202 19.4275H66.559C66.7128 16.1975 67.4818 13.8263 68.8661 12.3139C70.276 10.7758 72.3011 10.0068 74.9415 10.0068C76.0694 10.0068 77.1332 10.1606 78.133 10.4682C79.1327 10.7502 80.0043 11.1988 80.7477 11.814C81.4911 12.4036 82.0807 13.1598 82.5165 14.0827C82.9523 14.9799 83.1702 16.0437 83.1702 17.2742C83.1702 18.8379 82.7985 20.2222 82.0551 21.427C81.3373 22.6062 80.4145 23.6828 79.2865 24.657C78.1843 25.6311 76.9794 26.5411 75.6721 27.387C74.3903 28.233 73.1727 29.0789 72.0191 29.9249C70.8912 30.7452 69.9171 31.6167 69.0968 32.5396C68.3021 33.4368 67.8535 34.4365 67.751 35.5388H83.5932V37H65.9053Z" transform="translate(317 250.672)" fill="url(#paint0_linear)"/>
+<path d="M1.14 8.72H1.9V10.82H1.94C2.02 10.5 2.16 10.2 2.36 9.92C2.56 9.62667 2.8 9.37333 3.08 9.16C3.37333 8.94667 3.69333 8.78 4.04 8.66C4.4 8.54 4.77333 8.48 5.16 8.48C5.65333 8.48 6.08 8.54667 6.44 8.68C6.8 8.8 7.10667 8.96667 7.36 9.18C7.61333 9.38 7.81333 9.61333 7.96 9.88C8.10667 10.1333 8.20667 10.3933 8.26 10.66H8.3C8.60667 9.94 9.01333 9.4 9.52 9.04C10.04 8.66667 10.72 8.48 11.56 8.48C12.0267 8.48 12.4533 8.55333 12.84 8.7C13.24 8.83333 13.58 9.04667 13.86 9.34C14.1533 9.62 14.38 9.98 14.54 10.42C14.7 10.86 14.78 11.38 14.78 11.98V19H14.02V11.96C14.02 11.3067 13.92 10.7933 13.72 10.42C13.52 10.0467 13.28 9.76667 13 9.58C12.7333 9.38 12.46 9.26 12.18 9.22C11.9133 9.16667 11.7067 9.14 11.56 9.14C11.0933 9.14 10.66 9.22 10.26 9.38C9.87333 9.54 9.53333 9.78 9.24 10.1C8.96 10.42 8.74 10.82 8.58 11.3C8.42 11.7667 8.34 12.3067 8.34 12.92V19H7.58V11.96C7.58 11.32 7.48 10.8133 7.28 10.44C7.09333 10.0533 6.86667 9.76667 6.6 9.58C6.34667 9.39333 6.08 9.27333 5.8 9.22C5.53333 9.16667 5.32 9.14 5.16 9.14C4.8 9.14 4.42667 9.21333 4.04 9.36C3.65333 9.50667 3.3 9.73333 2.98 10.04C2.66 10.3467 2.4 10.74 2.2 11.22C2 11.7 1.9 12.2667 1.9 12.92V19H1.14V8.72ZM25.178 19H24.418V16.8H24.378C24.2446 17.1867 24.0513 17.5333 23.798 17.84C23.558 18.1333 23.2713 18.3867 22.938 18.6C22.618 18.8133 22.2646 18.9733 21.878 19.08C21.4913 19.1867 21.098 19.24 20.698 19.24C20.098 19.24 19.5846 19.1667 19.158 19.02C18.7446 18.8733 18.4046 18.68 18.138 18.44C17.8713 18.2 17.658 17.9333 17.498 17.64C17.3513 17.3333 17.2446 17.0267 17.178 16.72C17.1113 16.4133 17.0713 16.12 17.058 15.84C17.0446 15.5467 17.038 15.2933 17.038 15.08V8.72H17.798V15.22C17.798 15.4867 17.818 15.8133 17.858 16.2C17.898 16.5733 18.0113 16.94 18.198 17.3C18.398 17.6467 18.6913 17.9467 19.078 18.2C19.4646 18.4533 20.0113 18.58 20.718 18.58C21.2913 18.58 21.8046 18.4733 22.258 18.26C22.7246 18.0467 23.118 17.7533 23.438 17.38C23.758 16.9933 23.998 16.54 24.158 16.02C24.3313 15.4867 24.418 14.9067 24.418 14.28V8.72H25.178V19ZM27.7691 15.58C27.7957 16.06 27.9024 16.4867 28.0891 16.86C28.2757 17.22 28.5157 17.5333 28.8091 17.8C29.1157 18.0533 29.4691 18.2467 29.8691 18.38C30.2691 18.5133 30.7024 18.58 31.1691 18.58C31.5024 18.58 31.8557 18.5533 32.2291 18.5C32.6157 18.4333 32.9691 18.32 33.2891 18.16C33.6224 18 33.8957 17.78 34.1091 17.5C34.3224 17.2067 34.4291 16.84 34.4291 16.4C34.4291 15.8267 34.2557 15.3933 33.9091 15.1C33.5624 14.8067 33.1224 14.58 32.5891 14.42C32.0691 14.26 31.5024 14.1333 30.8891 14.04C30.2891 13.9333 29.7224 13.78 29.1891 13.58C28.6691 13.38 28.2357 13.1 27.8891 12.74C27.5424 12.3667 27.3691 11.8267 27.3691 11.12C27.3691 10.6133 27.4824 10.1933 27.7091 9.86C27.9357 9.51333 28.2224 9.24 28.5691 9.04C28.9291 8.84 29.3291 8.7 29.7691 8.62C30.2091 8.52667 30.6491 8.48 31.0891 8.48C31.6224 8.48 32.1224 8.54 32.5891 8.66C33.0557 8.78 33.4557 8.97333 33.7891 9.24C34.1357 9.50667 34.4024 9.84667 34.5891 10.26C34.7891 10.6733 34.8891 11.1733 34.8891 11.76H34.1291C34.1291 11.2933 34.0491 10.8933 33.8891 10.56C33.7424 10.2267 33.5291 9.96 33.2491 9.76C32.9824 9.54667 32.6624 9.39333 32.2891 9.3C31.9157 9.19333 31.5157 9.14 31.0891 9.14C30.7424 9.14 30.3891 9.17333 30.0291 9.24C29.6824 9.30667 29.3691 9.42 29.0891 9.58C28.8091 9.74 28.5757 9.94667 28.3891 10.2C28.2157 10.4533 28.1291 10.76 28.1291 11.12C28.1291 11.5333 28.2291 11.8667 28.4291 12.12C28.6291 12.3733 28.8891 12.58 29.2091 12.74C29.5424 12.8867 29.9091 13.0067 30.3091 13.1C30.7224 13.1933 31.1357 13.2867 31.5491 13.38C32.0557 13.4733 32.5291 13.5867 32.9691 13.72C33.4224 13.84 33.8091 14.0133 34.1291 14.24C34.4624 14.4533 34.7224 14.7333 34.9091 15.08C35.0957 15.4267 35.1891 15.8667 35.1891 16.4C35.1891 16.96 35.0624 17.42 34.8091 17.78C34.5557 18.14 34.2357 18.4333 33.8491 18.66C33.4624 18.8733 33.0291 19.02 32.5491 19.1C32.0824 19.1933 31.6224 19.24 31.1691 19.24C30.5824 19.24 30.0357 19.16 29.5291 19C29.0357 18.8533 28.6024 18.6267 28.2291 18.32C27.8557 18 27.5624 17.6133 27.3491 17.16C27.1357 16.7067 27.0224 16.18 27.0091 15.58H27.7691ZM37.338 13.96V14.08C37.338 14.68 37.418 15.2533 37.578 15.8C37.738 16.3467 37.9713 16.8267 38.278 17.24C38.598 17.6533 38.9913 17.98 39.458 18.22C39.938 18.46 40.4913 18.58 41.118 18.58C42.1446 18.58 42.958 18.3133 43.558 17.78C44.158 17.2333 44.5713 16.48 44.798 15.52H45.558C45.3313 16.72 44.838 17.64 44.078 18.28C43.3313 18.92 42.338 19.24 41.098 19.24C40.338 19.24 39.6713 19.1067 39.098 18.84C38.538 18.56 38.0646 18.1867 37.678 17.72C37.3046 17.24 37.0246 16.68 36.838 16.04C36.6513 15.3867 36.558 14.6867 36.558 13.94C36.558 13.22 36.6513 12.5333 36.838 11.88C37.038 11.2133 37.3313 10.6333 37.718 10.14C38.1046 9.63333 38.5846 9.23333 39.158 8.94C39.7446 8.63333 40.4313 8.48 41.218 8.48C41.938 8.48 42.5713 8.61333 43.118 8.88C43.678 9.14667 44.1446 9.51333 44.518 9.98C44.8913 10.4333 45.1713 10.9667 45.358 11.58C45.558 12.18 45.658 12.8267 45.658 13.52C45.658 13.5867 45.6513 13.6667 45.638 13.76C45.638 13.84 45.638 13.9067 45.638 13.96H37.338ZM44.878 13.3C44.8513 12.74 44.758 12.2133 44.598 11.72C44.438 11.2133 44.198 10.7733 43.878 10.4C43.5713 10.0133 43.1913 9.70667 42.738 9.48C42.298 9.25333 41.7913 9.14 41.218 9.14C40.6046 9.14 40.0646 9.26 39.598 9.5C39.1313 9.72667 38.738 10.0333 38.418 10.42C38.098 10.7933 37.8513 11.2333 37.678 11.74C37.5046 12.2467 37.398 12.7667 37.358 13.3H44.878ZM47.7691 15.58C47.7957 16.06 47.9024 16.4867 48.0891 16.86C48.2757 17.22 48.5157 17.5333 48.8091 17.8C49.1157 18.0533 49.4691 18.2467 49.8691 18.38C50.2691 18.5133 50.7024 18.58 51.1691 18.58C51.5024 18.58 51.8557 18.5533 52.2291 18.5C52.6157 18.4333 52.9691 18.32 53.2891 18.16C53.6224 18 53.8957 17.78 54.1091 17.5C54.3224 17.2067 54.4291 16.84 54.4291 16.4C54.4291 15.8267 54.2557 15.3933 53.9091 15.1C53.5624 14.8067 53.1224 14.58 52.5891 14.42C52.0691 14.26 51.5024 14.1333 50.8891 14.04C50.2891 13.9333 49.7224 13.78 49.1891 13.58C48.6691 13.38 48.2357 13.1 47.8891 12.74C47.5424 12.3667 47.3691 11.8267 47.3691 11.12C47.3691 10.6133 47.4824 10.1933 47.7091 9.86C47.9357 9.51333 48.2224 9.24 48.5691 9.04C48.9291 8.84 49.3291 8.7 49.7691 8.62C50.2091 8.52667 50.6491 8.48 51.0891 8.48C51.6224 8.48 52.1224 8.54 52.5891 8.66C53.0557 8.78 53.4557 8.97333 53.7891 9.24C54.1357 9.50667 54.4024 9.84667 54.5891 10.26C54.7891 10.6733 54.8891 11.1733 54.8891 11.76H54.1291C54.1291 11.2933 54.0491 10.8933 53.8891 10.56C53.7424 10.2267 53.5291 9.96 53.2491 9.76C52.9824 9.54667 52.6624 9.39333 52.2891 9.3C51.9157 9.19333 51.5157 9.14 51.0891 9.14C50.7424 9.14 50.3891 9.17333 50.0291 9.24C49.6824 9.30667 49.3691 9.42 49.0891 9.58C48.8091 9.74 48.5757 9.94667 48.3891 10.2C48.2157 10.4533 48.1291 10.76 48.1291 11.12C48.1291 11.5333 48.2291 11.8667 48.4291 12.12C48.6291 12.3733 48.8891 12.58 49.2091 12.74C49.5424 12.8867 49.9091 13.0067 50.3091 13.1C50.7224 13.1933 51.1357 13.2867 51.5491 13.38C52.0557 13.4733 52.5291 13.5867 52.9691 13.72C53.4224 13.84 53.8091 14.0133 54.1291 14.24C54.4624 14.4533 54.7224 14.7333 54.9091 15.08C55.0957 15.4267 55.1891 15.8667 55.1891 16.4C55.1891 16.96 55.0624 17.42 54.8091 17.78C54.5557 18.14 54.2357 18.4333 53.8491 18.66C53.4624 18.8733 53.0291 19.02 52.5491 19.1C52.0824 19.1933 51.6224 19.24 51.1691 19.24C50.5824 19.24 50.0357 19.16 49.5291 19C49.0357 18.8533 48.6024 18.6267 48.2291 18.32C47.8557 18 47.5624 17.6133 47.3491 17.16C47.1357 16.7067 47.0224 16.18 47.0091 15.58H47.7691ZM64.778 11.9C64.738 11.4467 64.618 11.0467 64.418 10.7C64.2313 10.3533 63.9846 10.0667 63.678 9.84C63.3713 9.61333 63.0113 9.44 62.598 9.32C62.198 9.2 61.7646 9.14 61.298 9.14C60.658 9.14 60.0913 9.27333 59.598 9.54C59.1046 9.79333 58.6913 10.14 58.358 10.58C58.0246 11.0067 57.7713 11.5 57.598 12.06C57.4246 12.6067 57.338 13.1733 57.338 13.76C57.338 14.4533 57.418 15.0933 57.578 15.68C57.738 16.2667 57.9846 16.78 58.318 17.22C58.6513 17.6467 59.0646 17.98 59.558 18.22C60.0513 18.46 60.6313 18.58 61.298 18.58C61.778 18.58 62.218 18.5 62.618 18.34C63.0313 18.18 63.3913 17.96 63.698 17.68C64.018 17.4 64.278 17.0667 64.478 16.68C64.678 16.28 64.8113 15.8467 64.878 15.38H65.638C65.558 15.9933 65.3913 16.54 65.138 17.02C64.8846 17.5 64.5646 17.9067 64.178 18.24C63.7913 18.56 63.3513 18.8067 62.858 18.98C62.3646 19.1533 61.8446 19.24 61.298 19.24C60.458 19.24 59.738 19.0933 59.138 18.8C58.5513 18.4933 58.0646 18.0867 57.678 17.58C57.3046 17.0733 57.0246 16.4933 56.838 15.84C56.6646 15.1733 56.578 14.48 56.578 13.76C56.578 13.04 56.678 12.36 56.878 11.72C57.0913 11.08 57.398 10.52 57.798 10.04C58.198 9.56 58.6913 9.18 59.278 8.9C59.8646 8.62 60.538 8.48 61.298 8.48C61.858 8.48 62.378 8.55333 62.858 8.7C63.3513 8.83333 63.7846 9.04 64.158 9.32C64.5446 9.6 64.858 9.96 65.098 10.4C65.338 10.8267 65.4846 11.3267 65.538 11.9H64.778ZM66.9291 13.86C66.9291 13.1267 67.0291 12.44 67.2291 11.8C67.4424 11.1467 67.7491 10.5733 68.1491 10.08C68.5491 9.58667 69.0424 9.2 69.6291 8.92C70.2157 8.62667 70.8891 8.48 71.6491 8.48C72.4091 8.48 73.0824 8.62667 73.6691 8.92C74.2557 9.2 74.7491 9.58667 75.1491 10.08C75.5491 10.5733 75.8491 11.1467 76.0491 11.8C76.2624 12.44 76.3691 13.1267 76.3691 13.86C76.3691 14.5933 76.2624 15.2867 76.0491 15.94C75.8491 16.5933 75.5491 17.1667 75.1491 17.66C74.7491 18.14 74.2557 18.5267 73.6691 18.82C73.0824 19.1 72.4091 19.24 71.6491 19.24C70.8891 19.24 70.2157 19.1 69.6291 18.82C69.0424 18.5267 68.5491 18.14 68.1491 17.66C67.7491 17.1667 67.4424 16.5933 67.2291 15.94C67.0291 15.2867 66.9291 14.5933 66.9291 13.86ZM67.6891 13.86C67.6891 14.4733 67.7757 15.0667 67.9491 15.64C68.1224 16.2 68.3757 16.7 68.7091 17.14C69.0424 17.58 69.4557 17.9333 69.9491 18.2C70.4424 18.4533 71.0091 18.58 71.6491 18.58C72.2891 18.58 72.8557 18.4533 73.3491 18.2C73.8424 17.9333 74.2557 17.58 74.5891 17.14C74.9224 16.7 75.1757 16.2 75.3491 15.64C75.5224 15.0667 75.6091 14.4733 75.6091 13.86C75.6091 13.2467 75.5224 12.66 75.3491 12.1C75.1757 11.5267 74.9224 11.02 74.5891 10.58C74.2557 10.14 73.8424 9.79333 73.3491 9.54C72.8557 9.27333 72.2891 9.14 71.6491 9.14C71.0091 9.14 70.4424 9.27333 69.9491 9.54C69.4557 9.79333 69.0424 10.14 68.7091 10.58C68.3757 11.02 68.1224 11.5267 67.9491 12.1C67.7757 12.66 67.6891 13.2467 67.6891 13.86ZM78.9113 11H78.9713C79.0646 10.6667 79.2313 10.3533 79.4713 10.06C79.7246 9.76667 80.0246 9.51333 80.3713 9.3C80.7313 9.08667 81.1246 8.92667 81.5513 8.82C81.9913 8.7 82.4446 8.64667 82.9112 8.66V9.42C82.5112 9.36667 82.0513 9.40667 81.5313 9.54C81.0246 9.67333 80.5379 9.96667 80.0713 10.42C79.8846 10.62 79.7179 10.8133 79.5713 11C79.4379 11.1867 79.3246 11.3933 79.2313 11.62C79.1379 11.8467 79.0646 12.1 79.0113 12.38C78.9579 12.66 78.9246 12.9933 78.9113 13.38V19H78.1513V8.72H78.9113V11ZM83.9005 13.96V14.08C83.9005 14.68 83.9805 15.2533 84.1405 15.8C84.3005 16.3467 84.5338 16.8267 84.8405 17.24C85.1605 17.6533 85.5538 17.98 86.0205 18.22C86.5005 18.46 87.0538 18.58 87.6805 18.58C88.7071 18.58 89.5205 18.3133 90.1205 17.78C90.7205 17.2333 91.1338 16.48 91.3605 15.52H92.1205C91.8938 16.72 91.4005 17.64 90.6405 18.28C89.8938 18.92 88.9005 19.24 87.6605 19.24C86.9005 19.24 86.2338 19.1067 85.6605 18.84C85.1005 18.56 84.6271 18.1867 84.2405 17.72C83.8671 17.24 83.5871 16.68 83.4005 16.04C83.2138 15.3867 83.1205 14.6867 83.1205 13.94C83.1205 13.22 83.2138 12.5333 83.4005 11.88C83.6005 11.2133 83.8938 10.6333 84.2805 10.14C84.6671 9.63333 85.1471 9.23333 85.7205 8.94C86.3071 8.63333 86.9938 8.48 87.7805 8.48C88.5005 8.48 89.1338 8.61333 89.6805 8.88C90.2405 9.14667 90.7071 9.51333 91.0805 9.98C91.4538 10.4333 91.7338 10.9667 91.9205 11.58C92.1205 12.18 92.2205 12.8267 92.2205 13.52C92.2205 13.5867 92.2138 13.6667 92.2005 13.76C92.2005 13.84 92.2005 13.9067 92.2005 13.96H83.9005ZM91.4405 13.3C91.4138 12.74 91.3205 12.2133 91.1605 11.72C91.0005 11.2133 90.7605 10.7733 90.4405 10.4C90.1338 10.0133 89.7538 9.70667 89.3005 9.48C88.8605 9.25333 88.3538 9.14 87.7805 9.14C87.1671 9.14 86.6271 9.26 86.1605 9.5C85.6938 9.72667 85.3005 10.0333 84.9805 10.42C84.6605 10.7933 84.4138 11.2333 84.2405 11.74C84.0671 12.2467 83.9605 12.7667 83.9205 13.3H91.4405ZM94.9944 16.94H96.0144V19H94.9944V16.94ZM98.9408 13.86C98.9408 13.1267 99.0408 12.44 99.2408 11.8C99.4541 11.1467 99.7608 10.5733 100.161 10.08C100.561 9.58667 101.054 9.2 101.641 8.92C102.227 8.62667 102.901 8.48 103.661 8.48C104.421 8.48 105.094 8.62667 105.681 8.92C106.267 9.2 106.761 9.58667 107.161 10.08C107.561 10.5733 107.861 11.1467 108.061 11.8C108.274 12.44 108.381 13.1267 108.381 13.86C108.381 14.5933 108.274 15.2867 108.061 15.94C107.861 16.5933 107.561 17.1667 107.161 17.66C106.761 18.14 106.267 18.5267 105.681 18.82C105.094 19.1 104.421 19.24 103.661 19.24C102.901 19.24 102.227 19.1 101.641 18.82C101.054 18.5267 100.561 18.14 100.161 17.66C99.7608 17.1667 99.4541 16.5933 99.2408 15.94C99.0408 15.2867 98.9408 14.5933 98.9408 13.86ZM99.7008 13.86C99.7008 14.4733 99.7874 15.0667 99.9608 15.64C100.134 16.2 100.387 16.7 100.721 17.14C101.054 17.58 101.467 17.9333 101.961 18.2C102.454 18.4533 103.021 18.58 103.661 18.58C104.301 18.58 104.867 18.4533 105.361 18.2C105.854 17.9333 106.267 17.58 106.601 17.14C106.934 16.7 107.187 16.2 107.361 15.64C107.534 15.0667 107.621 14.4733 107.621 13.86C107.621 13.2467 107.534 12.66 107.361 12.1C107.187 11.5267 106.934 11.02 106.601 10.58C106.267 10.14 105.854 9.79333 105.361 9.54C104.867 9.27333 104.301 9.14 103.661 9.14C103.021 9.14 102.454 9.27333 101.961 9.54C101.467 9.79333 101.054 10.14 100.721 10.58C100.387 11.02 100.134 11.5267 99.9608 12.1C99.7874 12.66 99.7008 13.2467 99.7008 13.86ZM110.923 11H110.983C111.076 10.6667 111.243 10.3533 111.483 10.06C111.736 9.76667 112.036 9.51333 112.383 9.3C112.743 9.08667 113.136 8.92667 113.563 8.82C114.003 8.7 114.456 8.64667 114.923 8.66V9.42C114.523 9.36667 114.063 9.40667 113.543 9.54C113.036 9.67333 112.55 9.96667 112.083 10.42C111.896 10.62 111.73 10.8133 111.583 11C111.45 11.1867 111.336 11.3933 111.243 11.62C111.15 11.8467 111.076 12.1 111.023 12.38C110.97 12.66 110.936 12.9933 110.923 13.38V19H110.163V8.72H110.923V11ZM124.112 8.72V18.46C124.112 19.0333 124.046 19.5867 123.912 20.12C123.779 20.6667 123.546 21.1467 123.212 21.56C122.892 21.9733 122.446 22.3 121.872 22.54C121.299 22.7933 120.572 22.92 119.692 22.92C119.146 22.92 118.632 22.86 118.152 22.74C117.672 22.6333 117.252 22.4533 116.892 22.2C116.532 21.96 116.239 21.6333 116.012 21.22C115.799 20.82 115.679 20.32 115.652 19.72H116.412C116.452 20.1733 116.566 20.56 116.752 20.88C116.939 21.2 117.179 21.46 117.472 21.66C117.779 21.8733 118.119 22.0267 118.492 22.12C118.866 22.2133 119.266 22.26 119.692 22.26C120.399 22.26 120.986 22.1533 121.452 21.94C121.932 21.7267 122.312 21.4467 122.592 21.1C122.872 20.7667 123.066 20.38 123.172 19.94C123.292 19.5133 123.352 19.08 123.352 18.64V16.28H123.312C122.952 17.04 122.459 17.62 121.832 18.02C121.219 18.42 120.472 18.62 119.592 18.62C118.832 18.62 118.172 18.4933 117.612 18.24C117.066 17.9733 116.606 17.6133 116.232 17.16C115.872 16.6933 115.599 16.1533 115.412 15.54C115.239 14.9267 115.152 14.26 115.152 13.54C115.152 12.86 115.246 12.2133 115.432 11.6C115.632 10.9867 115.919 10.4533 116.292 10C116.666 9.53333 117.126 9.16667 117.672 8.9C118.232 8.62 118.872 8.48 119.592 8.48C120.406 8.48 121.152 8.68667 121.832 9.1C122.526 9.51333 123.019 10.1 123.312 10.86H123.352V8.72H124.112ZM119.592 9.14C118.966 9.14 118.419 9.26667 117.952 9.52C117.499 9.77333 117.119 10.1067 116.812 10.52C116.519 10.9333 116.292 11.4067 116.132 11.94C115.986 12.46 115.912 12.9933 115.912 13.54C115.912 14.14 115.986 14.7133 116.132 15.26C116.292 15.7933 116.526 16.26 116.832 16.66C117.152 17.06 117.539 17.38 117.992 17.62C118.459 17.8467 118.992 17.96 119.592 17.96C120.219 17.96 120.766 17.84 121.232 17.6C121.699 17.36 122.086 17.0333 122.392 16.62C122.712 16.2067 122.946 15.74 123.092 15.22C123.252 14.6867 123.332 14.1267 123.332 13.54C123.332 12.9667 123.252 12.4133 123.092 11.88C122.946 11.3467 122.712 10.88 122.392 10.48C122.086 10.0667 121.699 9.74 121.232 9.5C120.766 9.26 120.219 9.14 119.592 9.14Z" transform="translate(297 397)" fill="url(#paint1_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M66.6005 66.6971L66.5302 50.1659C66.5302 47.6154 66.2943 45.3028 65.8222 43.2149C65.411 41.1467 64.6222 39.3628 63.4558 37.886C62.3637 36.4159 60.8534 35.276 58.9387 34.4667C57.0914 33.6573 54.7249 33.2609 51.8528 33.2609C49.3179 33.2609 47.0255 33.7631 44.976 34.7673C42.9264 35.7055 41.1734 37.0172 39.7306 38.6954C38.3014 40.367 37.2024 42.3162 36.4541 44.5299C35.699 46.6706 35.3214 48.9501 35.3214 51.375V84.1739H33.2719V50.9719C33.2719 48.5535 33.0629 46.2673 32.6516 44.1265C32.3145 41.9793 31.6267 40.1028 30.602 38.484C29.5773 36.8817 28.1344 35.6066 26.2871 34.6682C24.4398 33.7333 22.0396 33.2609 19.1002 33.2609C16.4977 33.2609 14.0337 33.8098 11.9167 35.0124C9.78621 36.1521 7.914 37.7652 6.41061 39.777C4.96776 41.7262 3.84866 44.0059 3.02603 46.6223C2.27096 49.2389 2.05631 52.0025 2.05631 54.8967V84.1739H0V54.8967C0 45.1736 2.79083 41.4555 3.81574 39.777C4.84052 38.0988 6.53668 36.517 8.03344 35.2418C9.54359 33.9666 11.3053 32.9979 13.0852 32.3306C14.9325 31.5906 17.0437 31.2422 19.1002 31.2422C23.2127 31.1102 26.6309 32.1508 29.3682 34.3676C32.1796 36.515 34.0203 39.495 35.1125 43.3206C36.1439 39.6997 38.1665 36.7826 41.1735 34.5658C44.1872 32.3523 47.7402 31.2422 51.8528 31.2422C55.0754 31.2422 57.7386 31.7147 59.8624 32.653C61.9862 33.5978 63.6918 34.9027 64.9931 36.5745C66.2943 38.1932 67.2179 40.1689 67.7708 42.5212C68.3169 44.8007 68.5933 47.3444 68.5933 50.1659L68.6117 67.4871C68.6389 70.0523 68.7977 72.332 69.5844 74.21C70.4741 76.2912 71.6744 78.0356 73.171 79.4429C74.7487 80.791 76.5286 81.7954 78.5107 82.4561C80.567 83.0706 82.7244 83.3677 84.983 83.3677C88.1383 83.3677 90.9027 82.7998 93.3027 81.663C95.6962 80.4476 97.6851 78.8814 99.2559 76.9323C100.894 74.9238 102.128 72.6043 102.957 69.9813C103.773 67.3714 104.184 64.6227 104.184 61.7353V32.4582H106.234V61.7353C106.234 68.4994 104.799 71.4699 104.799 71.4699C103.842 75.5004 101.127 78.7396 97.85 81.3497C94.6275 83.9728 90.188 85.2773 84.983 85.2773C82.2458 85.2773 79.7108 84.9073 77.3847 84.1739C75.133 83.3677 73.144 82.1985 71.4317 80.6587C69.7934 79.0401 68.4921 77.0907 67.528 74.8113C66.874 73.0933 66.7121 71.2434 66.6043 69.1886C66.5975 68.4155 66.5975 67.4971 66.5975 66.6975L66.6005 66.6971ZM84.3561 17.6146C84.3561 16.3427 85.4146 15.312 86.7089 15.312C88.0102 15.312 89.0618 16.3427 89.0618 17.6146C89.0618 18.8899 88.0102 19.9205 86.7089 19.9205C85.4146 19.9205 84.3561 18.8899 84.3561 17.6146ZM72.5523 4.73492C68.2862 8.18228 66.0313 13.0096 66.0313 18.6949H67.8942C67.8942 7.6202 77.3261 1.82569 86.6431 1.82569C91.3733 1.82569 95.731 3.30039 98.914 5.97822C102.502 8.9971 104.399 13.3944 104.399 18.6949H106.262C106.262 12.8457 104.141 7.96924 100.127 4.59286C96.6069 1.63114 91.8181 0 86.6431 0C81.4119 0 76.276 1.72573 72.5523 4.73492Z" transform="translate(144 122.924)" fill="url(#paint2_linear)"/>
+<path d="M39.0887 56.7177H41.0932C41.0932 50.9713 39.4228 46.7952 36.0818 44.1893C32.7409 41.5834 28.1973 40.2804 22.4509 40.2804C19.2436 40.2804 16.5375 40.6813 14.3325 41.4832C12.1275 42.285 10.3234 43.3207 8.92023 44.5902C7.51705 45.8597 6.51478 47.2629 5.91341 48.7997C5.31205 50.3366 5.01137 51.8066 5.01137 53.2098C5.01137 56.0161 5.5125 58.2545 6.51478 59.925C7.51705 61.5954 9.08728 62.8984 11.2255 63.8338C12.6955 64.502 14.3659 65.1034 16.2368 65.6379C18.1077 66.1725 20.2793 66.7404 22.7516 67.3418C24.9566 67.8763 27.1282 68.4109 29.2664 68.9454C31.4046 69.48 33.2755 70.215 34.8791 71.1504C36.5496 72.0191 37.8859 73.155 38.8882 74.5582C39.9573 75.9614 40.4918 77.7989 40.4918 80.0707C40.4918 82.2757 39.9573 84.1466 38.8882 85.6834C37.8859 87.2202 36.583 88.4898 34.9793 89.492C33.3757 90.4275 31.5716 91.1291 29.5671 91.5968C27.6293 91.9977 25.725 92.1982 23.8541 92.1982C17.7736 92.1982 13.0964 90.8618 9.82228 88.1891C6.615 85.4495 5.01137 81.1732 5.01137 75.36H3.00682C3.00682 81.8414 4.74409 86.5855 8.21864 89.5923C11.76 92.5991 16.9718 94.1025 23.8541 94.1025C26.0591 94.1025 28.2641 93.8352 30.4691 93.3007C32.7409 92.833 34.7455 92.0311 36.4827 90.8952C38.2868 89.7593 39.7234 88.2893 40.7925 86.4852C41.9284 84.6811 42.4964 82.4761 42.4964 79.8702C42.4964 77.3979 41.9953 75.3934 40.993 73.8566C40.0575 72.3198 38.788 71.0502 37.1843 70.0479C35.6475 69.0457 33.8768 68.2773 31.8723 67.7427C29.9346 67.1413 27.9634 66.5734 25.9589 66.0388C23.1525 65.3038 20.6802 64.6691 18.5421 64.1345C16.4707 63.6 14.533 62.9652 12.7289 62.2302C10.9916 61.4952 9.58841 60.4595 8.51932 59.1232C7.51705 57.72 7.01591 55.7488 7.01591 53.2098C7.01591 52.742 7.14955 51.9068 7.41682 50.7041C7.6841 49.5013 8.31887 48.2986 9.32114 47.0959C10.3234 45.8263 11.8602 44.7238 13.9316 43.7884C16.003 42.7861 18.8427 42.285 22.4509 42.285C24.9232 42.285 27.1616 42.5522 29.1662 43.0868C31.2375 43.6213 33.0082 44.49 34.4782 45.6927C35.9482 46.8286 37.0841 48.2986 37.8859 50.1027C38.6877 51.9068 39.0887 54.1118 39.0887 56.7177ZM50.9045 67.6425H94.0023C94.1359 64.1011 93.7684 60.6934 92.8998 57.4193C92.098 54.1452 90.7616 51.2386 88.8907 48.6995C87.0866 46.1604 84.7145 44.1225 81.7745 42.5857C78.9014 41.0488 75.4602 40.2804 71.4511 40.2804C68.5779 40.2804 65.7716 40.8818 63.032 42.0845C60.2925 43.2872 57.887 45.0579 55.8157 47.3966C53.7443 49.6684 52.0738 52.4747 50.8043 55.8157C49.5347 59.1566 48.9 62.9652 48.9 67.2416C48.9 71.0502 49.3343 74.625 50.2029 77.9659C51.0716 81.24 52.4079 84.1132 54.212 86.5855C56.0161 88.9909 58.3213 90.8618 61.1277 92.1982C64.0009 93.5345 67.442 94.1693 71.4511 94.1025C77.3311 94.1025 82.2757 92.4655 86.2848 89.1914C90.2939 85.8505 92.6659 81.1732 93.4009 75.1595H91.3964C90.5277 80.8391 88.2893 85.1155 84.6811 87.9886C81.1398 90.795 76.6629 92.1982 71.2507 92.1982C67.5757 92.1982 64.4686 91.5634 61.9295 90.2939C59.3904 89.0243 57.3191 87.287 55.7154 85.082C54.1118 82.877 52.9091 80.3045 52.1072 77.3645C51.3722 74.3577 50.9713 71.117 50.9045 67.6425ZM91.9977 65.6379H50.9045C51.105 62.0298 51.7732 58.7891 52.9091 55.9159C54.045 53.0427 55.515 50.6038 57.3191 48.5993C59.19 46.5279 61.3282 44.9577 63.7336 43.8886C66.2059 42.8195 68.8452 42.285 71.6516 42.285C74.9925 42.285 77.9325 42.9197 80.4716 44.1893C83.0107 45.392 85.1154 47.0625 86.7859 49.2007C88.5232 51.3388 89.8261 53.8445 90.6948 56.7177C91.5634 59.5241 91.9977 62.4975 91.9977 65.6379ZM135.597 56.7177H137.601C137.601 50.9713 135.931 46.7952 132.59 44.1893C129.249 41.5834 124.705 40.2804 118.959 40.2804C115.752 40.2804 113.045 40.6813 110.84 41.4832C108.635 42.285 106.831 43.3207 105.428 44.5902C104.025 45.8597 103.023 47.2629 102.421 48.7997C101.82 50.3366 101.519 51.8066 101.519 53.2098C101.519 56.0161 102.02 58.2545 103.023 59.925C104.025 61.5954 105.595 62.8984 107.733 63.8338C109.203 64.502 110.874 65.1034 112.745 65.6379C114.616 66.1725 116.787 66.7404 119.26 67.3418C121.465 67.8763 123.636 68.4109 125.774 68.9454C127.913 69.48 129.783 70.215 131.387 71.1504C133.058 72.0191 134.394 73.155 135.396 74.5582C136.465 75.9614 137 77.7989 137 80.0707C137 82.2757 136.465 84.1466 135.396 85.6834C134.394 87.2202 133.091 88.4898 131.487 89.492C129.884 90.4275 128.08 91.1291 126.075 91.5968C124.137 91.9977 122.233 92.1982 120.362 92.1982C114.282 92.1982 109.604 90.8618 106.33 88.1891C103.123 85.4495 101.519 81.1732 101.519 75.36H99.5148C99.5148 81.8414 101.252 86.5855 104.727 89.5923C108.268 92.5991 113.48 94.1025 120.362 94.1025C122.567 94.1025 124.772 93.8352 126.977 93.3007C129.249 92.833 131.253 92.0311 132.991 90.8952C134.795 89.7593 136.231 88.2893 137.3 86.4852C138.436 84.6811 139.004 82.4761 139.004 79.8702C139.004 77.3979 138.503 75.3934 137.501 73.8566C136.565 72.3198 135.296 71.0502 133.692 70.0479C132.155 69.0457 130.385 68.2773 128.38 67.7427C126.443 67.1413 124.471 66.5734 122.467 66.0388C119.66 65.3038 117.188 64.6691 115.05 64.1345C112.979 63.6 111.041 62.9652 109.237 62.2302C107.5 61.4952 106.096 60.4595 105.027 59.1232C104.025 57.72 103.524 55.7488 103.524 53.2098C103.524 52.742 103.657 51.9068 103.925 50.7041C104.192 49.5013 104.827 48.2986 105.829 47.0959C106.831 45.8263 108.368 44.7238 110.44 43.7884C112.511 42.7861 115.351 42.285 118.959 42.285C121.431 42.285 123.67 42.5522 125.674 43.0868C127.745 43.6213 129.516 44.49 130.986 45.6927C132.456 46.8286 133.592 48.2986 134.394 50.1027C135.196 51.9068 135.597 54.1118 135.597 56.7177ZM189.909 75.4602H187.904C187.704 78.0661 187.069 80.4048 186 82.4761C184.931 84.4807 183.528 86.218 181.79 87.688C180.12 89.158 178.182 90.2939 175.977 91.0957C173.772 91.8307 171.4 92.1982 168.861 92.1982C165.453 92.1982 162.447 91.5634 159.841 90.2939C157.235 88.9575 155.063 87.1868 153.326 84.9818C151.589 82.7768 150.252 80.2377 149.317 77.3645C148.448 74.4914 148.014 71.4845 148.014 68.3441C148.014 65.3373 148.381 62.297 149.116 59.2234C149.918 56.0829 151.154 53.2766 152.825 50.8043C154.562 48.2652 156.834 46.2272 159.64 44.6904C162.513 43.0868 165.988 42.285 170.064 42.285C172.202 42.285 174.24 42.5857 176.178 43.187C178.115 43.7884 179.853 44.7238 181.39 45.9934C182.926 47.1961 184.229 48.7329 185.298 50.6038C186.368 52.4079 187.103 54.5795 187.503 57.1186H189.508C189.174 54.3791 188.405 51.9736 187.203 49.9022C186.067 47.7641 184.63 45.9934 182.893 44.5902C181.156 43.187 179.185 42.1179 176.98 41.3829C174.775 40.6479 172.469 40.2804 170.064 40.2804C165.988 40.2804 162.413 41.0488 159.34 42.5857C156.333 44.1225 153.827 46.1938 151.822 48.7997C149.885 51.3388 148.415 54.3122 147.412 57.72C146.477 61.0609 146.009 64.6023 146.009 68.3441C146.009 71.8854 146.51 75.2264 147.513 78.3668C148.515 81.4404 149.985 84.1466 151.923 86.4852C153.86 88.8239 156.232 90.6948 159.039 92.098C161.912 93.4343 165.186 94.1025 168.861 94.1025C171.801 94.1025 174.474 93.6682 176.879 92.7995C179.352 91.9309 181.49 90.6948 183.294 89.0911C185.165 87.4875 186.668 85.5498 187.804 83.2779C188.94 80.9393 189.642 78.3334 189.909 75.4602ZM197.827 67.2416C197.827 64.0343 198.261 60.9273 199.13 57.9204C200.065 54.9136 201.435 52.2743 203.239 50.0025C205.043 47.6638 207.248 45.7929 209.854 44.3897C212.527 42.9866 215.6 42.285 219.075 42.285C222.483 42.285 225.49 42.9866 228.095 44.3897C230.768 45.7929 233.007 47.6638 234.811 50.0025C236.615 52.2743 237.951 54.9136 238.82 57.9204C239.755 60.9273 240.223 64.0343 240.223 67.2416C240.223 70.5157 239.755 73.6561 238.82 76.6629C237.951 79.6698 236.615 82.3425 234.811 84.6811C233.007 86.953 230.768 88.7905 228.095 90.1936C225.49 91.53 222.483 92.1982 219.075 92.1982C215.6 92.1982 212.527 91.53 209.854 90.1936C207.248 88.7905 205.043 86.953 203.239 84.6811C201.435 82.3425 200.065 79.6698 199.13 76.6629C198.261 73.6561 197.827 70.5157 197.827 67.2416ZM195.822 67.2416C195.822 70.7829 196.323 74.1907 197.326 77.4648C198.328 80.672 199.798 83.5118 201.736 85.9841C203.74 88.4564 206.179 90.4275 209.052 91.8975C211.925 93.3675 215.233 94.1025 218.975 94.1025C222.783 94.1025 226.124 93.3675 228.998 91.8975C231.871 90.4275 234.276 88.4564 236.214 85.9841C238.218 83.5118 239.722 80.672 240.724 77.4648C241.726 74.1907 242.228 70.7829 242.228 67.2416C242.228 63.7002 241.726 60.3259 240.724 57.1186C239.722 53.8445 238.218 50.9713 236.214 48.4991C234.276 46.0268 231.871 44.0557 228.998 42.5857C226.124 41.0488 222.817 40.2804 219.075 40.2804C215.266 40.2804 211.925 41.0488 209.052 42.5857C206.179 44.0557 203.74 46.0268 201.736 48.4991C199.798 50.9713 198.328 53.8445 197.326 57.1186C196.323 60.3259 195.822 63.7002 195.822 67.2416ZM252.506 93V63.8338C252.506 61.0275 252.907 58.2879 253.709 55.6152C254.511 52.9425 255.747 50.6038 257.417 48.5993C259.088 46.5279 261.193 44.9243 263.732 43.7884C266.338 42.5857 269.411 42.0845 272.953 42.285V40.2804C269.879 40.2136 267.173 40.5477 264.834 41.2827C262.562 42.0177 260.591 43.02 258.921 44.2895C257.25 45.5591 255.914 47.0625 254.912 48.7997C253.909 50.4702 253.174 52.2743 252.707 54.212H252.506V41.4832H250.502V93H252.506ZM275.437 67.6425H318.535C318.669 64.1011 318.301 60.6934 317.432 57.4193C316.631 54.1452 315.294 51.2386 313.423 48.6995C311.619 46.1604 309.247 44.1225 306.307 42.5857C303.434 41.0488 299.993 40.2804 295.984 40.2804C293.111 40.2804 290.304 40.8818 287.565 42.0845C284.825 43.2872 282.42 45.0579 280.348 47.3966C278.277 49.6684 276.607 52.4747 275.337 55.8157C274.067 59.1566 273.433 62.9652 273.433 67.2416C273.433 71.0502 273.867 74.625 274.736 77.9659C275.604 81.24 276.941 84.1132 278.745 86.5855C280.549 88.9909 282.854 90.8618 285.66 92.1982C288.534 93.5345 291.975 94.1693 295.984 94.1025C301.864 94.1025 306.808 92.4655 310.817 89.1914C314.827 85.8505 317.199 81.1732 317.934 75.1595H315.929C315.06 80.8391 312.822 85.1155 309.214 87.9886C305.672 90.795 301.196 92.1982 295.783 92.1982C292.108 92.1982 289.001 91.5634 286.462 90.2939C283.923 89.0243 281.852 87.287 280.248 85.082C278.645 82.877 277.442 80.3045 276.64 77.3645C275.905 74.3577 275.504 71.117 275.437 67.6425ZM316.53 65.6379H275.437C275.638 62.0298 276.306 58.7891 277.442 55.9159C278.578 53.0427 280.048 50.6038 281.852 48.5993C283.723 46.5279 285.861 44.9577 288.266 43.8886C290.739 42.8195 293.378 42.285 296.184 42.285C299.525 42.285 302.465 42.9197 305.004 44.1893C307.543 45.392 309.648 47.0625 311.319 49.2007C313.056 51.3388 314.359 53.8445 315.227 56.7177C316.096 59.5241 316.53 62.4975 316.53 65.6379Z" transform="translate(254.235 114)" fill="url(#paint3_linear)"/>
+<path d="M344.189 0H0V1.14408H344.189V0Z" transform="translate(188 232.146)" fill="url(#paint4_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(51.918 7.63451) scale(17.7611 34.8257) rotate(90)">
+<stop stop-color="#1A75C1"/>
+<stop offset="1" stop-color="#2A567B"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(1.52675 6.0613) scale(2.9881 18.8889) rotate(90)">
+<stop stop-color="#1A75C1"/>
+<stop offset="1" stop-color="#2A567B"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(106.814 0.221471) scale(106.264 85.2785) rotate(90.2976)">
+<stop stop-color="#1A75C1"/>
+<stop offset="1" stop-color="#2A567B"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(321.766) scale(321.766 117.504) rotate(90)">
+<stop stop-color="#1A75C1"/>
+<stop offset="1" stop-color="#2A567B"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(344.189 1.14408) scale(344.189 1.14408) rotate(180)">
+<stop stop-color="#F8F2E5"/>
+<stop offset="0.49939" stop-color="#D3CDC0"/>
+<stop offset="1" stop-color="#F8F2E5"/>
+</linearGradient>
+</defs>
 </svg>
index 76e4c8b..5b2511e 100644 (file)
@@ -23,6 +23,8 @@
 #include "libmscore/score.h"
 #include "libmscore/note.h"
 #include "libmscore/part.h"
+#include "libmscore/staff.h"
+#include "libmscore/chord.h"
 #include "libmscore/mscore.h"
 #include "synthesizer/msynthesizer.h"
 #include "musescore.h"
@@ -99,7 +101,7 @@ bool MuseScore::saveAudio(Score* score, QIODevice *device, std::function<bool(fl
                                   if (e.type() == ME_INVALID)
                                         continue;
                                   e.setChannel(a->channel);
-                                  int syntiIdx= synti->index(score->midiMapping(a->channel)->articulation->synti);
+                                  int syntiIdx = synti->index(score->midiMapping(a->channel)->articulation->synti);
                                   synti->play(e, syntiIdx);
                                   }
                             }
@@ -131,13 +133,35 @@ bool MuseScore::saveAudio(Score* score, QIODevice *device, std::function<bool(fl
 
                       playTime  += n;
                       frames    -= n;
-                      const NPlayEvent& e = playPos->second;
-                      if (e.isChannelEvent()) {
-                            int channelIdx = e.channel();
-                            Channel* c = score->midiMapping(channelIdx)->articulation;
-                            if (!c->mute) {
-                                  synti->play(e, synti->index(c->synti));
-                                  }
+                      const NPlayEvent& event = playPos->second;
+                      if (event.isChannelEvent()) {
+                              int channelIdx = event.channel();
+                              Channel* c = score->midiMapping(channelIdx)->articulation;
+                              int type = event.type();
+                              int syntiIndex = synti->index(c->synti);
+                              if (type == ME_NOTEON) {
+                                    bool mute;
+                                    const Note* note = event.note();
+                                    if (note) {
+                                          Instrument* instr = note->staff()->part()->instrument(note->chord()->tick());
+                                          const Channel* a = instr->channel(note->subchannel());
+                                          mute = a->mute || a->soloMute;
+                                          }
+                                    else
+                                          mute = false;
+
+                                    if (!mute) {
+                                          if (event.discard()) { // ignore noteoff but restrike noteon
+                                                if (event.velo() > 0)
+                                                      synti->play(NPlayEvent(ME_NOTEON, event.channel(), event.pitch(), 0), syntiIndex);
+                                                else
+                                                      continue;
+                                                }
+                                          synti->play(event, syntiIndex);
+                                          }
+                                    }
+                              else if (type == ME_CONTROLLER || type == ME_PITCHBEND)
+                                    synti->play(event, syntiIndex);
                             }
                       }
                 if (frames) {
index ea66db5..2b39556 100644 (file)
@@ -194,9 +194,6 @@ bool MP3Exporter::initLibrary(QString libpath)
             return false;
             }
 
-      /*qDebug("Actual LAME path %s",
-                FileNames::PathFromAddr(lame_lib->resolve("lame_init")));*/
-
       lame_init = (lame_init_t *)
         lame_lib->resolve("lame_init");
       get_lame_version = (get_lame_version_t *)
@@ -576,7 +573,7 @@ QString MP3Exporter::getLibraryTypeString()
 
 QString MP3Exporter::getLibraryPath()
       {
-      return QString("/usr/local/lib/audacity");
+      return QString("%1/../Resources/Frameworks/").arg(qApp->applicationDirPath());
       }
 
 QString MP3Exporter::getLibraryName()
index adbcee2..2e7c6da 100644 (file)
@@ -67,7 +67,7 @@ InspectorAmbitus::InspectorAmbitus(QWidget* parent)
       //
       // fix order of noteheads and tpc's
       //
-      for (int i = 0; i < int(NoteHead::Group::HEAD_GROUPS); ++i)
+      for (int i = 0; i < int(sizeof(heads)/sizeof(*heads)); ++i)
             r.noteHeadGroup->setItemData(i, int(heads[i]));
       // noteHeadType starts at -1
       for (int i = 0; i < 5; ++i)
index 5573348..1529321 100644 (file)
@@ -28,8 +28,9 @@ static const char* MUSESCORE_HOST = "api.musescore.com";
 //   LoginManager
 //---------------------------------------------------------
 
-LoginManager::LoginManager(QObject* parent)
- : QObject(parent)
+LoginManager::LoginManager(QAction* uploadAudioMenuAction, QObject* parent)
+ :  QObject(parent),
+   _uploadAudioMenuAction(uploadAudioMenuAction)
       {
       _oauthManager = new KQOAuthManager(this);
       connect(_oauthManager, SIGNAL(accessTokenReceived(QString, QString)),
@@ -59,7 +60,7 @@ LoginManager::LoginManager(QObject* parent)
       load();
       _progressDialog = new QProgressDialog(mscore);
       _progressDialog->setWindowFlags(Qt::WindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowTitleHint));
-      _progressDialog->setWindowModality(Qt::ApplicationModal);
+      _progressDialog->setWindowModality(Qt::NonModal);
       _progressDialog->reset(); // required for Qt 5.5, see QTBUG-47042
       }
 
@@ -420,6 +421,7 @@ void LoginManager::uploadMedia()
       {
       if (_mediaUrl.isEmpty()) {
             _progressDialog->hide();
+            _uploadAudioMenuAction->setEnabled(true);
             return;
             }
       if (!_mp3File->exists()) {
@@ -435,6 +437,7 @@ void LoginManager::uploadMedia()
             _progressDialog->setCancelButtonText(tr("Cancel"));
             _progressDialog->show();
             _uploadTryCount++;
+            _uploadAudioMenuAction->setEnabled(false);
             QNetworkReply *reply = mscore->networkManager()->put(request, _mp3File);
             connect(_progressDialog, SIGNAL(canceled()), reply, SLOT(abort()));
             connect(reply, SIGNAL(finished()), this, SLOT(mediaUploadFinished()));
@@ -448,6 +451,7 @@ void LoginManager::uploadMedia()
 
 void LoginManager::mediaUploadFinished()
       {
+      _uploadAudioMenuAction->setEnabled(true);
       QNetworkReply* reply = static_cast<QNetworkReply*>(QObject::sender());
       int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
       QNetworkReply::NetworkError e = reply->error();
index 76f93b5..8e2dedd 100644 (file)
@@ -27,7 +27,9 @@ class LoginManager : public QObject
 
       static const int MAX_UPLOAD_TRY_COUNT = 5;
 
-      KQOAuthManager* _oauthManager;
+      KQOAuthManager* _oauthManager = nullptr;
+      QAction* _uploadAudioMenuAction = nullptr;
+
       QString _consumerKey = 0;
       QString _consumerSecret = 0;
       QString _accessToken = 0;
@@ -73,7 +75,7 @@ class LoginManager : public QObject
       void tryLogin();
 
    public:
-      LoginManager(QObject* parent = 0);
+      LoginManager(QAction* uploadAudioItem, QObject* parent = 0);
       void login(QString login, QString password);
       void upload(const QString& path, int nid, const QString& title, const QString& description, const QString& priv, const QString& license, const QString& tags, const QString& changes);
       bool hasAccessToken();
index b4744e0..feb3fef 100644 (file)
@@ -178,6 +178,8 @@ static constexpr double SCALE_MAX  = 16.0;
 static constexpr double SCALE_MIN  = 0.05;
 static constexpr double SCALE_STEP = 1.7;
 
+static const char* uploadMenuActionId = "file-save-online";
+
 //---------------------------------------------------------
 // cmdInsertMeasure
 //---------------------------------------------------------
@@ -662,6 +664,16 @@ bool MuseScore::uninstallExtension(QString extensionId)
       }
 
 //---------------------------------------------------------
+//   isInstalled
+///  used from javascript in start center webview
+//---------------------------------------------------------
+
+bool MuseScore::isInstalledExtension(QString extensionId)
+      {
+      return Extension::isInstalled(extensionId);
+      }
+
+//---------------------------------------------------------
 //   MuseScore
 //---------------------------------------------------------
 
@@ -710,25 +722,6 @@ MuseScore::MuseScore()
                   }
             }
 
-      if (!converterMode && !pluginMode) {
-            _loginManager = new LoginManager(this);
-#if 0
-            // initialize help engine
-            QString lang = mscore->getLocaleISOCode();
-            if (lang == "en_US")    // HACK
-                  lang = "en";
-
-            QString s = getSharePath() + "manual/doc_" + lang + ".qhc";
-            qDebug("init Help from: <%s>", qPrintable(s));
-            _helpEngine = new QHelpEngine(s, this);
-            if (!_helpEngine->setupData()) {
-                  qDebug("cannot setup data for help engine: %s", qPrintable(_helpEngine->error()));
-                  delete _helpEngine;
-                  _helpEngine = 0;
-                  }
-#endif
-            }
-
       _positionLabel = new QLabel;
       _positionLabel->setObjectName("decoration widget");  // this prevents animations
       _positionLabel->setToolTip(tr("Measure:Beat:Tick"));
@@ -1015,7 +1008,7 @@ MuseScore::MuseScore()
 
       for (auto i : {
             "", "file-save", "file-save-as", "file-save-a-copy",
-            "file-save-selection", "file-save-online", "file-export", "file-part-export", "file-import-pdf",
+            "file-save-selection", uploadMenuActionId, "file-export", "file-part-export", "file-import-pdf",
             "", "file-close", "", "parts", "album" }) {
             if (!*i)
                   _fileMenu->addSeparator();
@@ -1402,6 +1395,9 @@ MuseScore::MuseScore()
             cornerLabel->setPixmap(QPixmap(":/data/mscore.png"));
             cornerLabel->setGeometry(width() - 48, 0, 48, 48);
             }
+
+      if (!converterMode && !pluginMode)
+            _loginManager = new LoginManager(getAction(uploadMenuActionId), this);
       }
 
 MuseScore::~MuseScore()
@@ -4823,7 +4819,7 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
             loadFiles();
       else if (cmd == "file-save")
             saveFile();
-      else if (cmd == "file-save-online")
+      else if (cmd == uploadMenuActionId)
             showUploadScoreDialog();
       else if (cmd == "file-export")
             exportFile();
@@ -5633,14 +5629,36 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
                               playTime  += n;
                               frames    -= n;
                               }
-                        const NPlayEvent& e = playPos->second;
-                        if (e.isChannelEvent()) {
-                              int channelIdx = e.channel();
+                        const NPlayEvent& event = playPos->second;
+                        if (event.isChannelEvent()) {
+                              int channelIdx = event.channel();
                               Channel* c = score->midiMapping(channelIdx)->articulation;
-                              if (!c->mute) {
-                                    synti->play(e, synti->index(c->synti));
+                              int type = event.type();
+                              int syntiIndex = synti->index(c->synti);
+                              if (type == ME_NOTEON) {
+                                    bool mute;
+                                    const Note* note = event.note();
+                                    if (note) {
+                                          Instrument* instr = note->staff()->part()->instrument(note->chord()->tick());
+                                          const Channel* a = instr->channel(note->subchannel());
+                                          mute = a->mute || a->soloMute;
+                                          }
+                                    else
+                                          mute = false;
+
+                                    if (!mute) {
+                                          if (event.discard()) { // ignore noteoff but restrike noteon
+                                                if (event.velo() > 0)
+                                                      synti->play(NPlayEvent(ME_NOTEON, event.channel(), event.pitch(), 0), syntiIndex);
+                                                else
+                                                      continue;
+                                                }
+                                          synti->play(event, syntiIndex);
+                                          }
                                     }
-                              }
+                              else if (type == ME_CONTROLLER || type == ME_PITCHBEND)
+                                    synti->play(event, syntiIndex);
+                            }
                         }
                   if (frames) {
                         float bu[frames * 2];
index 0df9313..1a1c6fd 100644 (file)
@@ -710,6 +710,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       static QMap<QString, QStringList>* bravuraRanges();
       bool importExtension(QString path, QWidget* parent = nullptr);
       bool uninstallExtension(QString extensionId);
+      Q_INVOKABLE bool isInstalledExtension(QString extensionId);
       };
 
 extern MuseScore* mscore;
index 79df54e..d0b7d3b 100644 (file)
@@ -132,6 +132,7 @@ void PaletteBox::selectWorkspace(QString path)
       {
       int idx = workspaceList->findData(path);
       workspaceList->setCurrentIndex(idx);
+      workspaceSelected(idx);
       }
 
 //---------------------------------------------------------
index 58026d7..922f0eb 100644 (file)
@@ -1 +1 @@
-0899e9d
+4592407
index 753ac2d..33ba894 100644 (file)
@@ -222,6 +222,16 @@ void SynthControl::setMeter(float l, float r, float left_peak, float right_peak)
       }
 
 //---------------------------------------------------------
+//   setScore
+//---------------------------------------------------------
+void SynthControl::setScore(Score* s) {
+      _score = s;
+
+      loadButton->setEnabled(true);
+      saveButton->setEnabled(true);
+      }
+
+//---------------------------------------------------------
 //   stop
 //---------------------------------------------------------
 
index c1bcf54..3d74f6c 100644 (file)
@@ -70,7 +70,7 @@ class SynthControl : public QWidget, Ui::SynthControl {
       SynthControl(QWidget* parent);
       void setMeter(float, float, float, float);
       void stop();
-      void setScore(Score* s) { _score = s; }
+      void setScore(Score* s);
       void writeSettings();
       void updateGui();
       };
diff --git a/mtest/libmscore/rhythmicGrouping/groupShortenNotes-ref.mscx b/mtest/libmscore/rhythmicGrouping/groupShortenNotes-ref.mscx
new file mode 100644 (file)
index 0000000..d8033bc
--- /dev/null
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<museScore version="2.00">
+  <Score>
+    <LayerTag id="0" tag="default"></LayerTag>
+    <currentLayer>0</currentLayer>
+    <Division>480</Division>
+    <Style>
+      <lastSystemFillLimit>0</lastSystemFillLimit>
+      <page-layout>
+        <page-height>1683.36</page-height>
+        <page-width>1190.88</page-width>
+        <page-margins type="even">
+          <left-margin>56.6929</left-margin>
+          <right-margin>56.6929</right-margin>
+          <top-margin>56.6929</top-margin>
+          <bottom-margin>113.386</bottom-margin>
+          </page-margins>
+        <page-margins type="odd">
+          <left-margin>56.6929</left-margin>
+          <right-margin>56.6929</right-margin>
+          <top-margin>56.6929</top-margin>
+          <bottom-margin>113.386</bottom-margin>
+          </page-margins>
+        </page-layout>
+      <Spatium>1.76389</Spatium>
+      </Style>
+    <showInvisible>1</showInvisible>
+    <showUnprintable>1</showUnprintable>
+    <showFrames>1</showFrames>
+    <showMargins>0</showMargins>
+    <metaTag name="arranger"></metaTag>
+    <metaTag name="composer"></metaTag>
+    <metaTag name="copyright"></metaTag>
+    <metaTag name="lyricist"></metaTag>
+    <metaTag name="movementNumber"></metaTag>
+    <metaTag name="movementTitle"></metaTag>
+    <metaTag name="poet"></metaTag>
+    <metaTag name="source"></metaTag>
+    <metaTag name="translator"></metaTag>
+    <metaTag name="workNumber"></metaTag>
+    <metaTag name="workTitle"></metaTag>
+    <PageList>
+      <Page>
+        <System>
+          </System>
+        <System>
+          </System>
+        </Page>
+      </PageList>
+    <Part>
+      <Staff id="1">
+        <StaffType group="pitched">
+          <name>stdNormal</name>
+          </StaffType>
+        </Staff>
+      <trackName>Piano</trackName>
+      <Instrument>
+        <longName>Piano</longName>
+        <shortName>Pno.</shortName>
+        <trackName>Piano</trackName>
+        <minPitchP>21</minPitchP>
+        <maxPitchP>108</maxPitchP>
+        <minPitchA>21</minPitchA>
+        <maxPitchA>108</maxPitchA>
+        <instrumentId>keyboard.piano</instrumentId>
+        <clef staff="2">F</clef>
+        <Articulation>
+          <velocity>100</velocity>
+          <gateTime>95</gateTime>
+          </Articulation>
+        <Articulation name="staccatissimo">
+          <velocity>100</velocity>
+          <gateTime>33</gateTime>
+          </Articulation>
+        <Articulation name="staccato">
+          <velocity>100</velocity>
+          <gateTime>50</gateTime>
+          </Articulation>
+        <Articulation name="portato">
+          <velocity>100</velocity>
+          <gateTime>67</gateTime>
+          </Articulation>
+        <Articulation name="tenuto">
+          <velocity>100</velocity>
+          <gateTime>100</gateTime>
+          </Articulation>
+        <Articulation name="marcato">
+          <velocity>120</velocity>
+          <gateTime>67</gateTime>
+          </Articulation>
+        <Articulation name="sforzato">
+          <velocity>120</velocity>
+          <gateTime>100</gateTime>
+          </Articulation>
+        <Channel>
+          <program value="0"/>
+          </Channel>
+        </Instrument>
+      </Part>
+    <Staff id="1">
+      <Measure number="1">
+        <TimeSig>
+          <sigN>4</sigN>
+          <sigD>4</sigD>
+          <showCourtesySig>1</showCourtesySig>
+          </TimeSig>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Beam id="1">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>1</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>1</Beam>
+          <Note>
+            <Tie id="2">
+              </Tie>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <endSpanner id="2"/>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        </Measure>
+      <Measure number="2">
+        <LayoutBreak>
+          <subtype>line</subtype>
+          </LayoutBreak>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Beam id="2">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>2</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>2</Beam>
+          <Note>
+            <Tie id="3">
+              </Tie>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <endSpanner id="3"/>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        </Measure>
+      <Measure number="3">
+        <Beam id="3">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>3</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>3</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Beam id="4">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>4</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>4</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>4</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Articulation>
+            <subtype>fermata</subtype>
+            </Articulation>
+          <Beam>4</Beam>
+          <Note>
+            <Tie id="4">
+              </Tie>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Beam id="5">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>5</Beam>
+          <Note>
+            <endSpanner id="4"/>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>5</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>5</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>5</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <dots>1</dots>
+          <durationType>eighth</durationType>
+          <Beam>5</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        </Measure>
+      <Measure number="4">
+        <Beam id="6">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>6</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>6</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Beam id="7">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>7</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>7</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>7</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Articulation>
+            <subtype>fermata</subtype>
+            </Articulation>
+          <Beam>7</Beam>
+          <Note>
+            <Tie id="5">
+              </Tie>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Beam id="8">
+          <l1>20</l1>
+          <l2>20</l2>
+          </Beam>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>8</Beam>
+          <Note>
+            <endSpanner id="5"/>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>8</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Beam>8</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Beam>8</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <dots>1</dots>
+          <durationType>eighth</durationType>
+          <Beam>8</Beam>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <BarLine>
+          <subtype>end</subtype>
+          <span>1</span>
+          </BarLine>
+        </Measure>
+      </Staff>
+    </Score>
+  </museScore>
diff --git a/mtest/libmscore/rhythmicGrouping/groupShortenNotes.mscx b/mtest/libmscore/rhythmicGrouping/groupShortenNotes.mscx
new file mode 100644 (file)
index 0000000..9ce12fc
--- /dev/null
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<museScore version="2.06">
+  <programVersion>2.3.1</programVersion>
+  <programRevision>0899e9d93</programRevision>
+  <Score>
+    <LayerTag id="0" tag="default"></LayerTag>
+    <currentLayer>0</currentLayer>
+    <Synthesizer>
+      </Synthesizer>
+    <Division>480</Division>
+    <Style>
+      <lastSystemFillLimit>0</lastSystemFillLimit>
+      <page-layout>
+        <page-height>1683.36</page-height>
+        <page-width>1190.88</page-width>
+        <page-margins type="even">
+          <left-margin>56.6929</left-margin>
+          <right-margin>56.6929</right-margin>
+          <top-margin>56.6929</top-margin>
+          <bottom-margin>113.386</bottom-margin>
+          </page-margins>
+        <page-margins type="odd">
+          <left-margin>56.6929</left-margin>
+          <right-margin>56.6929</right-margin>
+          <top-margin>56.6929</top-margin>
+          <bottom-margin>113.386</bottom-margin>
+          </page-margins>
+        </page-layout>
+      <Spatium>1.76389</Spatium>
+      </Style>
+    <showInvisible>1</showInvisible>
+    <showUnprintable>1</showUnprintable>
+    <showFrames>1</showFrames>
+    <showMargins>0</showMargins>
+    <metaTag name="arranger"></metaTag>
+    <metaTag name="composer"></metaTag>
+    <metaTag name="copyright"></metaTag>
+    <metaTag name="creationDate">2018-07-18</metaTag>
+    <metaTag name="lyricist"></metaTag>
+    <metaTag name="movementNumber"></metaTag>
+    <metaTag name="movementTitle"></metaTag>
+    <metaTag name="platform">Microsoft Windows</metaTag>
+    <metaTag name="poet"></metaTag>
+    <metaTag name="source"></metaTag>
+    <metaTag name="translator"></metaTag>
+    <metaTag name="workNumber"></metaTag>
+    <metaTag name="workTitle"></metaTag>
+    <PageList>
+      <Page>
+        <System>
+          </System>
+        <System>
+          </System>
+        </Page>
+      </PageList>
+    <Part>
+      <Staff id="1">
+        <StaffType group="pitched">
+          <name>stdNormal</name>
+          </StaffType>
+        </Staff>
+      <trackName>Piano</trackName>
+      <Instrument>
+        <longName>Piano</longName>
+        <shortName>Pno.</shortName>
+        <trackName>Piano</trackName>
+        <minPitchP>21</minPitchP>
+        <maxPitchP>108</maxPitchP>
+        <minPitchA>21</minPitchA>
+        <maxPitchA>108</maxPitchA>
+        <instrumentId>keyboard.piano</instrumentId>
+        <clef staff="2">F</clef>
+        <Articulation>
+          <velocity>100</velocity>
+          <gateTime>95</gateTime>
+          </Articulation>
+        <Articulation name="staccatissimo">
+          <velocity>100</velocity>
+          <gateTime>33</gateTime>
+          </Articulation>
+        <Articulation name="staccato">
+          <velocity>100</velocity>
+          <gateTime>50</gateTime>
+          </Articulation>
+        <Articulation name="portato">
+          <velocity>100</velocity>
+          <gateTime>67</gateTime>
+          </Articulation>
+        <Articulation name="tenuto">
+          <velocity>100</velocity>
+          <gateTime>100</gateTime>
+          </Articulation>
+        <Articulation name="marcato">
+          <velocity>120</velocity>
+          <gateTime>67</gateTime>
+          </Articulation>
+        <Articulation name="sforzato">
+          <velocity>120</velocity>
+          <gateTime>100</gateTime>
+          </Articulation>
+        <Channel>
+          <program value="0"/>
+          <synti>Fluid</synti>
+          </Channel>
+        </Instrument>
+      </Part>
+    <Staff id="1">
+      <Measure number="1">
+        <TimeSig>
+          <sigN>4</sigN>
+          <sigD>4</sigD>
+          <showCourtesySig>1</showCourtesySig>
+          </TimeSig>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        </Measure>
+      <Measure number="2">
+        <LayoutBreak>
+          <subtype>line</subtype>
+          </LayoutBreak>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <Tie id="2">
+              </Tie>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <endSpanner id="2"/>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        </Measure>
+      <Measure number="3">
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>fermata</subtype>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <dots>1</dots>
+          <durationType>eighth</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        </Measure>
+      <Measure number="4">
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>tenuto</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Articulation>
+            <subtype>fermata</subtype>
+            </Articulation>
+          <Note>
+            <Tie id="3">
+              </Tie>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <endSpanner id="3"/>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>16th</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <durationType>eighth</durationType>
+          <Articulation>
+            <subtype>sforzato</subtype>
+            <anchor>3</anchor>
+            </Articulation>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <Chord>
+          <dots>1</dots>
+          <durationType>eighth</durationType>
+          <Note>
+            <pitch>71</pitch>
+            <tpc>19</tpc>
+            </Note>
+          </Chord>
+        <BarLine>
+          <subtype>end</subtype>
+          <span>1</span>
+          </BarLine>
+        </Measure>
+      </Staff>
+    </Score>
+  </museScore>
index 42dfecc..4884df7 100644 (file)
@@ -38,6 +38,7 @@ class TestRhythmicGrouping : public QObject, public MTest
       void groupVoices()             { group("groupVoices.mscx",            "groupVoices-ref.mscx");       }
       void groupConflicts()          { group("groupConflicts.mscx",         "groupConflicts-ref.mscx", 1); } // only group 1st staff
       void groupArticulationsTies()  { group("groupArticulationsTies.mscx", "groupArticulationsTies-ref.mscx"); } // test for articulations and forward/backward ties
+      void groupShortenNotes()       { group("groupShortenNotes.mscx",      "groupShortenNotes-ref.mscx"); } // test for regrouping rhythms when notes should be shortened
 
       };
 
index 1f22615..37adcc2 100644 (file)
@@ -1,5 +1,6 @@
 <global>
 sample=../sample.wav
+global_volume=-4.5
 <region> key=19
 <region> lokey=20 hikey=30
 <region> key=40 lovel=30 hivel=40
index f06a4a7..a7b3edf 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="2"/>
         <source>Pop/Rock</source>
-        <translation type="unfinished"/>
+        <translation>Pop/Rock</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="3"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="4"/>
         <source>Choral</source>
-        <translation type="unfinished"/>
+        <translation>Cor</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="5"/>
         <source>Orchestra</source>
-        <translation type="unfinished"/>
+        <translation>Orquestra</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="6"/>
         <source>Concert Band</source>
-        <translation type="unfinished"/>
+        <translation>Banda simfònica</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="7"/>
         <location filename="../instruments/instrumentsxml.h" line="512"/>
         <source>Sop.</source>
         <comment>Soprano Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Sop.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="514"/>
         <location filename="../instruments/instrumentsxml.h" line="516"/>
         <source>Bari.</source>
         <comment>Baritone Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Bari.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="518"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="654"/>
         <source>Chimes</source>
-        <translation type="unfinished"/>
+        <translation>Campana tubular</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="655"/>
         <source>Cme.</source>
         <comment>Chimes</comment>
-        <translation type="unfinished"/>
+        <translation>Camp. tub.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="657"/>
index c0c5587..7861ab5 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="12"/>
         <source>Woodwinds</source>
-        <translation>Dechové nástroje</translation>
+        <translation>Dřevěné dechové nástroje</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="13"/>
index 43f3be1..b4ad157 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="231"/>
         <source>Piccolo Clarinet</source>
-        <translation>Piccolo Klarinette</translation>
+        <translation>Piccoloklarinette</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="233"/>
         <source>Soprano Clarinet</source>
-        <translation>Sopran Klarinette</translation>
+        <translation>Sopranklarinette</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="237"/>
         <source>D Clarinet</source>
-        <translation>D Klarinette</translation>
+        <translation>Klarinette in D</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="239"/>
         <source>E♭ Clarinet</source>
-        <translation>Es Klarinette</translation>
+        <translation>Klarinette in Es</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="243"/>
         <source>B♭ Clarinet</source>
-        <translation>B Klarinette</translation>
+        <translation>Klarinette in B</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="245"/>
         <source>A Clarinet</source>
-        <translation>A Klarinette</translation>
+        <translation>Klarinette in A</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="247"/>
         <source>Alto Clarinet</source>
-        <translation>Alt Klarinette</translation>
+        <translation>Altklarinette</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="249"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="253"/>
         <source>Bass Clarinet</source>
-        <translation>Bass Klarinette</translation>
+        <translation>Bassklarinette</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="261"/>
         <source>Contra-alto Clarinet</source>
-        <translation>Kontra-Alt Klarinette</translation>
+        <translation>Kontra-Altklarinette</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="263"/>
         <source>Contrabass Clarinet</source>
-        <translation>Kontrabass Klarinette</translation>
+        <translation>Kontrabassklarinette</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="265"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="309"/>
         <source>Sopranissimo Saxophone</source>
-        <translation>Sopranissimo Saxophon</translation>
+        <translation>Sopranissimosaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="311"/>
         <source>Sopranino Saxophone</source>
-        <translation>Sopranino Saxophon</translation>
+        <translation>Sopraninosaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="313"/>
         <source>Soprano Saxophone</source>
-        <translation>Sopran Saxophon</translation>
+        <translation>Sopransaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="315"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="317"/>
         <source>Mezzo-Soprano Saxophone</source>
-        <translation>Mezzo-Sopran Saxophon</translation>
+        <translation>Mezzosopransaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="319"/>
         <source>Alto Saxophone</source>
-        <translation>Alt Saxophon</translation>
+        <translation>Altsaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="321"/>
         <source>Melody Saxophone</source>
-        <translation>Melodie Saxophon</translation>
+        <translation>Melodiesaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="323"/>
         <source>Tenor Saxophone</source>
-        <translation>Tenor Saxophon</translation>
+        <translation>Tenorsaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="325"/>
         <source>Baritone Saxophone</source>
-        <translation>Bariton Saxophon</translation>
+        <translation>Baritonsaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="327"/>
         <source>Bass Saxophone</source>
-        <translation>Bass Saxophon</translation>
+        <translation>Bassaaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="329"/>
         <source>Contrabass Saxophone</source>
-        <translation>Kontrabass Saxophon</translation>
+        <translation>Kontrabasssaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="331"/>
         <source>Subcontrabass Saxophone</source>
-        <translation>Subkontrabass Saxophon</translation>
+        <translation>Subkontrabasssaxophon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="333"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="445"/>
         <source>Piccolo Trumpet</source>
-        <translation>Piccolo Trompete</translation>
+        <translation>Piccolotrompete</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="448"/>
         <source>Piccolo Trumpet in B♭</source>
-        <translation>Piccolo Trompete in B</translation>
+        <translation>Piccolotrompete in B</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="451"/>
         <source>Piccolo Trumpet in A</source>
-        <translation>Piccolo Trompete in A</translation>
+        <translation>Piccolotrompete in A</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="460"/>
         <source>E♭ Trumpet</source>
-        <translation>Es Trompete</translation>
+        <translation>Trompete in Es</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="463"/>
         <source>D Trumpet</source>
-        <translation>D Trompete</translation>
+        <translation>Trompete in D</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="466"/>
         <source>C Trumpet</source>
-        <translation>C Trompete</translation>
+        <translation>Trompete in C</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="469"/>
         <source>B♭ Trumpet</source>
-        <translation>B Trompete</translation>
+        <translation>Trompete in B</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="475"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="481"/>
         <source>Tenor Trumpet</source>
-        <translation>Tenor Trompete</translation>
+        <translation>Tenortrompete</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="483"/>
         <source>Bass Trumpet</source>
-        <translation>Bass Trompete</translation>
+        <translation>Basstrompete</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="486"/>
         <source>E♭ Bass Trumpet</source>
-        <translation>Es Bass Trompete</translation>
+        <translation>Basstrompete in Es</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="489"/>
         <source>Bass Trumpet in C</source>
-        <translation>Bass Trompete in C</translation>
+        <translation>Basstrompete in C</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="492"/>
         <source>B♭ Bass Trumpet</source>
-        <translation>B Bass Trompete</translation>
+        <translation>Basstrompete in B</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="495"/>
         <source>Baroque Trumpet</source>
-        <translation>Barock Trompete</translation>
+        <translation>Barocktrompete</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="497"/>
         <source>Baroque Trumpet in F</source>
-        <translation>Barock Trompete in F</translation>
+        <translation>Barocktrompete in F</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="499"/>
         <source>Baroque Trumpet in E♭</source>
-        <translation>Barock Trompete in Es</translation>
+        <translation>Barocktrompete in Es</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="501"/>
         <source>Baroque Trumpet in D</source>
-        <translation>Barock Trompete in D</translation>
+        <translation>Barocktrompete in D</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="503"/>
         <source>Baroque Trumpet in C</source>
-        <translation>Barock Trompete in C</translation>
+        <translation>Barocktrompete in C</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="505"/>
         <source>Baroque Trumpet in B♭</source>
-        <translation>Barock Trompete in B</translation>
+        <translation>Barocktrompete in B</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="507"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="566"/>
         <source>Soprano Trombone</source>
-        <translation>Sopran Posaune</translation>
+        <translation>Sopranposaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="568"/>
         <source>Alto Trombone</source>
-        <translation>Alt Posaune</translation>
+        <translation>Altposaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="570"/>
         <source>Tenor Trombone</source>
-        <translation>Tenor Posaune</translation>
+        <translation>Tenorposaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="572"/>
         <source>Bass Trombone</source>
-        <translation>Bass Posaune</translation>
+        <translation>Bassposaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="574"/>
         <source>Contrabass Trombone</source>
-        <translation>Kontrabass Posaune</translation>
+        <translation>Kontrabassposaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="576"/>
         <location filename="../instruments/instrumentsxml.h" line="14"/>
         <source>W.</source>
         <comment>Winds</comment>
-        <translation>H.</translation>
+        <translation>Hb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="16"/>
         <location filename="../instruments/instrumentsxml.h" line="34"/>
         <source>Cb. Fl.</source>
         <comment>Contrabass Flute</comment>
-        <translation>Kb.fl.</translation>
+        <translation>Kb. Fl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="36"/>
         <location filename="../instruments/instrumentsxml.h" line="154"/>
         <source>Hph.</source>
         <comment>Heckelphone-clarinet</comment>
-        <translation>Hph.</translation>
+        <translation>Hph.-Kl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="156"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="235"/>
         <source>C Clarinet</source>
-        <translation>C Klarinette</translation>
+        <translation>Klarinette in C</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="236"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="241"/>
         <source>G Clarinet</source>
-        <translation>G Klarinette</translation>
+        <translation>Klarinette in G</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="242"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="255"/>
         <source>B♭ Bass Clarinet (Bass Clef)</source>
-        <translation>B Bass Klarinette (Bass Schlüssel)</translation>
+        <translation>Bassklarinette in B (Bass Schlüssel)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="256"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="257"/>
         <source>A Bass Clarinet</source>
-        <translation>A Bass Klarinette</translation>
+        <translation>Bassklarinette in A</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="258"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="259"/>
         <source>A Bass Clarinet (Bass Clef)</source>
-        <translation>A Bass Klarinette (Bass Schlüssel)</translation>
+        <translation>Bassklarinette in A (Bass Schlüssel)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="260"/>
         <location filename="../instruments/instrumentsxml.h" line="390"/>
         <source>Br.</source>
         <comment>Brass</comment>
-        <translation>Br.</translation>
+        <translation>Bb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="392"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="454"/>
         <source>F Trumpet</source>
-        <translation>F Trompete</translation>
+        <translation>Trompete in F</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="455"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="457"/>
         <source>E Trumpet</source>
-        <translation>E Trompete</translation>
+        <translation>Trompete in E</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="458"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="472"/>
         <source>A Trumpet</source>
-        <translation>A Trompete</translation>
+        <translation>Trompete in A</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="473"/>
         <location filename="../instruments/instrumentsxml.h" line="510"/>
         <source>Bu.</source>
         <comment>Bugle</comment>
-        <translation>Bu.</translation>
+        <translation>Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="512"/>
         <source>Sop.</source>
         <comment>Soprano Bugle</comment>
-        <translation>Sop.</translation>
+        <translation>S. Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="514"/>
         <source>Alto</source>
         <comment>Alto Bugle</comment>
-        <translation>Alt</translation>
+        <translation>A. Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="516"/>
         <source>Bari.</source>
         <comment>Baritone Bugle</comment>
-        <translation>Bari.</translation>
+        <translation>Bar. Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="518"/>
         <location filename="../instruments/instrumentsxml.h" line="524"/>
         <source>Euph.</source>
         <comment>Euphonium Bugle</comment>
-        <translation>Euph.</translation>
+        <translation>Euph. Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="526"/>
         <source>Mello</source>
         <comment>Mellophone Bugle</comment>
-        <translation>Mello</translation>
+        <translation>Mello. Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="528"/>
         <source>Contra</source>
         <comment>Contrabass Bugle</comment>
-        <translation>Kontra</translation>
+        <translation>Kb. Hn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="530"/>
         <source>Mello</source>
         <comment>Mellophone</comment>
-        <translation>Mello</translation>
+        <translation>Mello.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="532"/>
         <location filename="../instruments/instrumentsxml.h" line="586"/>
         <source>F Tu.</source>
         <comment>F Tuba</comment>
-        <translation>F Tu.</translation>
+        <translation>F Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="588"/>
         <location filename="../instruments/instrumentsxml.h" line="590"/>
         <source>E♭ Tu.</source>
         <comment>E♭ Tuba</comment>
-        <translation>Es Tu.</translation>
+        <translation>Es Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="593"/>
         <source>C Tu.</source>
         <comment>C Tuba</comment>
-        <translation>C Tu.</translation>
+        <translation>C Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="595"/>
         <location filename="../instruments/instrumentsxml.h" line="597"/>
         <source>B♭ Tu.</source>
         <comment>B♭ Tuba</comment>
-        <translation>B Tu.</translation>
+        <translation>B Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="600"/>
         <source>Ba. Tu. F</source>
         <comment>Bass Tuba in F</comment>
-        <translation>Ba. Tu. F</translation>
+        <translation>Ba. Tb. F</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="602"/>
         <source>Ba. Tu. E♭</source>
         <comment>Bass Tuba in E♭</comment>
-        <translation>Ba. Tu. Es</translation>
+        <translation>Ba. Tb. Es</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="604"/>
         <source>SCB. Tu.</source>
         <comment>Sub-Contrabass Tuba</comment>
-        <translation>Skb. Tu.</translation>
+        <translation>Skb. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="606"/>
         <location filename="../instruments/instrumentsxml.h" line="612"/>
         <source>Wag. Tu.</source>
         <comment>Wagner Tuba</comment>
-        <translation>Wag. Tu.</translation>
+        <translation>Wag. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="614"/>
         <source>B♭ Wag. Tu.</source>
         <comment>B♭ Wagner Tuba</comment>
-        <translation>B Wag. Tu.</translation>
+        <translation>B Wag. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="616"/>
         <source>F Wag. Tu.</source>
         <comment>F Wagner Tuba</comment>
-        <translation>F Wag. Tu.</translation>
+        <translation>F Wag. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="618"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="654"/>
         <source>Chimes</source>
-        <translation>Windspiele</translation>
+        <translation>Röhrenglocken</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="655"/>
         <source>Cme.</source>
         <comment>Chimes</comment>
-        <translation>Wsp.</translation>
+        <translation>Rgl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="657"/>
         <location filename="../instruments/instrumentsxml.h" line="671"/>
         <source>Ha. Be.</source>
         <comment>Hand Bells</comment>
-        <translation>Ha. Gl.</translation>
+        <translation>Hgl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="673"/>
         <location filename="../instruments/instrumentsxml.h" line="746"/>
         <source>Be.</source>
         <comment>Bells</comment>
-        <translation>Be.</translation>
+        <translation>Gl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="748"/>
         <source>Sle. Be.</source>
         <comment>Sleigh Bells</comment>
-        <translation>Sle. Be.</translation>
+        <translation>Gls.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="750"/>
         <source>Be. Pla.</source>
         <comment>Bell Plate</comment>
-        <translation>Be. Pla.</translation>
+        <translation>Glp.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="752"/>
         <location filename="../instruments/instrumentsxml.h" line="847"/>
         <source>S.</source>
         <comment>Soprano</comment>
-        <translation>S</translation>
+        <translation>S.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="849"/>
         <location filename="../instruments/instrumentsxml.h" line="851"/>
         <source>A.</source>
         <comment>Alto</comment>
-        <translation>A</translation>
+        <translation>A.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="853"/>
         <location filename="../instruments/instrumentsxml.h" line="855"/>
         <source>Ct.</source>
         <comment>Countertenor</comment>
-        <translation>Count.</translation>
+        <translation>Ct.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="857"/>
         <source>T.</source>
         <comment>Tenor</comment>
-        <translation>T</translation>
+        <translation>T.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="859"/>
         <location filename="../instruments/instrumentsxml.h" line="861"/>
         <source>B.</source>
         <comment>Bass</comment>
-        <translation>B</translation>
+        <translation>B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="862"/>
         <location filename="../instruments/instrumentsxml.h" line="1013"/>
         <source>CB. Bal.</source>
         <comment>Contrabass Balalaika</comment>
-        <translation>KB. Bal.</translation>
+        <translation>Kb. Bal.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1016"/>
index a7db1f0..8a99fd1 100644 (file)
         <location filename="../instruments/instrumentsxml.h" line="14"/>
         <source>W.</source>
         <comment>Winds</comment>
-        <translation>W.</translation>
+        <translation>Wi.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="16"/>
         <location filename="../instruments/instrumentsxml.h" line="154"/>
         <source>Hph.</source>
         <comment>Heckelphone-clarinet</comment>
-        <translation>Hph.</translation>
+        <translation>Hph.-cl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="156"/>
         <location filename="../instruments/instrumentsxml.h" line="512"/>
         <source>Sop.</source>
         <comment>Soprano Bugle</comment>
-        <translation>Sop.</translation>
+        <translation>S. Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="514"/>
         <source>Alto</source>
         <comment>Alto Bugle</comment>
-        <translation>Alto</translation>
+        <translation>A. Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="516"/>
         <source>Bari.</source>
         <comment>Baritone Bugle</comment>
-        <translation>Bari.</translation>
+        <translation>Bar. Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="518"/>
         <location filename="../instruments/instrumentsxml.h" line="524"/>
         <source>Euph.</source>
         <comment>Euphonium Bugle</comment>
-        <translation>Euph.</translation>
+        <translation>Euph. Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="526"/>
         <source>Mello</source>
         <comment>Mellophone Bugle</comment>
-        <translation>Mello</translation>
+        <translation>Mello. Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="528"/>
         <source>Contra</source>
         <comment>Contrabass Bugle</comment>
-        <translation>Contra</translation>
+        <translation>Cb. Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="530"/>
         <source>Mello</source>
         <comment>Mellophone</comment>
-        <translation>Mello</translation>
+        <translation>Mello.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="532"/>
         <location filename="../instruments/instrumentsxml.h" line="586"/>
         <source>F Tu.</source>
         <comment>F Tuba</comment>
-        <translation>F Tu.</translation>
+        <translation>F Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="588"/>
         <location filename="../instruments/instrumentsxml.h" line="590"/>
         <source>E♭ Tu.</source>
         <comment>E♭ Tuba</comment>
-        <translation>E♭ Tu.</translation>
+        <translation>E♭ Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="593"/>
         <source>C Tu.</source>
         <comment>C Tuba</comment>
-        <translation>C Tu.</translation>
+        <translation>C Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="595"/>
         <location filename="../instruments/instrumentsxml.h" line="597"/>
         <source>B♭ Tu.</source>
         <comment>B♭ Tuba</comment>
-        <translation>B♭ Tu.</translation>
+        <translation>B♭ Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="600"/>
         <source>Ba. Tu. F</source>
         <comment>Bass Tuba in F</comment>
-        <translation>Ba. Tu. F</translation>
+        <translation>Ba. Tb. F</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="602"/>
         <source>Ba. Tu. E♭</source>
         <comment>Bass Tuba in E♭</comment>
-        <translation>Ba. Tu. E♭</translation>
+        <translation>Ba. Tb. E♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="604"/>
         <source>SCB. Tu.</source>
         <comment>Sub-Contrabass Tuba</comment>
-        <translation>SCB. Tu.</translation>
+        <translation>SCb. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="606"/>
         <location filename="../instruments/instrumentsxml.h" line="612"/>
         <source>Wag. Tu.</source>
         <comment>Wagner Tuba</comment>
-        <translation>Wag. Tu.</translation>
+        <translation>Wag. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="614"/>
         <source>B♭ Wag. Tu.</source>
         <comment>B♭ Wagner Tuba</comment>
-        <translation>B♭ Wag. Tu.</translation>
+        <translation>B♭ Wag. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="616"/>
         <source>F Wag. Tu.</source>
         <comment>F Wagner Tuba</comment>
-        <translation>F Wag. Tu.</translation>
+        <translation>F Wag. Tb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="618"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="654"/>
         <source>Chimes</source>
-        <translation>Chimes</translation>
+        <translation>Tubular Bells</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="655"/>
         <source>Cme.</source>
         <comment>Chimes</comment>
-        <translation>Cme.</translation>
+        <translation>T.B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="657"/>
         <location filename="../instruments/instrumentsxml.h" line="1013"/>
         <source>CB. Bal.</source>
         <comment>Contrabass Balalaika</comment>
-        <translation>CB. Bal.</translation>
+        <translation>Cb. Bal.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1016"/>
index b03b35a..fbc1ebd 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="127"/>
         <source>Tin Whistle</source>
-        <translation>Flauta Irlandensa</translation>
+        <translation>Flauta Irlandesa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="129"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="153"/>
         <source>Heckelphone-clarinet</source>
-        <translation>Heckelphone-clarinete</translation>
+        <translation>Clarinete Heckelfón</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="155"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="249"/>
         <source>Basset Clarinet</source>
-        <translation>Clarinete di bassetto</translation>
+        <translation>Clarinete basset</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="251"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="315"/>
         <source>Aulochrome</source>
-        <translation>Aulos Comático</translation>
+        <translation>Aulocromo</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="317"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="362"/>
         <source>20 Hole Chordet Harmonica</source>
-        <translation>Armónica cromática de 20 agujeros</translation>
+        <translation>Armónica Chordet de 20 agujeros</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="364"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="521"/>
         <source>Kuhlohorn</source>
-        <translation>Fliscorno Kuhlo</translation>
+        <translation>Kuhlohorn</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="523"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="619"/>
         <source>Didgeridoo</source>
-        <translation>Didgeridoo</translation>
+        <translation>Didyeridú</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="621"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="640"/>
         <source>Tubaphone</source>
-        <translation>Tubaphone</translation>
+        <translation>Tubáfono</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="642"/>
         <source>Almglocken</source>
-        <translation>Cencerro</translation>
+        <translation>Cencerros afinados</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="644"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="678"/>
         <source>Musical Glasses</source>
-        <translation>Vasos Musicales</translation>
+        <translation>Copas Musicales</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="680"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="708"/>
         <source>Treble Kalimba</source>
-        <translation>Kalimba Tiple</translation>
+        <translation>Kalimba Aguda</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="710"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="731"/>
         <source>Timbales</source>
-        <translation>Timbales</translation>
+        <translation>Timbaletas</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="733"/>
         <source>Frame Drum</source>
-        <translation>Pandero</translation>
+        <translation>Tambor de marco</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="735"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="751"/>
         <source>Bowl Gongs</source>
-        <translation>Gongs de tazo</translation>
+        <translation>Cuenco tibetano</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="753"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="765"/>
         <source>Wood Blocks</source>
-        <translation>Bloques de madera</translation>
+        <translation>Caja china</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="767"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="791"/>
         <source>Cabasa</source>
-        <translation>Sonaja</translation>
+        <translation>Cabasa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="793"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="797"/>
         <source>Slit Drum</source>
-        <translation>Tambor de madera</translation>
+        <translation>Tambor de ranura</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="799"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="801"/>
         <source>Ratchet</source>
-        <translation>Carraca</translation>
+        <translation>Matraca</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="803"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="7"/>
         <source>Marching Band</source>
-        <translation>Banda de música</translation>
+        <translation>Banda de marcha</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="8"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="12"/>
         <source>Woodwinds</source>
-        <translation>Viento madera</translation>
+        <translation>Vientos de madera</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="13"/>
         <source>Winds</source>
-        <translation>Vientos de Madera</translation>
+        <translation>Vientos</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="14"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="17"/>
         <source>D♭ Piccolo</source>
-        <translation>Flauta piccolo en D♭</translation>
+        <translation>Flauta piccolo en Re ♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="18"/>
         <source>D♭ Picc.</source>
         <comment>D♭ Piccolo</comment>
-        <translation>Picc. Fa ♭</translation>
+        <translation>Picc. Re ♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="20"/>
         <location filename="../instruments/instrumentsxml.h" line="40"/>
         <source>Trv.</source>
         <comment>Traverso</comment>
-        <translation type="unfinished"/>
+        <translation>Trv.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="42"/>
         <location filename="../instruments/instrumentsxml.h" line="68"/>
         <source>S. Gh.</source>
         <comment>Soprano Gemshorn</comment>
-        <translation>Gh. S.</translation>
+        <translation>Gc. S.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="70"/>
         <source>A. Gh.</source>
         <comment>Alto Gemshorn</comment>
-        <translation>Gh. A.</translation>
+        <translation>Gc. A.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="72"/>
         <source>T. Gh.</source>
         <comment>Tenor Gemshorn</comment>
-        <translation>Gh. T.</translation>
+        <translation>Gc. T.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="74"/>
         <source>B. Gh.</source>
         <comment>Bass Gemshorn</comment>
-        <translation>Gh. B.</translation>
+        <translation>Gc. B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="76"/>
         <location filename="../instruments/instrumentsxml.h" line="86"/>
         <source>G A. Oc.</source>
         <comment>G Alto Ocarina</comment>
-        <translation>Oc. ctrl. Sol</translation>
+        <translation>Oc. Ctrl. Sol</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="88"/>
         <source>F A. Oc.</source>
         <comment>F Alto Ocarina</comment>
-        <translation>Oc. ctrl. Fa</translation>
+        <translation>Oc. Ctrl. Fa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="90"/>
         <source>C A. Oc.</source>
         <comment>C Alto Ocarina</comment>
-        <translation>Oc. ctrl. Do</translation>
+        <translation>Oc. Ctrl. Do</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="92"/>
         <source>B♭­ A. Oc.</source>
         <comment>B♭­ Alto Ocarina</comment>
-        <translation>Oc. ctrl. Si♭</translation>
+        <translation>Oc. Ctrl. Si♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="94"/>
         <source>C B. Oc.</source>
         <comment>C Bass Ocarina</comment>
-        <translation>Oc. b. Do</translation>
+        <translation>Oc. B. Do</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="96"/>
         <location filename="../instruments/instrumentsxml.h" line="110"/>
         <source>Gk. Rec.</source>
         <comment>Garklein Recorder</comment>
-        <translation>Fl. dulce ex.</translation>
+        <translation>Fl. dul. ex.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="112"/>
         <location filename="../instruments/instrumentsxml.h" line="114"/>
         <source>S. Rec.</source>
         <comment>Soprano Recorder</comment>
-        <translation>Fl. dul. sop.</translation>
+        <translation>Fl. dul. Sop.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="116"/>
         <source>A. Rec.</source>
         <comment>Alto Recorder</comment>
-        <translation>Fl. dul. ctrl.</translation>
+        <translation>Fl. dul. Ctrl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="118"/>
         <source>T. Rec.</source>
         <comment>Tenor Recorder</comment>
-        <translation>Fl. dul. ten.</translation>
+        <translation>Fl. dul. Ten.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="120"/>
         <source>B. Rec.</source>
         <comment>Bass Recorder</comment>
-        <translation>Fl. dul. bj.</translation>
+        <translation>Fl. dul. Bj.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="122"/>
         <location filename="../instruments/instrumentsxml.h" line="124"/>
         <source>Cb. Rec.</source>
         <comment>Contrabass Recorder</comment>
-        <translation>Fl. dulce cb.</translation>
+        <translation>Fl. dulce Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="126"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="131"/>
         <source>D Tin Whistle</source>
-        <translation>Flauta Irlandesa</translation>
+        <translation>Flauta Irlandesa  en Re</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="132"/>
         <source>D Tin Wh.</source>
         <comment>D Tin Whistle</comment>
-        <translation type="unfinished"/>
+        <translation>Fl. Ir. Re</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="134"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="151"/>
         <source>Lupophone</source>
-        <translation type="unfinished"/>
+        <translation>Lupofón</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="152"/>
         <source>Lph.</source>
         <comment>Lupophone</comment>
-        <translation type="unfinished"/>
+        <translation>Lup.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="154"/>
         <source>Hph.</source>
         <comment>Heckelphone-clarinet</comment>
-        <translation>Hckl. </translation>
+        <translation>Cl. Hckl. </translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="156"/>
         <location filename="../instruments/instrumentsxml.h" line="166"/>
         <source>G.B. Sh.</source>
         <comment>Great Bass Shawm</comment>
-        <translation>Chir. cb.</translation>
+        <translation>Chir. Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="168"/>
         <location filename="../instruments/instrumentsxml.h" line="178"/>
         <source>B. Crh.</source>
         <comment>Bass Crumhorn</comment>
-        <translation>Crh. A.</translation>
+        <translation>Crh. B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="180"/>
         <source>Gb. Crh.</source>
         <comment>Greatbass Crumhorn</comment>
-        <translation>Crh. Ctb.</translation>
+        <translation>Crh. Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="182"/>
         <location filename="../instruments/instrumentsxml.h" line="224"/>
         <source>Si. Rpf.</source>
         <comment>Sopranino Rauschpfeife</comment>
-        <translation>Rpf. Si.</translation>
+        <translation>Rpf. Spino.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="226"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="255"/>
         <source>B♭ Bass Clarinet (Bass Clef)</source>
-        <translation>Clarinete Bajo en Si♭ (Clave Bajo)</translation>
+        <translation>Clarinete Bajo en Si♭ (Clave Fa)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="256"/>
         <location filename="../instruments/instrumentsxml.h" line="258"/>
         <source>A B. Cl.</source>
         <comment>A Bass Clarinet</comment>
-        <translation>Cl. B. Do</translation>
+        <translation>Cl. B. La</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="259"/>
         <source>A Bass Clarinet (Bass Clef)</source>
-        <translation>Clarinete Bajo en La (Clave Bajo)</translation>
+        <translation>Clarinete Bajo en La (Clave Fa)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="260"/>
         <source>A B. Cl.</source>
         <comment>A Bass Clarinet (Bass Clef)</comment>
-        <translation>Cl. B. Do</translation>
+        <translation>Cl. B. La</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="262"/>
         <location filename="../instruments/instrumentsxml.h" line="274"/>
         <source>T. Cha.</source>
         <comment>Tenor Chalumeau</comment>
-        <translation>Cha. T.</translation>
+        <translation>Sal. T.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="276"/>
         <location filename="../instruments/instrumentsxml.h" line="286"/>
         <source>Rd. Cbs.</source>
         <comment>Reed Contrabass</comment>
-        <translation>Ctb. Leng.</translation>
+        <translation>Cb. Leng.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="288"/>
         <source>Du.</source>
         <comment>Dulcian</comment>
-        <translation>Du.</translation>
+        <translation>Bjn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="290"/>
         <location filename="../instruments/instrumentsxml.h" line="294"/>
         <source>Si. Sar.</source>
         <comment>Sopranino Sarrusophone</comment>
-        <translation>Sarr. Sio.</translation>
+        <translation>Sarr. Spino.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="296"/>
         <location filename="../instruments/instrumentsxml.h" line="306"/>
         <source>Cb. Sar.</source>
         <comment>Contrabass Sarrusophone</comment>
-        <translation>Sarr. cb.</translation>
+        <translation>Sarr. Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="308"/>
         <location filename="../instruments/instrumentsxml.h" line="316"/>
         <source>Aul.</source>
         <comment>Aulochrome</comment>
-        <translation>Aul. Crom.</translation>
+        <translation>Aulocr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="318"/>
         <source>M.S. Sax.</source>
         <comment>Mezzo-Soprano Saxophone</comment>
-        <translation>Sax. M-sop.</translation>
+        <translation>Sax. MS.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="320"/>
         <location filename="../instruments/instrumentsxml.h" line="322"/>
         <source>Mel. Sax.</source>
         <comment>Melody Saxophone</comment>
-        <translation>Sax. Mel.</translation>
+        <translation>Sax. T. Do</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="324"/>
         <location filename="../instruments/instrumentsxml.h" line="357"/>
         <source>Harm.</source>
         <comment>10 Hole A Diatonic Harmonica</comment>
-        <translation>Arm.</translation>
+        <translation>Arm. La</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="359"/>
         <source>Harm.</source>
         <comment>10 Hole G Diatonic Harmonica</comment>
-        <translation>Arm.</translation>
+        <translation>Arm. Sol</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="361"/>
         <source>Harm.</source>
         <comment>10 Hole Low D Diatonic Harmonica</comment>
-        <translation>Arm.</translation>
+        <translation>Arm. Re</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="363"/>
         <source>Harm.</source>
         <comment>20 Hole Chordet Harmonica</comment>
-        <translation>Arm.</translation>
+        <translation>Arm. Chord.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="365"/>
         <location filename="../instruments/instrumentsxml.h" line="367"/>
         <source>Bs. Harm.</source>
         <comment>Bass Hohner Harmonica</comment>
-        <translation>Arm. B.</translation>
+        <translation>Arm. Hohn. B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="369"/>
         <source>Bs. Harm.</source>
         <comment>Bass Huang Harmonica</comment>
-        <translation>Arm. B.</translation>
+        <translation>Arm. Hua. B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="371"/>
         <location filename="../instruments/instrumentsxml.h" line="430"/>
         <source>F A. Hn.</source>
         <comment>F Alto Horn</comment>
-        <translation>Trmp. A. Fa</translation>
+        <translation>Cor. A. Fa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="432"/>
         <source>E♭ A. Hn.</source>
         <comment>E♭ Alto Horn</comment>
-        <translation>Trmp. A. Mi♭</translation>
+        <translation>Cor. A. Mi♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="434"/>
         <location filename="../instruments/instrumentsxml.h" line="436"/>
         <source>Bar. Hn.</source>
         <comment>Baritone Horn</comment>
-        <translation>Trmpa. Bari.</translation>
+        <translation>Cor. Bar.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="439"/>
         <location filename="../instruments/instrumentsxml.h" line="479"/>
         <source>Sl.Tpt.</source>
         <comment>Slide Trumpet</comment>
-        <translation>Tpt. vars.</translation>
+        <translation>Tpt. vara</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="482"/>
         <location filename="../instruments/instrumentsxml.h" line="512"/>
         <source>Sop.</source>
         <comment>Soprano Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Cneta. Sop.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="514"/>
         <source>Alto</source>
         <comment>Alto Bugle</comment>
-        <translation>Alto</translation>
+        <translation>Cneta Alto</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="516"/>
         <source>Bari.</source>
         <comment>Baritone Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Cneta. Bari.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="518"/>
         <location filename="../instruments/instrumentsxml.h" line="520"/>
         <source>Fsc.</source>
         <comment>Fiscorn</comment>
-        <translation>Flisc.</translation>
+        <translation>Fisc.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="522"/>
         <location filename="../instruments/instrumentsxml.h" line="526"/>
         <source>Mello</source>
         <comment>Mellophone Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Melo. Alto</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="528"/>
         <source>Contra</source>
         <comment>Contrabass Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Cneta. Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="530"/>
         <source>Mello</source>
         <comment>Mellophone</comment>
-        <translation type="unfinished"/>
+        <translation>Mello.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="532"/>
         <location filename="../instruments/instrumentsxml.h" line="534"/>
         <source>F A. Oph.</source>
         <comment>F Alto Ophicleide</comment>
-        <translation>Fgl. Fa</translation>
+        <translation>Fgl. A. Fa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="536"/>
         <location filename="../instruments/instrumentsxml.h" line="542"/>
         <source>E♭ Cb. Oph.</source>
         <comment>E♭ Contrabass Ophicleide</comment>
-        <translation>Fgl. Ctbs Mi♭</translation>
+        <translation>Fgl. Cb Mi♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="544"/>
         <source>Co.</source>
         <comment>Cornettino</comment>
-        <translation>Cio.</translation>
+        <translation>Cino.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="546"/>
         <source>Co.</source>
         <comment>Cornett</comment>
-        <translation>Cio.</translation>
+        <translation>Co.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="548"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="609"/>
         <source>B♭ Sousaphone</source>
-        <translation>Saxofón en B♭ </translation>
+        <translation>Sousafón en B♭ </translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="610"/>
         <location filename="../instruments/instrumentsxml.h" line="618"/>
         <source>Cnch.</source>
         <comment>Conch</comment>
-        <translation>Cnch.</translation>
+        <translation>Carac.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="620"/>
         <source>Doo.</source>
         <comment>Didgeridoo</comment>
-        <translation>Doo.</translation>
+        <translation>Ddú..</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="622"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="630"/>
         <source>Roto-Toms</source>
-        <translation type="unfinished"/>
+        <translation>Rototoms</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="631"/>
         <source>Roto</source>
         <comment>Roto-Toms</comment>
-        <translation type="unfinished"/>
+        <translation>Roto</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="633"/>
         <source>Glock.</source>
         <comment>Glockenspiel</comment>
-        <translation type="unfinished"/>
+        <translation>Glock.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="635"/>
         <location filename="../instruments/instrumentsxml.h" line="639"/>
         <source>Crot.</source>
         <comment>Crotales</comment>
-        <translation type="unfinished"/>
+        <translation>Crot.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="641"/>
         <source>Tph.</source>
         <comment>Tubaphone</comment>
-        <translation>Tph.</translation>
+        <translation>Tfón.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="643"/>
         <source>Almg.</source>
         <comment>Almglocken</comment>
-        <translation type="unfinished"/>
+        <translation>Cen. afin.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="645"/>
         <location filename="../instruments/instrumentsxml.h" line="655"/>
         <source>Cme.</source>
         <comment>Chimes</comment>
-        <translation type="unfinished"/>
+        <translation>Caril.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="657"/>
         <location filename="../instruments/instrumentsxml.h" line="673"/>
         <source>Td. Gon.</source>
         <comment>Tuned Gongs</comment>
-        <translation type="unfinished"/>
+        <translation>Gng Afin.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="675"/>
         <location filename="../instruments/instrumentsxml.h" line="679"/>
         <source>Mu. Gla.</source>
         <comment>Musical Glasses</comment>
-        <translation>Vas. Mus.</translation>
+        <translation>Cop. Mus.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="681"/>
         <location filename="../instruments/instrumentsxml.h" line="709"/>
         <source>Tr. Kal.</source>
         <comment>Treble Kalimba</comment>
-        <translation>Kal. Tip.</translation>
+        <translation>Kal. Agud.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="711"/>
         <location filename="../instruments/instrumentsxml.h" line="714"/>
         <source>D. Set</source>
         <comment>Drumset</comment>
-        <translation type="unfinished"/>
+        <translation>Perc.  Set.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="715"/>
         <location filename="../instruments/instrumentsxml.h" line="716"/>
         <source>Con. Sn.</source>
         <comment>Concert Snare Drum</comment>
-        <translation type="unfinished"/>
+        <translation>C. Clar.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="717"/>
         <location filename="../instruments/instrumentsxml.h" line="718"/>
         <source>Con. BD </source>
         <comment>Concert Bass Drum</comment>
-        <translation type="unfinished"/>
+        <translation>Bom. Conc.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="719"/>
         <source>Piccolo Snare</source>
-        <translation>Redoblante Piccolo</translation>
+        <translation>Caja Piccolo</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="720"/>
         <source>Picc. Sn.</source>
         <comment>Piccolo Snare</comment>
-        <translation type="unfinished"/>
+        <translation>C. Clar. Pic.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="721"/>
         <location filename="../instruments/instrumentsxml.h" line="722"/>
         <source>Field Dr.</source>
         <comment>Field Drum</comment>
-        <translation type="unfinished"/>
+        <translation>Tmb. Mil.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="723"/>
         <location filename="../instruments/instrumentsxml.h" line="724"/>
         <source>C. Toms</source>
         <comment>Concert Toms</comment>
-        <translation type="unfinished"/>
+        <translation>Tom Conc.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="725"/>
         <source>Chinese Tom-Toms</source>
-        <translation type="unfinished"/>
+        <translation>Tom-tom chinos</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="726"/>
         <source>Ch. Toms</source>
         <comment>Chinese Tom-Toms</comment>
-        <translation type="unfinished"/>
+        <translation>Toms Ch.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="728"/>
         <source>Bon.</source>
         <comment>Bongos</comment>
-        <translation type="unfinished"/>
+        <translation>Bon.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="730"/>
         <source>Con.</source>
         <comment>Congas</comment>
-        <translation type="unfinished"/>
+        <translation>Con.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="732"/>
         <location filename="../instruments/instrumentsxml.h" line="734"/>
         <source>Fr. Dr.</source>
         <comment>Frame Drum</comment>
-        <translation>Pand.</translation>
+        <translation>Tamb. marc.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="736"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="743"/>
         <source>Tam-Tam</source>
-        <translation type="unfinished"/>
+        <translation>Tam-Tam</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="744"/>
         <source>Tam</source>
         <comment>Tam-Tam</comment>
-        <translation type="unfinished"/>
+        <translation>Tam</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="746"/>
         <location filename="../instruments/instrumentsxml.h" line="752"/>
         <source>Bw. Gon.</source>
         <comment>Bowl Gongs</comment>
-        <translation type="unfinished"/>
+        <translation>Cu. Tib.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="754"/>
         <source>Tu.</source>
         <comment>Tubo</comment>
-        <translation>Tba.</translation>
+        <translation>Tbo.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="756"/>
         <source>Met. Cst.</source>
         <comment>Metal Castanets</comment>
-        <translation>Cst. Met.</translation>
+        <translation>Cast. Met.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="758"/>
         <source>Aut. Brk. Dr.</source>
         <comment>Automobile Brake Drums</comment>
-        <translation>Tamb. fren. auto.</translation>
+        <translation>Tamb. freno</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="760"/>
         <location filename="../instruments/instrumentsxml.h" line="766"/>
         <source>Wd. Bl.</source>
         <comment>Wood Blocks</comment>
-        <translation>Cl. Ma.</translation>
+        <translation>Caj. Ch.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="768"/>
         <location filename="../instruments/instrumentsxml.h" line="780"/>
         <source>Sp. Cym.</source>
         <comment>Splash Cymbal</comment>
-        <translation>Plati. Spsh.</translation>
+        <translation>Plat. Spl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="782"/>
         <location filename="../instruments/instrumentsxml.h" line="786"/>
         <source>Cst.</source>
         <comment>Castanets</comment>
-        <translation>Cst.</translation>
+        <translation>Cast.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="787"/>
         <location filename="../instruments/instrumentsxml.h" line="792"/>
         <source>Cabs.</source>
         <comment>Cabasa</comment>
-        <translation type="unfinished"/>
+        <translation>Cabs.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="794"/>
         <location filename="../instruments/instrumentsxml.h" line="798"/>
         <source>Slt. Dr.</source>
         <comment>Slit Drum</comment>
-        <translation>Tamb. mad.</translation>
+        <translation>Tamb. ran.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="800"/>
         <source>Wh.</source>
         <comment>Whip</comment>
-        <translation>Lat.</translation>
+        <translation>Lát.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="802"/>
         <source>Rat.</source>
         <comment>Ratchet</comment>
-        <translation>Carr.</translation>
+        <translation>Matr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="804"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="823"/>
         <source>Percussion - Marching</source>
-        <translation type="unfinished"/>
+        <translation>Percusión de marcha</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="825"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="832"/>
         <source>Percussion - Body</source>
-        <translation type="unfinished"/>
+        <translation>Percusión corporal</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="834"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="925"/>
         <source>Goblins Synthesizer</source>
-        <translation>Sintetizador de Globbins</translation>
+        <translation>Sintetizador de Duendes</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="926"/>
         <source>Synth.</source>
         <comment>Goblins Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. </translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="927"/>
         <location filename="../instruments/instrumentsxml.h" line="928"/>
         <source>Synth.</source>
         <comment>Rain Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Lluv.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="929"/>
         <location filename="../instruments/instrumentsxml.h" line="930"/>
         <source>Synth.</source>
         <comment>Sci-fi Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Sci. Fi.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="931"/>
         <location filename="../instruments/instrumentsxml.h" line="932"/>
         <source>Synth.</source>
         <comment>Soundtrack Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. S. Trk.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="933"/>
         <location filename="../instruments/instrumentsxml.h" line="934"/>
         <source>Synth.</source>
         <comment>Pad Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Pad</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="935"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="936"/>
         <source>warm</source>
-        <translation>warm</translation>
+        <translation>cálido</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="937"/>
         <source>polysynth</source>
-        <translation>polysynth</translation>
+        <translation>polisinte</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="938"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="942"/>
         <source>sweep</source>
-        <translation>sweep</translation>
+        <translation>barrido</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="943"/>
         <location filename="../instruments/instrumentsxml.h" line="944"/>
         <source>Synth.</source>
         <comment>New Age Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. N. Age</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="945"/>
         <location filename="../instruments/instrumentsxml.h" line="946"/>
         <source>Synth.</source>
         <comment>Warm Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Cálid.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="947"/>
         <location filename="../instruments/instrumentsxml.h" line="948"/>
         <source>Synth.</source>
         <comment>Poly Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Polisint.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="949"/>
         <location filename="../instruments/instrumentsxml.h" line="950"/>
         <source>Synth.</source>
         <comment>Choir Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Coro</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="951"/>
         <location filename="../instruments/instrumentsxml.h" line="952"/>
         <source>Synth.</source>
         <comment>Bowed Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Arco</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="953"/>
         <location filename="../instruments/instrumentsxml.h" line="954"/>
         <source>Synth.</source>
         <comment>Metallic Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Met.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="955"/>
         <location filename="../instruments/instrumentsxml.h" line="956"/>
         <source>Synth.</source>
         <comment>Halo Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Ha.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="957"/>
         <location filename="../instruments/instrumentsxml.h" line="958"/>
         <source>Synth.</source>
         <comment>Sweep Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Barr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="959"/>
         <location filename="../instruments/instrumentsxml.h" line="960"/>
         <source>Synth.</source>
         <comment>Saw Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Sier.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="961"/>
         <location filename="../instruments/instrumentsxml.h" line="962"/>
         <source>Synth.</source>
         <comment>Sine Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Sen.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="963"/>
         <location filename="../instruments/instrumentsxml.h" line="964"/>
         <source>Synth.</source>
         <comment>Square Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Cuad.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="965"/>
         <location filename="../instruments/instrumentsxml.h" line="1094"/>
         <source>Thb.</source>
         <comment>Theorbo</comment>
-        <translation>Tiba.</translation>
+        <translation>Tior.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1096"/>
         <location filename="../instruments/instrumentsxml.h" line="1107"/>
         <source>OM.</source>
         <comment>Octave Mandolin</comment>
-        <translation>band.</translation>
+        <translation>Mand. Oct.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1109"/>
         <location filename="../instruments/instrumentsxml.h" line="970"/>
         <source>Synth.</source>
         <comment>Bass Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Baj.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="971"/>
         <source>synth-bass-1</source>
-        <translation>synth-bass-1</translation>
+        <translation>Bajo Sint.-1</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="972"/>
         <source>synth-bass-2</source>
-        <translation>synth-bass-2</translation>
+        <translation>Bajo Sint.-2</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="973"/>
         <location filename="../instruments/instrumentsxml.h" line="974"/>
         <source>Synth.</source>
         <comment>Brass Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Bajo</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="975"/>
         <source>synth-brass-1</source>
-        <translation>synth-brass-1</translation>
+        <translation>Metales Sintetizados-1</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="976"/>
         <source>synth-brass-2</source>
-        <translation>synth-brass-2</translation>
+        <translation>Metales Sintetizados-2</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="977"/>
         <location filename="../instruments/instrumentsxml.h" line="978"/>
         <source>Synth.</source>
         <comment>String Synthesizer</comment>
-        <translation>Sint.</translation>
+        <translation>Sint. Cuerd.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="979"/>
         <source>synth-string-1</source>
-        <translation>synth-string-1</translation>
+        <translation>Sintetizador de cuerdas-1</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="980"/>
         <source>synth-string-2</source>
-        <translation>synth-string-2</translation>
+        <translation>Sintetizador de cuerdas-2</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="981"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1051"/>
         <source>Pedal Steel Guitar</source>
-        <translation>Guitarra Pedal Steel</translation>
+        <translation>Pedal Steel Guitar </translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1053"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1146"/>
         <source>5-str. Electric Bass (High C/Tenor)</source>
-        <translation>Bajo Eléctrico de 5 cuerdas (D alto/Tenor)</translation>
+        <translation>Bajo Eléctrico de 5 cuerdas (Do alto/Tenor)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1149"/>
         <source>5-str. Electric Bass (High C/Tenor) [Tablature]</source>
-        <translation>Bajo Eléctrico de 5 cuerdas (D alto/Tenor) [Tablatura]</translation>
+        <translation>Bajo Eléctrico de 5 cuerdas (Do alto/Tenor) [Tablatura]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1150"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1155"/>
         <source>Prim</source>
-        <translation type="unfinished"/>
+        <translation>Prim</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1156"/>
         <source>Pr.</source>
         <comment>Prim</comment>
-        <translation type="unfinished"/>
+        <translation>Pr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1157"/>
         <source>Brač</source>
-        <translation type="unfinished"/>
+        <translation>Tambura</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1158"/>
         <source>Br.</source>
         <comment>Brač</comment>
-        <translation>Met.</translation>
+        <translation>Tambu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1159"/>
         <source>Čelo</source>
-        <translation type="unfinished"/>
+        <translation>Tamburica</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1160"/>
         <source>Č.</source>
         <comment>Čelo</comment>
-        <translation type="unfinished"/>
+        <translation>Tambca.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1161"/>
         <source>Bugarija</source>
-        <translation type="unfinished"/>
+        <translation>Bugarija</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1162"/>
         <source>Bu.</source>
         <comment>Bugarija</comment>
-        <translation>Cnta.</translation>
+        <translation>Bu.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1163"/>
         <source>Berda</source>
-        <translation type="unfinished"/>
+        <translation>Berda</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1164"/>
         <source>Be.</source>
         <comment>Berda</comment>
-        <translation>Camp.</translation>
+        <translation>Be.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1165"/>
         <location filename="../instruments/instrumentsxml.h" line="1167"/>
         <source>St.</source>
         <comment>Strings</comment>
-        <translation type="unfinished"/>
+        <translation>Cdas.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1168"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1174"/>
         <source>Nyckelharpa</source>
-        <translation type="unfinished"/>
+        <translation>Nyckelharpa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1175"/>
         <source>Nyh.</source>
         <comment>Nyckelharpa</comment>
-        <translation type="unfinished"/>
+        <translation>Nyh.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1179"/>
         <location filename="../instruments/instrumentsxml.h" line="1211"/>
         <source>Db.</source>
         <comment>Double Bass</comment>
-        <translation>Db.</translation>
+        <translation>Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1213"/>
         <source>Pds. v.</source>
         <comment>Pardessus de viole</comment>
-        <translation>Pds. v.</translation>
+        <translation>Pds. vla.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1217"/>
         <source>Tr. Vl.</source>
         <comment>Treble Viol</comment>
-        <translation type="unfinished"/>
+        <translation>Vl. Snino.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1221"/>
         <source>A. Vl.</source>
         <comment>Alto Viol</comment>
-        <translation>Vl. A.</translation>
+        <translation>Vla. da g. A.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1225"/>
         <source>T. Vl.</source>
         <comment>Tenor Viol</comment>
-        <translation>Vl. T.</translation>
+        <translation>Vla. da g. T.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1229"/>
         <location filename="../instruments/instrumentsxml.h" line="1233"/>
         <source>Vla. d. g.</source>
         <comment>Viola da gamba (Tab)</comment>
-        <translation>Vla. d. g.</translation>
+        <translation>Vla. d. g. (Tab)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1234"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1091"/>
         <source>Archlute</source>
-        <translation>Archilaud</translation>
+        <translation>Archilaúd</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="55"/>
         <location filename="../instruments/instrumentsxml.h" line="966"/>
         <source>O.M.</source>
         <comment>Ondes Martenot</comment>
-        <translation>O.M.</translation>
+        <translation>O.Marten..</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="968"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="985"/>
         <source>Strings - Plucked</source>
-        <translation>Cuerdas - Pulsados</translation>
+        <translation>Cuerdas Pulsadas</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="987"/>
         <location filename="../instruments/instrumentsxml.h" line="1013"/>
         <source>CB. Bal.</source>
         <comment>Contrabass Balalaika</comment>
-        <translation>Bal. Ctb.</translation>
+        <translation>Bal. Cb.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1016"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1034"/>
         <source>Cavaquinho</source>
-        <translation type="unfinished"/>
+        <translation>Cavaquinho</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1035"/>
         <source>Cava.</source>
         <comment>Cavaquinho</comment>
-        <translation type="unfinished"/>
+        <translation>Cavaq.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1036"/>
         <source>Cavaquinho [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>Cavaquinho {Tablatura}</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1037"/>
         <location filename="../instruments/instrumentsxml.h" line="1038"/>
         <source>Bar. Guit.</source>
         <comment>Baritone Guitar</comment>
-        <translation type="unfinished"/>
+        <translation>Guit. Bar.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1039"/>
         <location filename="../instruments/instrumentsxml.h" line="1040"/>
         <source>C. Guit.</source>
         <comment>Contra Guitar</comment>
-        <translation type="unfinished"/>
+        <translation>Cntr. Guit.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1042"/>
         <location filename="../instruments/instrumentsxml.h" line="1052"/>
         <source>Ped. St. Guit.</source>
         <comment>Pedal Steel Guitar</comment>
-        <translation>Guit. Ped. St.</translation>
+        <translation>Ped. St. Guit. </translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1054"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1065"/>
         <source>Oud</source>
-        <translation type="unfinished"/>
+        <translation>Laúd árabe</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1066"/>
         <source>O.</source>
         <comment>Oud</comment>
-        <translation type="unfinished"/>
+        <translation>Ld. Árab.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1068"/>
         <location filename="../instruments/instrumentsxml.h" line="1101"/>
         <source>A. Mda.</source>
         <comment>Alto Mandola</comment>
-        <translation type="unfinished"/>
+        <translation>Mndla. Alto</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1102"/>
         <location filename="../instruments/instrumentsxml.h" line="1103"/>
         <source>T. Mda.</source>
         <comment>Tenor Mandola</comment>
-        <translation type="unfinished"/>
+        <translation>Mndla. Ten.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1104"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1106"/>
         <source>Octave Mandolin</source>
-        <translation>Bandurria</translation>
+        <translation>Mandolina octava</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1108"/>
         <location filename="../instruments/instrumentsxml.h" line="1148"/>
         <location filename="../instruments/instrumentsxml.h" line="1153"/>
         <source>pop</source>
-        <translation type="unfinished"/>
+        <translation>pop</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1130"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1135"/>
         <source>Fretless Electric Bass</source>
-        <translation>Bajo Eléctico sin trastes</translation>
+        <translation>Bajo Eléctrico sin trastes</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1166"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1220"/>
         <source>Alto Viol</source>
-        <translation>Viola Alto</translation>
+        <translation>Viola da gamba Alto</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1224"/>
         <location filename="../instruments/instrumentsxml.h" line="1236"/>
         <source>Bary.</source>
         <comment>Baryton</comment>
-        <translation>Barít.</translation>
+        <translation>Barit.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1239"/>
index 5e4d003..d1a6871 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="448"/>
         <source>Piccolo Trumpet in B♭</source>
-        <translation>Piccolo Trompet í B♭</translation>
+        <translation>Pikkolo Trompet í B♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="451"/>
         <source>Piccolo Trumpet in A</source>
-        <translation>Piccolo Trompet í A</translation>
+        <translation>Pikkolo Trompet í A</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="460"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="2"/>
         <source>Pop/Rock</source>
-        <translation type="unfinished"/>
+        <translation>Popp/Rokk</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="3"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="4"/>
         <source>Choral</source>
-        <translation type="unfinished"/>
+        <translation>Kór</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="5"/>
         <source>Orchestra</source>
-        <translation type="unfinished"/>
+        <translation>Orkestur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="6"/>
         <source>Concert Band</source>
-        <translation type="unfinished"/>
+        <translation>Konsert bólkur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="7"/>
         <source>Marching Band</source>
-        <translation type="unfinished"/>
+        <translation>Hornorkestur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="8"/>
         <source>Electronic Music</source>
-        <translation type="unfinished"/>
+        <translation>Elektroniskur tónleikur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="9"/>
         <source>World Music</source>
-        <translation type="unfinished"/>
+        <translation>Verðinstónleikur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="10"/>
         <source>Early Music</source>
-        <translation type="unfinished"/>
+        <translation>Eldri tónleikur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="11"/>
         <source>Classroom</source>
-        <translation type="unfinished"/>
+        <translation>Flokshøli</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="12"/>
         <source>Woodwinds</source>
-        <translation type="unfinished"/>
+        <translation>Træblásarar</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="13"/>
         <source>Winds</source>
-        <translation type="unfinished"/>
+        <translation>Blásarar</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="14"/>
         <source>W.</source>
         <comment>Winds</comment>
-        <translation type="unfinished"/>
+        <translation>B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="16"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="17"/>
         <source>D♭ Piccolo</source>
-        <translation type="unfinished"/>
+        <translation>D♭ Pikkolo</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="18"/>
         <source>D♭ Picc.</source>
         <comment>D♭ Piccolo</comment>
-        <translation type="unfinished"/>
+        <translation>D♭ Pikk.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="20"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="39"/>
         <source>Traverso</source>
-        <translation type="unfinished"/>
+        <translation>Traverso</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="40"/>
         <source>Trv.</source>
         <comment>Traverso</comment>
-        <translation type="unfinished"/>
+        <translation>Trv.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="42"/>
         <location filename="../instruments/instrumentsxml.h" line="52"/>
         <source>F Di.</source>
         <comment>F Dizi</comment>
-        <translation type="unfinished"/>
+        <translation>F Di.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="54"/>
         <location filename="../instruments/instrumentsxml.h" line="128"/>
         <source>Tin Wh.</source>
         <comment>Tin Whistle</comment>
-        <translation type="unfinished"/>
+        <translation>Tin Flt.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="130"/>
         <source>B♭ Tin Wh.</source>
         <comment>B♭ Tin Whistle</comment>
-        <translation type="unfinished"/>
+        <translation>B♭ Tin Flt.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="131"/>
         <source>D Tin Whistle</source>
-        <translation type="unfinished"/>
+        <translation>D Tin Floyta</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="132"/>
         <source>D Tin Wh.</source>
         <comment>D Tin Whistle</comment>
-        <translation type="unfinished"/>
+        <translation>D Tin Flt.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="134"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="151"/>
         <source>Lupophone</source>
-        <translation type="unfinished"/>
+        <translation>Lupofon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="152"/>
         <source>Lph.</source>
         <comment>Lupophone</comment>
-        <translation type="unfinished"/>
+        <translation>Lph.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="154"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="241"/>
         <source>G Clarinet</source>
-        <translation type="unfinished"/>
+        <translation>G Klarinett</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="242"/>
         <source>G Cl.</source>
         <comment>G Clarinet</comment>
-        <translation type="unfinished"/>
+        <translation>G Kl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="244"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="255"/>
         <source>B♭ Bass Clarinet (Bass Clef)</source>
-        <translation type="unfinished"/>
+        <translation>B♭ Bass Klarinett (Bass lykil)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="256"/>
         <source>B♭ B. Cl.</source>
         <comment>B♭ Bass Clarinet (Bass Clef)</comment>
-        <translation type="unfinished"/>
+        <translation>B♭ B. Kl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="257"/>
         <source>A Bass Clarinet</source>
-        <translation type="unfinished"/>
+        <translation>A Bass Klarinett</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="258"/>
         <source>A B. Cl.</source>
         <comment>A Bass Clarinet</comment>
-        <translation type="unfinished"/>
+        <translation>A B. Kl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="259"/>
         <source>A Bass Clarinet (Bass Clef)</source>
-        <translation type="unfinished"/>
+        <translation>A Bass Klarinett (Bass lykil)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="260"/>
         <source>A B. Cl.</source>
         <comment>A Bass Clarinet (Bass Clef)</comment>
-        <translation type="unfinished"/>
+        <translation>A B. Kl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="262"/>
         <location filename="../instruments/instrumentsxml.h" line="512"/>
         <source>Sop.</source>
         <comment>Soprano Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Sop.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="514"/>
         <location filename="../instruments/instrumentsxml.h" line="516"/>
         <source>Bari.</source>
         <comment>Baritone Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Bari.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="518"/>
         <location filename="../instruments/instrumentsxml.h" line="526"/>
         <source>Mello</source>
         <comment>Mellophone Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Mello</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="528"/>
         <source>Contra</source>
         <comment>Contrabass Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>Kontra</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="530"/>
         <source>Mello</source>
         <comment>Mellophone</comment>
-        <translation type="unfinished"/>
+        <translation>Mello</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="532"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="555"/>
         <source>Alto Sackbut</source>
-        <translation type="unfinished"/>
+        <translation>Alt Posaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="556"/>
         <source>A. Sack.</source>
         <comment>Alto Sackbut</comment>
-        <translation type="unfinished"/>
+        <translation>A. Pos.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="557"/>
         <source>Tenor Sackbut</source>
-        <translation type="unfinished"/>
+        <translation>Tenor Posaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="558"/>
         <source>T. Sack.</source>
         <comment>Tenor Sackbut</comment>
-        <translation type="unfinished"/>
+        <translation>T. Pos.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="559"/>
         <source>Bass Sackbut</source>
-        <translation type="unfinished"/>
+        <translation>Bass Posaune</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="560"/>
         <source>B. Sack.</source>
         <comment>Bass Sackbut</comment>
-        <translation type="unfinished"/>
+        <translation>B. Pos.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="562"/>
         <location filename="../instruments/instrumentsxml.h" line="564"/>
         <source>Tbn.</source>
         <comment>Trombone</comment>
-        <translation type="unfinished"/>
+        <translation>Tbn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="567"/>
         <source>S. Tbn.</source>
         <comment>Soprano Trombone</comment>
-        <translation type="unfinished"/>
+        <translation>S. Tbn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="569"/>
         <source>A. Tbn.</source>
         <comment>Alto Trombone</comment>
-        <translation type="unfinished"/>
+        <translation>A. Tbn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="571"/>
         <source>T. Tbn.</source>
         <comment>Tenor Trombone</comment>
-        <translation type="unfinished"/>
+        <translation>T. Tbn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="573"/>
         <source>B. Tbn.</source>
         <comment>Bass Trombone</comment>
-        <translation type="unfinished"/>
+        <translation>B. Tbn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="575"/>
         <source>Cb. Tbn.</source>
         <comment>Contrabass Trombone</comment>
-        <translation type="unfinished"/>
+        <translation>Kb. Tbn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="577"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="609"/>
         <source>B♭ Sousaphone</source>
-        <translation type="unfinished"/>
+        <translation>B♭ Sousafon</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="610"/>
         <source>B♭ Sphn.</source>
         <comment>B♭ Sousaphone</comment>
-        <translation type="unfinished"/>
+        <translation>B♭ Sfn.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="612"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="627"/>
         <source>Percussion - Pitched</source>
-        <translation type="unfinished"/>
+        <translation>Tónaslagverk</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="629"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="630"/>
         <source>Roto-Toms</source>
-        <translation type="unfinished"/>
+        <translation>Roto-tammir</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="631"/>
         <source>Roto</source>
         <comment>Roto-Toms</comment>
-        <translation type="unfinished"/>
+        <translation>Roto</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="633"/>
         <source>Glock.</source>
         <comment>Glockenspiel</comment>
-        <translation type="unfinished"/>
+        <translation>Klokk.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="635"/>
         <location filename="../instruments/instrumentsxml.h" line="639"/>
         <source>Crot.</source>
         <comment>Crotales</comment>
-        <translation type="unfinished"/>
+        <translation>Krot.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="641"/>
         <location filename="../instruments/instrumentsxml.h" line="643"/>
         <source>Almg.</source>
         <comment>Almglocken</comment>
-        <translation type="unfinished"/>
+        <translation>Almg.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="645"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="654"/>
         <source>Chimes</source>
-        <translation type="unfinished"/>
+        <translation>Klokkuspæl</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="655"/>
         <source>Cme.</source>
         <comment>Chimes</comment>
-        <translation type="unfinished"/>
+        <translation>Klsp.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="657"/>
         <location filename="../instruments/instrumentsxml.h" line="673"/>
         <source>Td. Gon.</source>
         <comment>Tuned Gongs</comment>
-        <translation type="unfinished"/>
+        <translation>Td. Gon.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="675"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="694"/>
         <source>Marimba (Grand Staff)</source>
-        <translation type="unfinished"/>
+        <translation>Marimba (2 nótalinjur)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="697"/>
         <source>Marimba (Single Staff)</source>
-        <translation type="unfinished"/>
+        <translation>Marimba (1 nótalinja)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="699"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="700"/>
         <source>Contrabass Marimba</source>
-        <translation type="unfinished"/>
+        <translation>Kontrabass Marimba</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="701"/>
         <source>Cb. Mrm.</source>
         <comment>Contrabass Marimba</comment>
-        <translation type="unfinished"/>
+        <translation>Kb. Mrm.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="703"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="712"/>
         <source>Percussion - Unpitched</source>
-        <translation type="unfinished"/>
+        <translation>Nótaslagverk</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="714"/>
         <source>D. Set</source>
         <comment>Drumset</comment>
-        <translation type="unfinished"/>
+        <translation>T. Sett</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="715"/>
         <source>Concert Snare Drum</source>
-        <translation type="unfinished"/>
+        <translation>Konsert lítla trumma</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="716"/>
         <source>Con. Sn.</source>
         <comment>Concert Snare Drum</comment>
-        <translation type="unfinished"/>
+        <translation>Kon. Lt.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="717"/>
         <source>Concert Bass Drum</source>
-        <translation type="unfinished"/>
+        <translation>Konsert bass trumma</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="718"/>
         <source>Con. BD </source>
         <comment>Concert Bass Drum</comment>
-        <translation type="unfinished"/>
+        <translation>Kon. Bt.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="719"/>
         <source>Piccolo Snare</source>
-        <translation type="unfinished"/>
+        <translation>Pikkolo lítla trumma</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="720"/>
         <source>Picc. Sn.</source>
         <comment>Piccolo Snare</comment>
-        <translation type="unfinished"/>
+        <translation>Pikk. Lt.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="721"/>
         <source>Field Drum</source>
-        <translation type="unfinished"/>
+        <translation>Gangitrumma</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="722"/>
         <source>Field Dr.</source>
         <comment>Field Drum</comment>
-        <translation type="unfinished"/>
+        <translation>G. Tr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="723"/>
         <source>Concert Toms</source>
-        <translation type="unfinished"/>
+        <translation>Konsert tammir</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="724"/>
         <source>C. Toms</source>
         <comment>Concert Toms</comment>
-        <translation type="unfinished"/>
+        <translation>K. Tamm</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="725"/>
         <source>Chinese Tom-Toms</source>
-        <translation type="unfinished"/>
+        <translation>Kinesiskar tammir</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="726"/>
         <source>Ch. Toms</source>
         <comment>Chinese Tom-Toms</comment>
-        <translation type="unfinished"/>
+        <translation>Kin. Tamm</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="728"/>
         <source>Bon.</source>
         <comment>Bongos</comment>
-        <translation type="unfinished"/>
+        <translation>Bon.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="730"/>
         <source>Con.</source>
         <comment>Congas</comment>
-        <translation type="unfinished"/>
+        <translation>Kon.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="732"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="743"/>
         <source>Tam-Tam</source>
-        <translation type="unfinished"/>
+        <translation>Tammir</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="744"/>
         <source>Tam</source>
         <comment>Tam-Tam</comment>
-        <translation type="unfinished"/>
+        <translation>Tamm</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="746"/>
         <location filename="../instruments/instrumentsxml.h" line="752"/>
         <source>Bw. Gon.</source>
         <comment>Bowl Gongs</comment>
-        <translation type="unfinished"/>
+        <translation>Bw. Gon.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="754"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="787"/>
         <source>Güiro</source>
-        <translation type="unfinished"/>
+        <translation>Güiro</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="788"/>
         <location filename="../instruments/instrumentsxml.h" line="792"/>
         <source>Cabs.</source>
         <comment>Cabasa</comment>
-        <translation type="unfinished"/>
+        <translation>Cabs.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="794"/>
         <location filename="../instruments/instrumentsxml.h" line="822"/>
         <source>Perc.</source>
         <comment>Percussion</comment>
-        <translation type="unfinished"/>
+        <translation>Slvk.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="823"/>
         <source>Percussion - Marching</source>
-        <translation type="unfinished"/>
+        <translation>Gonguslagverk</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="825"/>
         <source>S.D.</source>
         <comment>Snare Drum</comment>
-        <translation type="unfinished"/>
+        <translation>S.D.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="827"/>
         <source>T.D.</source>
         <comment>Tenor Drums</comment>
-        <translation type="unfinished"/>
+        <translation>T.D.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="829"/>
         <source>B.D.</source>
         <comment>Bass Drums</comment>
-        <translation type="unfinished"/>
+        <translation>B.D.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="831"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="832"/>
         <source>Percussion - Body</source>
-        <translation type="unfinished"/>
+        <translation>Slagverk - á kroppi</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="834"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="862"/>
         <source>Women</source>
-        <translation type="unfinished"/>
+        <translation>Kvinnur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="863"/>
         <source>W.</source>
         <comment>Women</comment>
-        <translation type="unfinished"/>
+        <translation>B.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="864"/>
         <source>Men</source>
-        <translation type="unfinished"/>
+        <translation>Menn</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="865"/>
         <source>M.</source>
         <comment>Men</comment>
-        <translation type="unfinished"/>
+        <translation>M.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="867"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="906"/>
         <source>Electronic</source>
-        <translation type="unfinished"/>
+        <translation>Elektronisk</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="908"/>
         <location filename="../instruments/instrumentsxml.h" line="1244"/>
         <source>D Vne.</source>
         <comment>D Violone</comment>
-        <translation type="unfinished"/>
+        <translation>D Vne.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="967"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1146"/>
         <source>5-str. Electric Bass (High C/Tenor)</source>
-        <translation type="unfinished"/>
+        <translation>5-str. Electriskur Bassur (Høgt C/Tenor)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1149"/>
         <source>5-str. Electric Bass (High C/Tenor) [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>5-str. Elektriskur Bassur (Høgt C/Tenor) [Tablatur]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1150"/>
         <source>6-str. Electric Bass</source>
-        <translation type="unfinished"/>
+        <translation>6-str. Elektriskur Bassur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1151"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1154"/>
         <source>6-str. Electric Bass [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>6-str. Elektriskur Bassur [Tablatur]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1155"/>
         <source>Prim</source>
-        <translation type="unfinished"/>
+        <translation>Primur</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1156"/>
         <source>Pr.</source>
         <comment>Prim</comment>
-        <translation type="unfinished"/>
+        <translation>Pr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1157"/>
         <source>Brač</source>
-        <translation type="unfinished"/>
+        <translation>Brač</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1158"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1159"/>
         <source>Čelo</source>
-        <translation type="unfinished"/>
+        <translation>Čelo</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1160"/>
         <source>Č.</source>
         <comment>Čelo</comment>
-        <translation type="unfinished"/>
+        <translation>Č.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1161"/>
         <source>Bugarija</source>
-        <translation type="unfinished"/>
+        <translation>Bugarija</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1162"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1163"/>
         <source>Berda</source>
-        <translation type="unfinished"/>
+        <translation>Berda</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1164"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1165"/>
         <source>Strings - Bowed</source>
-        <translation type="unfinished"/>
+        <translation>Strúkarar - við boga</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1167"/>
         <source>St.</source>
         <comment>Strings</comment>
-        <translation type="unfinished"/>
+        <translation>St.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1168"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1174"/>
         <source>Nyckelharpa</source>
-        <translation type="unfinished"/>
+        <translation>Nyckelharpa</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1175"/>
         <source>Nyh.</source>
         <comment>Nyckelharpa</comment>
-        <translation type="unfinished"/>
+        <translation>Nyh.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1179"/>
         <location filename="../instruments/instrumentsxml.h" line="1195"/>
         <source>Vc.</source>
         <comment>Violoncello</comment>
-        <translation type="unfinished"/>
+        <translation>S.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1198"/>
         <location filename="../instruments/instrumentsxml.h" line="1199"/>
         <source>Vcs.</source>
         <comment>Violoncellos</comment>
-        <translation type="unfinished"/>
+        <translation>Sr.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1203"/>
         <location filename="../instruments/instrumentsxml.h" line="1217"/>
         <source>Tr. Vl.</source>
         <comment>Treble Viol</comment>
-        <translation type="unfinished"/>
+        <translation>Tr. Vl.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1221"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="985"/>
         <source>Strings - Plucked</source>
-        <translation type="unfinished"/>
+        <translation>Strúkarar - kliktir</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="987"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="991"/>
         <source>Irish Tenor Banjo</source>
-        <translation type="unfinished"/>
+        <translation>Írsk Tenor Banjo</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="992"/>
         <source>ITB</source>
         <comment>Irish Tenor Banjo</comment>
-        <translation type="unfinished"/>
+        <translation>ITB</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="993"/>
         <source>Irish Tenor Banjo [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>Írsk Tenor Banjo [Tablatur]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="995"/>
         <location filename="../instruments/instrumentsxml.h" line="1027"/>
         <location filename="../instruments/instrumentsxml.h" line="1043"/>
         <source>Guitar</source>
-        <translation type="unfinished"/>
+        <translation>Guitar</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1028"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1029"/>
         <source>Guitar (Treble Clef)</source>
-        <translation type="unfinished"/>
+        <translation>Guitar (G lykil)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1031"/>
         <source>7-string Guitar</source>
-        <translation type="unfinished"/>
+        <translation>7-streingjaður Guitar</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1032"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1033"/>
         <source>7-string Guitar [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>7-streingjaður Guitar [Tablatur]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1034"/>
         <source>Cavaquinho</source>
-        <translation type="unfinished"/>
+        <translation>Kavaquinho</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1035"/>
         <source>Cava.</source>
         <comment>Cavaquinho</comment>
-        <translation type="unfinished"/>
+        <translation>Kava.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1036"/>
         <source>Cavaquinho [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>Kavaquinho [Tablatur]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1037"/>
         <source>Baritone Guitar</source>
-        <translation type="unfinished"/>
+        <translation>Baritone Guitar</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1038"/>
         <source>Bar. Guit.</source>
         <comment>Baritone Guitar</comment>
-        <translation type="unfinished"/>
+        <translation>Bar. Guit.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1039"/>
         <source>Contra Guitar</source>
-        <translation type="unfinished"/>
+        <translation>Kontra Guitar</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1040"/>
         <source>C. Guit.</source>
         <comment>Contra Guitar</comment>
-        <translation type="unfinished"/>
+        <translation>K. Guit.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1042"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1045"/>
         <source>Acoustic Guitar (Treble Clef)</source>
-        <translation type="unfinished"/>
+        <translation>Akkustiskur Guitar (G lykil)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1048"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1057"/>
         <source>Electric Guitar (Treble Clef)</source>
-        <translation type="unfinished"/>
+        <translation>Elektriskur gittari (G lykil)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1060"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1062"/>
         <source>flageoletti</source>
-        <translation type="unfinished"/>
+        <translation>flageoletti</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1064"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1065"/>
         <source>Oud</source>
-        <translation type="unfinished"/>
+        <translation>Oud</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1066"/>
         <source>O.</source>
         <comment>Oud</comment>
-        <translation type="unfinished"/>
+        <translation>O.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1068"/>
         <location filename="../instruments/instrumentsxml.h" line="1101"/>
         <source>A. Mda.</source>
         <comment>Alto Mandola</comment>
-        <translation type="unfinished"/>
+        <translation>A. Mda.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1102"/>
         <location filename="../instruments/instrumentsxml.h" line="1103"/>
         <source>T. Mda.</source>
         <comment>Tenor Mandola</comment>
-        <translation type="unfinished"/>
+        <translation>T. Mda.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1104"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1115"/>
         <source>Ukulele (Low G)</source>
-        <translation type="unfinished"/>
+        <translation>Ukulele (Lágt G)</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1116"/>
         <location filename="../instruments/instrumentsxml.h" line="1147"/>
         <location filename="../instruments/instrumentsxml.h" line="1152"/>
         <source>slap</source>
-        <translation type="unfinished"/>
+        <translation>slag</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1129"/>
         <location filename="../instruments/instrumentsxml.h" line="1148"/>
         <location filename="../instruments/instrumentsxml.h" line="1153"/>
         <source>pop</source>
-        <translation type="unfinished"/>
+        <translation>pop</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1130"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1235"/>
         <source>Baryton</source>
-        <translation type="unfinished"/>
+        <translation>Bariton</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1236"/>
         <source>Bary.</source>
         <comment>Baryton</comment>
-        <translation type="unfinished"/>
+        <translation>Bari.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1239"/>
index 0aefe36..94a8c51 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="478"/>
         <source>Slide Trumpet</source>
-        <translation type="unfinished"/>
+        <translation>חצוצרת הזזה</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="481"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="801"/>
         <source>Ratchet</source>
-        <translation type="unfinished"/>
+        <translation>רעשן</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="803"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1"/>
         <source>Common</source>
-        <translation type="unfinished"/>
+        <translation>נפוצים</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="2"/>
         <source>Pop/Rock</source>
-        <translation type="unfinished"/>
+        <translation>פופ/רוק</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="3"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="4"/>
         <source>Choral</source>
-        <translation type="unfinished"/>
+        <translation>ווקאלי</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="5"/>
         <source>Orchestra</source>
-        <translation type="unfinished"/>
+        <translation>תזמורת</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="6"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="12"/>
         <source>Woodwinds</source>
-        <translation type="unfinished"/>
+        <translation>כלי נשיפה מעץ</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="13"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="823"/>
         <source>Percussion - Marching</source>
-        <translation type="unfinished"/>
+        <translation>כלי הקשה- מצעד</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="825"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="832"/>
         <source>Percussion - Body</source>
-        <translation type="unfinished"/>
+        <translation>כלי הקשה- גוף</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="834"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="862"/>
         <source>Women</source>
-        <translation type="unfinished"/>
+        <translation>נשים</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="863"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="864"/>
         <source>Men</source>
-        <translation type="unfinished"/>
+        <translation>גברים</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="865"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="906"/>
         <source>Electronic</source>
-        <translation type="unfinished"/>
+        <translation>אלקטרוני</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="908"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="985"/>
         <source>Strings - Plucked</source>
-        <translation type="unfinished"/>
+        <translation>כלי פריטה</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="987"/>
index 470322a..e957d2f 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="307"/>
         <source>Saxophone</source>
-        <translation>ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="309"/>
         <source>Sopranissimo Saxophone</source>
-        <translation>ã\82½ã\83\97ã\83©ã\83\8bã\83\83ã\82·ã\83¢ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82½ã\83\97ã\83©ã\83\8bã\83\83ã\82·ã\83¢ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="311"/>
         <source>Sopranino Saxophone</source>
-        <translation>ã\82½ã\83\97ã\83©ã\83\8bã\83¼ã\83\8e ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82½ã\83\97ã\83©ã\83\8bã\83¼ã\83\8e ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="313"/>
         <source>Soprano Saxophone</source>
-        <translation>ã\82½ã\83\97ã\83©ã\83\8e ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82½ã\83\97ã\83©ã\83\8e ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="315"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="317"/>
         <source>Mezzo-Soprano Saxophone</source>
-        <translation>ã\83¡ã\82¾ã\82½ã\83\97ã\83©ã\83\8e ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\83¡ã\82¾ã\82½ã\83\97ã\83©ã\83\8e ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="319"/>
         <source>Alto Saxophone</source>
-        <translation>ã\82¢ã\83«ã\83\88 ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82¢ã\83«ã\83\88 ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="321"/>
         <source>Melody Saxophone</source>
-        <translation>ã\83¡ã\83­ã\83\87ã\82£ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\83¡ã\83­ã\83\87ã\82£ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="323"/>
         <source>Tenor Saxophone</source>
-        <translation>ã\83\86ã\83\8aã\83¼ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\83\86ã\83\8aã\83¼ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="325"/>
         <source>Baritone Saxophone</source>
-        <translation>ã\83\90ã\83ªã\83\88ã\83³ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\83\90ã\83ªã\83\88ã\83³ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="327"/>
         <source>Bass Saxophone</source>
-        <translation>ã\83\90ã\82¹ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\83\90ã\82¹ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="329"/>
         <source>Contrabass Saxophone</source>
-        <translation>ã\82³ã\83³ã\83\88ã\83©ã\83\90ã\82¹ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82³ã\83³ã\83\88ã\83©ã\83\90ã\82¹ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="331"/>
         <source>Subcontrabass Saxophone</source>
-        <translation>ã\82µã\83\96ã\82³ã\83³ã\83\88ã\83©ã\83\90ã\82¹ ã\82µã\83\83ã\82¯ã\82¹</translation>
+        <translation>ã\82µã\83\96ã\82³ã\83³ã\83\88ã\83©ã\83\90ã\82¹ ã\82µã\82¯ã\82½ã\83\95ã\82©ã\83¼ã\83³</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="333"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="335"/>
         <source>Free Reed</source>
-        <translation>フリー リード</translation>
+        <translation>フリーリード</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="336"/>
         <location filename="../instruments/instrumentsxml.h" line="388"/>
         <location filename="../instruments/instrumentsxml.h" line="389"/>
         <source>Brass</source>
-        <translation>ブラス</translation>
+        <translation>金管楽器</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="391"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="13"/>
         <source>Winds</source>
-        <translation>管楽器</translation>
+        <translation>管楽器</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="14"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="971"/>
         <source>synth-bass-1</source>
-        <translation>ã\82·ã\83³ã\82»ã\83\99ã\83¼ã\82¹-1</translation>
+        <translation>ã\83\99ã\83¼ã\82¹ã\82·ã\83³ã\82»1</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="972"/>
         <source>synth-bass-2</source>
-        <translation>ã\82·ã\83³ã\82»ã\83\99ã\83¼ã\82¹-2</translation>
+        <translation>ã\83\99ã\83¼ã\82¹ã\82·ã\83³ã\82»2</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="973"/>
         <source>Brass Synthesizer</source>
-        <translation>ã\82·ã\83³ã\82»ã\83\96ã\83©ã\82¹</translation>
+        <translation>ã\83\96ã\83©ã\82¹ ã\82·ã\83³ã\82»ã\82µã\82¤ã\82¶ã\83¼</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="974"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="975"/>
         <source>synth-brass-1</source>
-        <translation>ã\82·ã\83³ã\82»ã\83\96ã\83©ã\82¹-1</translation>
+        <translation>ã\83\96ã\83©ã\82¹ã\82·ã\83³ã\82»1</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="976"/>
         <source>synth-brass-2</source>
-        <translation>ã\82·ã\83³ã\82»ã\83\96ã\83©ã\82¹-2</translation>
+        <translation>ã\83\96ã\83©ã\82¹ã\82·ã\83³ã\82»2</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="977"/>
         <source>String Synthesizer</source>
-        <translation>ã\82·ã\83³ã\82»ã\82¹ã\83\88ã\83ªã\83³ã\82°ã\82¹</translation>
+        <translation>ã\82¹ã\83\88ã\83ªã\83³ã\82° ã\82·ã\83³ã\82»ã\82µã\82¤ã\82¶ã\83¼</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="978"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="979"/>
         <source>synth-string-1</source>
-        <translation>ã\82·ã\83³ã\82»ã\82¹ã\83\88ã\83ªã\83³ã\82°ã\82¹-1</translation>
+        <translation>ã\82¹ã\83\88ã\83ªã\83³ã\82°ã\82·ã\83³ã\82»1</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="980"/>
         <source>synth-string-2</source>
-        <translation>ã\82·ã\83³ã\82»ã\82¹ã\83\88ã\83ªã\83³ã\82°ã\82¹-2</translation>
+        <translation>ã\82¹ã\83\88ã\83ªã\83³ã\82°ã\82¹ã\82·ã\83³ã\82»2</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="981"/>
index 8975589..4ed7a81 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1031"/>
         <source>7-string Guitar</source>
-        <translation type="unfinished"/>
+        <translation>7현 기타</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1032"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1033"/>
         <source>7-string Guitar [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>7현 기타 [타브 악보]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1034"/>
         <source>Cavaquinho</source>
-        <translation type="unfinished"/>
+        <translation>카바킨호</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1035"/>
         <source>Cava.</source>
         <comment>Cavaquinho</comment>
-        <translation type="unfinished"/>
+        <translation>Cava.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1036"/>
         <source>Cavaquinho [Tablature]</source>
-        <translation type="unfinished"/>
+        <translation>카바킨호 [타브 악보]</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1037"/>
index 2ed0651..5bf2109 100644 (file)
@@ -9939,7 +9939,7 @@ Kies asseblief &apos;n maat en probeer weer</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1358"/>
         <source>Check for &amp;Update</source>
-        <translation>Kyk vir nuwe &amp;weergawe</translation>
+        <translation>Soek vir &amp;bywerking</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1363"/>
@@ -11801,18 +11801,18 @@ kies asseblief &apos;n ander naam:</translation>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="99"/>
         <source>An update for MuseScore is available: %1MuseScore %2 r.%3%4</source>
-        <translation>&apos;n Nuwe weergawe van MuseScore is beskikbaar: %1MuseScore %2 r.%3%4</translation>
+        <translation>&apos;n MuseScore-bywerking is beskikbaar: %1MuseScore %2 r.%3%4</translation>
     </message>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="107"/>
         <source>Update Available</source>
-        <translation>Nuwe weergawe beskikbaar</translation>
+        <translation>Bywerking beskikbaar</translation>
     </message>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="114"/>
         <location filename="../../mscore/updatechecker.cpp" line="115"/>
         <source>No Update Available</source>
-        <translation>Geen nuwe weergawe beskikbaar</translation>
+        <translation>Geen bywerking beskikbaar</translation>
     </message>
 </context>
 <context>
index 0b54728..ca305c4 100644 (file)
@@ -10983,7 +10983,7 @@ Save before closing?</source>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="204"/>
         <source>%1 kB</source>
-        <translation type="unfinished"/>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="263"/>
index f561929..160df16 100644 (file)
     <message>
         <location filename="../../mscore/albummanager.ui" line="181"/>
         <source>Store relative paths</source>
-        <translation type="unfinished"/>
+        <translation>Gem relativ sti</translation>
     </message>
     <message>
         <location filename="../../mscore/albummanager.ui" line="197"/>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="108"/>
         <source>Enter a name to enable pitch editing</source>
-        <translation type="unfinished"/>
+        <translation>Indsæt et navn, for at kunne redigere tonehøjde</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="176"/>
         <source>Noteheads group:</source>
-        <translation type="unfinished"/>
+        <translation>Gruppe af nodehoveder:</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="186"/>
         <source>Edit noteheads</source>
-        <translation type="unfinished"/>
+        <translation>Rediger nodehoveder</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="218"/>
@@ -8637,12 +8637,12 @@ fejlede:</translation>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="227"/>
         <source>Extension Updates Available</source>
-        <translation type="unfinished"/>
+        <translation>Opdatering af udvidelser til rådighed</translation>
     </message>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="228"/>
         <source>One or more installed extensions have updates available in Help / Resource Manager...</source>
-        <translation type="unfinished"/>
+        <translation>En eller flere af de installerede udvidelser har opdateringer tilgængelige i Hjælp/Resursehåndtering</translation>
     </message>
 </context>
 <context>
@@ -9951,7 +9951,7 @@ Vælg en takt og prøv igen</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1346"/>
         <source>About &amp;Qt...</source>
-        <translation>Om &amp;Qt</translation>
+        <translation>Om &amp;Qt...</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1351"/>
@@ -10978,7 +10978,7 @@ Gem før lukning?</translation>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="115"/>
         <source>Uninstall</source>
-        <translation type="unfinished"/>
+        <translation>Afinstaller</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="204"/>
@@ -11007,13 +11007,14 @@ Gem før lukning?</translation>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="337"/>
         <source>Unable to save the extension file on disk</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelsesfilen kan ikke gemmes på disk</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="339"/>
         <source>Unable to download, save and verify the package.
 Check your internet connection.</source>
-        <translation type="unfinished"/>
+        <translation>Det er ikke muligt at hente, gemme og verificere pakken.
+Check din internetforbindelse.</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="133"/>
@@ -13331,7 +13332,7 @@ Dette vil gen-evaluere alle tilføjelser, og opsamle eventuelle ændringer, som
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="594"/>
         <source>Opens a folder dialog for selecting the extensions folder</source>
-        <translation type="unfinished"/>
+        <translation>Åbner en dialog, til at udvælge en folder til udvidelsen</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="614"/>
@@ -13563,19 +13564,19 @@ Dette vil gen-evaluere alle tilføjelser, og opsamle eventuelle ændringer, som
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1185"/>
         <source>Limit the scroll area to the edges of the score</source>
-        <translation type="unfinished"/>
+        <translation>Begræns rullleområdet til kanterne af nodearket</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1188"/>
         <location filename="../../mscore/prefsdialog.ui" line="1194"/>
         <source>If this is checked, scrolling will stop at the edge of the score.</source>
-        <translation type="unfinished"/>
+        <translation>Hvis denne er markeret, vil rulning stoppe ved kanten af nodearket</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1191"/>
         <location filename="../../mscore/prefsdialog.ui" line="1197"/>
         <source>Limit scroll area to page borders</source>
-        <translation type="unfinished"/>
+        <translation>Begræns rulleområdet til kanterne af papiret</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1223"/>
@@ -14691,7 +14692,7 @@ Justering af forsinkelsen kan gøre det lettere at synkronisere MIDI udstyr med
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="4204"/>
         <source>Check for new version of MuseScore extensions</source>
-        <translation type="unfinished"/>
+        <translation>Se efter nye udgaver at MuseScore udvidelser</translation>
     </message>
 </context>
 <context>
@@ -14982,12 +14983,12 @@ fejlede: %2</translation>
     <message>
         <location filename="../../libmscore/stafftype.cpp" line="1371"/>
         <source>Tab. 7-str. common</source>
-        <translation type="unfinished"/>
+        <translation>Tab. 7-str. normal</translation>
     </message>
     <message>
         <location filename="../../libmscore/stafftype.cpp" line="1372"/>
         <source>Tab. 8-str. common</source>
-        <translation type="unfinished"/>
+        <translation>Tab. 8-str. normal</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="167"/>
@@ -15247,32 +15248,32 @@ Vil du overskrive?</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="405"/>
         <source>Cannot import extension on read-only storage: %1</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelse kan ikke importeres til read-only lager: %1</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="410"/>
         <source>Cannot import extension: storage %1 is full</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelse kan ikke importeres: lager %1 er fyldt</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="440"/>
         <source>Corrupted extension: no metadata.json</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelse korrupt: mangler metadata.json</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="445"/>
         <source>Corrupted extension: unsupported directories in root directory</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelse korrupt: ikke supporterede foldere i rod-folderen</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="450"/>
         <source>Corrupted extension: unsupported files in root directory</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelse korrupt: ikke suporterede filer i folderen</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="465"/>
         <source>Corrupted extension: corrupted metadata.json</source>
-        <translation type="unfinished"/>
+        <translation>Udvidelse korrupt: fejl i metadata.json</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="484"/>
@@ -15282,7 +15283,7 @@ Vil du overskrive?</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="495"/>
         <source>Error while deleting previous version of the extension: %1</source>
-        <translation type="unfinished"/>
+        <translation>Fejl ved sletning af forrige version af udvidelsen: %1</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="529"/>
@@ -15349,7 +15350,7 @@ Vil du overskrive?</translation>
     <message>
         <location filename="../../mscore/resourceManager.ui" line="80"/>
         <source>Uninstall</source>
-        <translation type="unfinished"/>
+        <translation>Afinstaller</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.ui" line="101"/>
@@ -17106,7 +17107,7 @@ Vil du overskrive?</translation>
     <message>
         <location filename="../../libmscore/tremolo.cpp" line="34"/>
         <source>Buzz roll</source>
-        <translation type="unfinished"/>
+        <translation>Buzz roll</translation>
     </message>
     <message>
         <location filename="../../libmscore/tremolo.cpp" line="35"/>
@@ -19688,22 +19689,22 @@ fejlede:</translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1781"/>
         <source>Toggle &apos;Selection Filter&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Slå &apos;Afgrænsningsfilter&apos; til/fra</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1826"/>
         <source>Toggle &apos;File Operations&apos; toolbar</source>
-        <translation type="unfinished"/>
+        <translation>Slå værktøjslinjen &apos;Fil håndtering&apos; til/fra</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1854"/>
         <source>Toggle &apos;Note Input&apos; toolbar</source>
-        <translation type="unfinished"/>
+        <translation>Slå værktøjslinjen &apos;Nodeindtastning&apos; til/fra</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2083"/>
         <source>Pan score automatically</source>
-        <translation type="unfinished"/>
+        <translation>Panorer nodearket automatisk</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1790"/>
index d9270f8..7eba56d 100644 (file)
@@ -16812,7 +16812,7 @@ Soll sie überschrieben werden?</translation>
     <message>
         <location filename="../../mscore/transposedialog.ui" line="72"/>
         <source>A♭ major / F minor</source>
-        <translation>As-Dur / fiMoll</translation>
+        <translation>As-Dur / f-Moll</translation>
     </message>
     <message>
         <location filename="../../mscore/transposedialog.ui" line="77"/>
index 0d0c5a5..909d3c9 100644 (file)
     <message>
         <location filename="../../mscore/albummanager.ui" line="181"/>
         <source>Store relative paths</source>
-        <translation type="unfinished"/>
+        <translation>Guardar rutas relativas</translation>
     </message>
     <message>
         <location filename="../../mscore/albummanager.ui" line="197"/>
@@ -8636,12 +8636,12 @@ falló:</translation>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="227"/>
         <source>Extension Updates Available</source>
-        <translation type="unfinished"/>
+        <translation>Hay disponibles actualizaciones de las extensiones </translation>
     </message>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="228"/>
         <source>One or more installed extensions have updates available in Help / Resource Manager...</source>
-        <translation type="unfinished"/>
+        <translation>Una o más de las extensiones instaladas tiene actualizaciones disponibles en Ayuda / Administrador de Recursos</translation>
     </message>
 </context>
 <context>
@@ -14985,12 +14985,12 @@ fallida: %2</translation>
     <message>
         <location filename="../../libmscore/stafftype.cpp" line="1371"/>
         <source>Tab. 7-str. common</source>
-        <translation type="unfinished"/>
+        <translation>Tab. 7 cuerdas común</translation>
     </message>
     <message>
         <location filename="../../libmscore/stafftype.cpp" line="1372"/>
         <source>Tab. 8-str. common</source>
-        <translation type="unfinished"/>
+        <translation>Tab. 8 cuerdas común</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="167"/>
@@ -15252,12 +15252,12 @@ Do you want to overwrite it?</source>
     <message>
         <location filename="../../mscore/musescore.cpp" line="405"/>
         <source>Cannot import extension on read-only storage: %1</source>
-        <translation type="unfinished"/>
+        <translation>No se puede importar extensión en un dispositivo de almacenamiento de sólo lectura: %1</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="410"/>
         <source>Cannot import extension: storage %1 is full</source>
-        <translation type="unfinished"/>
+        <translation>No se puede importar extensión: el dispositivo de almacenamiento %1 está lleno</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="440"/>
@@ -15267,17 +15267,17 @@ Do you want to overwrite it?</source>
     <message>
         <location filename="../../mscore/musescore.cpp" line="445"/>
         <source>Corrupted extension: unsupported directories in root directory</source>
-        <translation type="unfinished"/>
+        <translation>Extensión corrupta: Directorios no admitidos en el directorio raíz</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="450"/>
         <source>Corrupted extension: unsupported files in root directory</source>
-        <translation type="unfinished"/>
+        <translation>Extensión corrupta: archivos no admitidos en el directorio raíz</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="465"/>
         <source>Corrupted extension: corrupted metadata.json</source>
-        <translation type="unfinished"/>
+        <translation>Extensión corrupta: metadata.json está corrupto</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="484"/>
@@ -16158,7 +16158,7 @@ Do you want to overwrite it?</source>
     <message>
         <location filename="../../mscore/textproperties.ui" line="522"/>
         <source>Offset is absolute</source>
-        <translation>Desplazamiento es absoluto</translation>
+        <translation>El desplazamiento es absoluto</translation>
     </message>
     <message>
         <location filename="../../mscore/textproperties.ui" line="525"/>
@@ -17111,7 +17111,7 @@ Do you want to overwrite it?</source>
     <message>
         <location filename="../../libmscore/tremolo.cpp" line="34"/>
         <source>Buzz roll</source>
-        <translation type="unfinished"/>
+        <translation>Trémolo de Caja Clara</translation>
     </message>
     <message>
         <location filename="../../libmscore/tremolo.cpp" line="35"/>
@@ -19693,22 +19693,22 @@ falló:</translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1781"/>
         <source>Toggle &apos;Selection Filter&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Alternar &quot;Filtro de Selección&quot;</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1826"/>
         <source>Toggle &apos;File Operations&apos; toolbar</source>
-        <translation type="unfinished"/>
+        <translation>Alternar la barra de herramientas &quot;Operaciones con archivos&quot; </translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1854"/>
         <source>Toggle &apos;Note Input&apos; toolbar</source>
-        <translation type="unfinished"/>
+        <translation>Alternar la barra de herramientas &quot;Introducción de notas&quot;</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2083"/>
         <source>Pan score automatically</source>
-        <translation type="unfinished"/>
+        <translation>Panear la  partitura automáticamente</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1790"/>
@@ -21859,22 +21859,22 @@ El compás no está vacio</translation>
     <message>
         <location filename="../../libmscore/articulation.cpp" line="209"/>
         <source>Lute thumb fing.</source>
-        <translation>Laúd pulgar dig.</translation>
+        <translation>Laúd dig. pulgar</translation>
     </message>
     <message>
         <location filename="../../libmscore/articulation.cpp" line="213"/>
         <source>Lute 1 fing.</source>
-        <translation>Laúd 1 dig.</translation>
+        <translation>Laúd díg. 1 </translation>
     </message>
     <message>