musescore_2.3.1+dfsg1.orig.tar.xz 2.3.1+dfsg1
authormirabilos <tg@debian.org>
Sat, 7 Jul 2018 21:49:56 +0000 (23:49 +0200)
committermirabilos <mirabilos@evolvis.org>
Sat, 7 Jul 2018 21:49:56 +0000 (23:49 +0200)
31 files changed:
CMakeLists.txt
Makefile
Makefile.mingw
Makefile.osx
build/Packaging.cmake
build/package_mac
libmscore/instrtemplate.cpp
libmscore/instrument.cpp
libmscore/layout.cpp
mscore/data/splash.png
mscore/musescore.cpp
mscore/resourceManager.cpp
mscore/revision.h
share/locale/instruments_cs.ts
share/locale/instruments_gd.ts
share/locale/instruments_ja.ts
share/locale/instruments_nl.ts
share/locale/mscore_fa.ts
share/locale/mscore_fo.ts
share/locale/mscore_fr.ts
share/locale/mscore_gd.ts
share/locale/mscore_ja.ts
share/locale/mscore_nl.ts
share/locale/mscore_pt_BR.ts
share/locale/mscore_zh_CN.ts
vtest/chord-layout-17-ref.png [new file with mode: 0644]
vtest/chord-layout-17.mscz [new file with mode: 0644]
vtest/gen
vtest/gen.bat
zerberus/zerberus.cpp
zerberus/zerberus.h

index c8e1e94..021863b 100644 (file)
@@ -82,7 +82,7 @@ include (CreatePrecompiledHeader)
 
 set (CMAKE_AUTOMOC TRUE)
 
-set(MSCORE_UNSTABLE  FALSE)          # mark as unstable
+set(MSCORE_UNSTABLE FALSE)          # mark as unstable
 
 set(USE_SSE           TRUE)
 set(SCRIPT_INTERFACE  TRUE)
@@ -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  "0")
+SET(MUSESCORE_VERSION_PATCH  "1")
 SET(MUSESCORE_VERSION       "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
 SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
 #
index 0de4449..f69cd03 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
+VERSION = 2.3.1
 
 # Override SUFFIX and LABEL when multiple versions are installed to avoid conflicts.
 SUFFIX=""# E.g.: SUFFIX="dev" --> "mscore" becomes "mscoredev"
index 80f85df..215e2ce 100644 (file)
@@ -21,7 +21,7 @@
 
 REVISION  = $(shell type mscore\revision.h)
 #VERSION   = 2.3b-${REVISION}
-VERSION = 2.3
+VERSION = 2.3.1
 CPUS = %NUMBER_OF_PROCESSORS%
 BUILD_FOR_WINSTORE="OFF"     # Override with "ON" to enable.
 
index 4e111f7..9c7f544 100644 (file)
@@ -20,7 +20,7 @@
 
 REVISION  = `cat mscore/revision.h`
 #VERSION   = "2.3b-${REVISION}"
-VERSION = 2.3
+VERSION = 2.3.1
 PREFIX=../applebuild
 
 XCODEPROJ = mscore.xcodeproj
index a8beafe..8bc4433 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 "688E76DF-EA1E-4CFA-AE73-F57B3A174F01")
+  SET(CPACK_WIX_PRODUCT_GUID "6088F9C1-491A-431F-94D1-81FA26AF7620")
   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 87c6571..a9e2f7e 100755 (executable)
@@ -11,7 +11,7 @@ then
 else
     LONG_NAME=MuseScore
     LONGER_NAME="MuseScore 2"
-    VERSION=2.3
+    VERSION=2.3.1
 fi
 
 WORKING_DIRECTORY=applebuild
index 2f7cb25..eb52dab 100644 (file)
@@ -526,7 +526,7 @@ void InstrumentTemplate::read(XmlReader& e)
             channel.append(a);
             }
       if (useDrumset) {
-            if (channel[0].bank == 0 && channel[0].name != "Zerberus")
+            if (channel[0].bank == 0 && channel[0].synti.toLower() != "zerberus")
                   channel[0].bank = 128;
             channel[0].updateInitList();
             }
index 49af2fd..f5b03d7 100644 (file)
@@ -382,7 +382,7 @@ void Instrument::read(XmlReader& e)
             _channel.append(a);
             }
       if (_useDrumset) {
-            if (_channel[0]->bank == 0 && _channel[0]->name != "Zerberus")
+            if (_channel[0]->bank == 0 && _channel[0]->synti.toLower() != "zerberus")
                   _channel[0]->bank = 128;
             _channel[0]->updateInitList();
             }
@@ -552,7 +552,7 @@ void Channel::read(XmlReader& e)
             else
                   e.unknown();
             }
-      if (128 == bank && "Zerberus" == synti)
+      if (128 == bank && "zerberus" == synti.toLower())
             bank = 0;
 
       updateInitList();
index e59b5e7..dec8063 100644 (file)
@@ -870,14 +870,13 @@ void Score::layoutChords3(QList<Note*>& notes, Staff* staff, Segment* segment)
             //if (chord->stem())
             //      chord->stem()->rxpos() = _up ? x + hw - stemWidth5 : x + stemWidth5;
 
-            qreal xx = x + chord->stemPosX() + chord->pos().x();
+            qreal xx = x + note->headBodyWidth() + chord->pos().x();
 
             if (chord->dots()) {
                   if (chord->up())
                         upDotPosX = qMax(upDotPosX, xx);
                   else {
-                        qreal noteheadShift = note->headBodyWidth();
-                        downDotPosX = qMax(downDotPosX, xx + noteheadShift);
+                        downDotPosX = qMax(downDotPosX, xx);
                         }
 
                   MScore::Direction dotPosition = note->userDotPosition();
index e30f269..05bb7aa 100644 (file)
Binary files a/mscore/data/splash.png and b/mscore/data/splash.png differ
index 94bfadd..b4744e0 100644 (file)
@@ -4136,6 +4136,7 @@ void MuseScore::splitWindow(bool horizontal)
             if (_horizontalSplit == horizontal) {
                   _splitScreen = false;
                   tab2->setVisible(false);
+                  setCurrentView(0, tab1->currentIndex());
                   }
             else {
                   _horizontalSplit = horizontal;
index a81d20b..fdeaa9d 100644 (file)
@@ -318,7 +318,7 @@ void ResourceManager::downloadExtension()
       QString baseAddress = baseAddr() + data;
       DownloadUtils dl(this);
       dl.setTarget(baseAddress);
-      QString localPath = QDir::tempPath() + data.split('/')[1];
+      QString localPath = QDir::tempPath() + QDir::separator() + data.split('/')[1];
       QFile::remove(localPath);
       dl.setLocalFile(localPath);
       dl.download(true);
index 7577b51..58026d7 100644 (file)
@@ -1 +1 @@
-68275c4
+0899e9d
index b179186..c0c5587 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="4"/>
         <source>Choral</source>
-        <translation>Sbory</translation>
+        <translation>Sbor</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="5"/>
         <location filename="../instruments/instrumentsxml.h" line="390"/>
         <source>Br.</source>
         <comment>Brass</comment>
-        <translation>Žesť.</translation>
+        <translation>Žes.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="392"/>
         <location filename="../instruments/instrumentsxml.h" line="526"/>
         <source>Mello</source>
         <comment>Mellophone Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>M. lov. r.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="528"/>
         <source>Contra</source>
         <comment>Contrabass Bugle</comment>
-        <translation type="unfinished"/>
+        <translation>K. lov. r.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="530"/>
         <source>Mello</source>
         <comment>Mellophone</comment>
-        <translation type="unfinished"/>
+        <translation>Mel.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="532"/>
         <location filename="../instruments/instrumentsxml.h" line="1244"/>
         <source>D Vne.</source>
         <comment>D Violone</comment>
-        <translation type="unfinished"/>
+        <translation>D Vln.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="967"/>
     <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"/>
         <location filename="../instruments/instrumentsxml.h" line="1158"/>
         <source>Br.</source>
         <comment>Brač</comment>
-        <translation>Žesť.</translation>
+        <translation>Br.</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1159"/>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1065"/>
         <source>Oud</source>
-        <translation type="unfinished"/>
+        <translation>Úd</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="1066"/>
         <source>O.</source>
         <comment>Oud</comment>
-        <translation type="unfinished"/>
+        <translation>Ú.</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"/>
index 9d875a6..5385cee 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="985"/>
         <source>Strings - Plucked</source>
-        <translation>Teudan – pizzicato</translation>
+        <translation>Teudan – gun bhogha</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="987"/>
index 144732b..470322a 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="985"/>
         <source>Strings - Plucked</source>
-        <translation>撥弦楽器
-</translation>
+        <translation>撥弦楽器</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="987"/>
index d942df5..fade89d 100644 (file)
     <message>
         <location filename="../instruments/instrumentsxml.h" line="17"/>
         <source>D♭ Piccolo</source>
-        <translation>D♭ Piccolo</translation>
+        <translation>Piccolo in D♭</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="18"/>
index 204cb76..8e612e3 100644 (file)
     <message>
         <location filename="../../mscore/editdrumset.ui" line="225"/>
         <source>Whole note</source>
-        <translation type="unfinished"/>
+        <translation>نت گرد</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="242"/>
         <source>Quarter note</source>
-        <translation type="unfinished"/>
+        <translation>نت سیاه</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="249"/>
         <source>Half note</source>
-        <translation type="unfinished"/>
+        <translation>نت سفید</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="375"/>
@@ -13664,12 +13664,12 @@ This will re-evaluate all plugins, picking up any changes that may have occurred
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1591"/>
         <source>Whole note</source>
-        <translation type="unfinished"/>
+        <translation>نت گرد</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1601"/>
         <source>Half note</source>
-        <translation type="unfinished"/>
+        <translation>نت سفید</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1614"/>
@@ -13694,7 +13694,7 @@ This will re-evaluate all plugins, picking up any changes that may have occurred
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1683"/>
         <source>Quarter note</source>
-        <translation type="unfinished"/>
+        <translation>نت سیاه</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1693"/>
@@ -19073,7 +19073,7 @@ failed: </source>
         <location filename="../../mscore/shortcut.cpp" line="1331"/>
         <location filename="../../mscore/shortcut.cpp" line="3009"/>
         <source>Whole note</source>
-        <translation type="unfinished"/>
+        <translation>نت گرد</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1340"/>
@@ -19089,7 +19089,7 @@ failed: </source>
         <location filename="../../mscore/shortcut.cpp" line="1342"/>
         <location filename="../../mscore/shortcut.cpp" line="3020"/>
         <source>Half note</source>
-        <translation type="unfinished"/>
+        <translation>نت سفید</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1351"/>
@@ -19105,7 +19105,7 @@ failed: </source>
         <location filename="../../mscore/shortcut.cpp" line="1353"/>
         <location filename="../../mscore/shortcut.cpp" line="3031"/>
         <source>Quarter note</source>
-        <translation type="unfinished"/>
+        <translation>نت سیاه</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1362"/>
index 524cc2f..e9b961e 100644 (file)
     <message>
         <location filename="../../mscore/albummanager.ui" line="181"/>
         <source>Store relative paths</source>
-        <translation type="unfinished"/>
+        <translation>Goym avvarðandi leiðir</translation>
     </message>
     <message>
         <location filename="../../mscore/albummanager.ui" line="197"/>
     <message>
         <location filename="../../mscore/bend.ui" line="88"/>
         <source>Bend/Release</source>
-        <translation>Bend/slepp</translation>
+        <translation>Spenning/slepping</translation>
     </message>
     <message>
         <location filename="../../mscore/bend.ui" line="107"/>
         <source>Bend/Release/Bend</source>
-        <translation>Bend/slepp/bend</translation>
+        <translation>Spenning/slepping/Spenning</translation>
     </message>
     <message>
         <location filename="../../mscore/bend.ui" line="126"/>
     <message>
         <location filename="../../mscore/bend.ui" line="145"/>
         <source>Prebend/Release</source>
-        <translation>Fyribend/slepp</translation>
+        <translation>Fyrispenning/slepping</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="128"/>
         <source>Attack time (ms)</source>
-        <translation type="unfinished"/>
+        <translation>Herðindis ferð (ms)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="131"/>
         <source>The attack time in milliseconds.</source>
-        <translation type="unfinished"/>
+        <translation>Herðindis ferð í millisekundum</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="177"/>
         <source>Threshold</source>
-        <translation type="unfinished"/>
+        <translation>Gátt</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="192"/>
         <source>Gain</source>
-        <translation type="unfinished"/>
+        <translation>Styrki</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="202"/>
         <source>Release time (ms)</source>
-        <translation type="unfinished"/>
+        <translation>Slepping tíð (ms)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="205"/>
         <source>The release time in milliseconds.</source>
-        <translation type="unfinished"/>
+        <translation>Sleppingartíð í millisekundum</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="312"/>
         <source>Ratio (1:n)</source>
-        <translation type="unfinished"/>
+        <translation>Lutfall (1:n)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="315"/>
         <source>The gain reduction ratio used when the signal level exceeds the threshold.</source>
-        <translation type="unfinished"/>
+        <translation>Avmarkingar í styrkislutfalli nýtt tá signalið fer um gáttina</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="356"/>
         <source>Knee radius (dB)</source>
-        <translation type="unfinished"/>
+        <translation>Radius á knæi (dB)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="359"/>
         <source>The distance from the threshold where the knee curve starts.</source>
-        <translation type="unfinished"/>
+        <translation>Longdin frá gáttini til byrjanina av knækurvuni</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="406"/>
         <source>The balance between the RMS and peak envelope followers. RMS is generally better for subtle musical compression and  peak is better for heavier, fast compression and percussion.</source>
-        <translation type="unfinished"/>
+        <translation>Javnvágin millum RMS og hæddarpunktið á sveipingarbuga eltarar. RMS er vanliga betur til varliga tónlekaliga tætting, og hæddarpunkt eru betur til tyngri og skjótari tætting og slagverk.</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="435"/>
         <source>Makeup gain (dB)</source>
-        <translation type="unfinished"/>
+        <translation>Styrkissamanseting (dB)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="438"/>
         <source>Controls the final gain after compression, in dB.</source>
-        <translation type="unfinished"/>
+        <translation>Stýrir endaligari styrki eftir tætting, í dB</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="473"/>
         <source>Threshold level (dB)</source>
-        <translation type="unfinished"/>
+        <translation>Gáttar stig (dB)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="476"/>
         <source>The point at which the compressor will start to kick in.</source>
-        <translation type="unfinished"/>
+        <translation>Tíðarbilið tá tættingin byrjar</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="533"/>
         <location filename="../../effects/compressor/compressor_gui.ui" line="615"/>
         <location filename="../../effects/compressor/compressor_gui.ui" line="640"/>
         <source>dB</source>
-        <translation type="unfinished"/>
+        <translation>DB</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="108"/>
         <source>Enter a name to enable pitch editing</source>
-        <translation type="unfinished"/>
+        <translation>Innrita navn fyri at loyva tónabroytingar</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="176"/>
         <source>Noteheads group:</source>
-        <translation type="unfinished"/>
+        <translation>Nótahøvdsbólkur:</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="186"/>
         <source>Edit noteheads</source>
-        <translation type="unfinished"/>
+        <translation>Broyt nótahøvd</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="218"/>
     <message>
         <location filename="../../mscore/editstaff.ui" line="375"/>
         <source>0 - Diminished Second</source>
-        <translation>0 - Minka Tvíund</translation>
+        <translation>0 - Minkaður sekundur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="380"/>
         <source>1 - Minor Second</source>
-        <translation>1 - Lítil Tvíund</translation>
+        <translation>1 - Lítil sekundur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="385"/>
         <source>2 - Major Second</source>
-        <translation>2 - Stór Tvíund</translation>
+        <translation>2 - Stórur sekundur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="390"/>
         <source>3 - Augmented Second</source>
-        <translation>3 -  Økt Tvíund</translation>
+        <translation>3 -  Øktur Sekundur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="395"/>
         <source>2 - Diminished Third</source>
-        <translation>2 - Minka Tríund</translation>
+        <translation>2 - Minkaður tertsur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="400"/>
         <source>3 - Minor Third</source>
-        <translation>3 - Lítil Tríund</translation>
+        <translation>3 - Lítil tertsur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="405"/>
         <source>4 - Major Third</source>
-        <translation>4 - Stór Tríund</translation>
+        <translation>4 - Stórur tertsur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="410"/>
         <source>5 - Augmented Third</source>
-        <translation>5 - Økt Tríund</translation>
+        <translation>5 - Øktur tertsur</translation>
     </message>
     <message>
         <location filename="../../mscore/editstaff.ui" line="415"/>
@@ -2368,7 +2368,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="306"/>
         <source>Select swing ratio:</source>
-        <translation>Vel swing lutfall:</translation>
+        <translation>Áset swing lutfall:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="322"/>
@@ -3287,7 +3287,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5037"/>
         <source>Notehead distance:</source>
-        <translation type="unfinished"/>
+        <translation>Fjarstøða millum nótahøvd:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5073"/>
@@ -3359,7 +3359,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5264"/>
         <source>Vertical distance from notehead:</source>
-        <translation type="unfinished"/>
+        <translation>Loddrøtt fjarstøða millum nótahøvd:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5274"/>
@@ -3585,7 +3585,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/importmidi/importmidi_panel.ui" line="249"/>
         <source>Apply MIDI import operations</source>
-        <translation>Brúka Midi innflyt atgerð</translation>
+        <translation>Nýt MIDI innflyt atgerðir</translation>
     </message>
     <message>
         <location filename="../../mscore/importmidi/importmidi_panel.ui" line="252"/>
@@ -3595,7 +3595,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/importmidi/importmidi_panel.ui" line="281"/>
         <source>Cancel non-applied MIDI import operations</source>
-        <translation type="unfinished"/>
+        <translation>Avlýs ónýttar MIDI innflyt atgerðir</translation>
     </message>
     <message>
         <location filename="../../mscore/importmidi/importmidi_panel.ui" line="284"/>
@@ -5397,7 +5397,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/inspector/inspector_image.ui" line="224"/>
         <source>Reset &apos;Lock aspect ratio&apos; value</source>
-        <translation type="unfinished"/>
+        <translation>Nulstilla &quot;Lás stødd lutfall&quot; virði</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_image.ui" line="241"/>
@@ -5408,7 +5408,7 @@ space unit</extracomment>
         <location filename="../../mscore/inspector/inspector_image.ui" line="258"/>
         <location filename="../../mscore/inspector/inspector_image.ui" line="261"/>
         <source>Lock aspect ratio</source>
-        <translation>Lás støddlutfall</translation>
+        <translation>Lás stødd lutfall</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_image.ui" line="271"/>
@@ -6463,7 +6463,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/inspector/inspector_tempotext.ui" line="17"/>
         <source>Tempo Marking Inspector</source>
-        <translation>Tempo merki inspektor</translation>
+        <translation>Tempo inspektor</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_tempotext.ui" line="44"/>
@@ -6489,7 +6489,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/inspector/inspector_tempotext.ui" line="111"/>
         <source>Reset &apos;Tempo&apos; value</source>
-        <translation type="unfinished"/>
+        <translation>Nullstilla &quot;tempo&quot; virði</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_tempotext.ui" line="128"/>
@@ -7784,7 +7784,7 @@ Ynskir tú at finna %2 nú? </translation>
     <message>
         <location filename="../../mscore/masterpalette.ui" line="95"/>
         <source>Noteheads</source>
-        <translation type="unfinished"/>
+        <translation>Nótahøvd</translation>
     </message>
     <message>
         <location filename="../../mscore/masterpalette.ui" line="100"/>
@@ -7897,7 +7897,7 @@ nótabólkur fer um takt</translation>
     <message>
         <location filename="../../mscore/measureproperties.ui" line="105"/>
         <source>Measure Duration</source>
-        <translation>Takt tíðarlongd</translation>
+        <translation>Takt tíðarbil</translation>
     </message>
     <message>
         <location filename="../../mscore/measureproperties.ui" line="123"/>
@@ -8151,7 +8151,7 @@ nótabólkur fer um takt</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="3557"/>
         <source>Unstable Prerelease for Version: %1</source>
-        <translation type="unfinished"/>
+        <translation>Óstøðugt forskoyti í smb. við útgávu: %1</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="3559"/>
@@ -8966,7 +8966,7 @@ villa:</translation>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="217"/>
         <source>Sorry, wrong email address, username or password. Please check again. %1Have you forgotten your password%2?</source>
-        <translation type="unfinished"/>
+        <translation>Skeivur teldupostur, brúkaranavn ella loyniorð. Vinarliga royn aftur. %1Hevur tí gloym títt loyniorð%2?</translation>
     </message>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="222"/>
@@ -8986,7 +8986,7 @@ villa:</translation>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="293"/>
         <source>Error while getting user info. Please try again</source>
-        <translation>Villa í innlesing avbrúkara upplýsningum. Vinarilga royn aftur</translation>
+        <translation>Villa í innlesing av brúkara upplýsningum. Vinarilga royn aftur</translation>
     </message>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="297"/>
@@ -9016,7 +9016,7 @@ villa:</translation>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="572"/>
         <source>An error occurred during the file transfer. Please try again</source>
-        <translation>Villa í samband við flyting av fílu. Vinarliga royn aftur</translation>
+        <translation>Villa í sambandi við flyting av fílu. Vinarliga royn aftur</translation>
     </message>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="576"/>
@@ -9752,7 +9752,7 @@ Vil tú skifta hana út?
         <location filename="../../mscore/musescore.cpp" line="190"/>
         <source>No measure selected:
 Please select a measure and try again</source>
-        <translation>Eingin takt vald:
+        <translation>Eingin takt kosin:
 Vinarliga vel takt og royn aftur</translation>
     </message>
     <message>
@@ -10162,7 +10162,7 @@ Endurnýggja setu?</translation>
     <message>
         <location filename="../../mscore/uploadscoredialog.cpp" line="31"/>
         <source>This score cannot be saved online. Please fix the corrupted measures and try again.</source>
-        <translation>Hetta nótablað kann ikki goymast álinju. Vinarliga bøt um spiltar taktir og royn aftur.</translation>
+        <translation>Nótablaðið kann ikki goymast á netinum. Vinarliga bøt um spiltu taktirnar og royn aftur.</translation>
     </message>
     <message>
         <location filename="../../mscore/workspace.cpp" line="87"/>
@@ -10242,7 +10242,7 @@ connection enabled</source>
     <message>
         <location filename="../../mscore/newwizard.cpp" line="164"/>
         <source>Enter score information:</source>
-        <translation type="unfinished"/>
+        <translation>Innrita upplýsningar um nótablaðið</translation>
     </message>
 </context>
 <context>
@@ -10299,7 +10299,7 @@ connection enabled</source>
     <message>
         <location filename="../../mscore/newwizard.cpp" line="380"/>
         <source>Choose key signature and tempo:</source>
-        <translation type="unfinished"/>
+        <translation>Vel ljómslagstekin og tempo</translation>
     </message>
     <message>
         <location filename="../../mscore/newwizard.cpp" line="385"/>
@@ -11509,7 +11509,7 @@ miseydnað: %2</translation>
         <location filename="../../mscore/scoreview.cpp" line="3171"/>
         <source>No chord/rest selected:
 Please select a chord/rest and try again</source>
-        <translation>Eingin akkord/tøgn vald:
+        <translation>Eingin akkord/tøgn kosin:
 Vinarliga vel akkord/tøgn og royn aftur</translation>
     </message>
     <message>
@@ -11530,7 +11530,7 @@ Kann ikki kloyva nótabólk</translation>
         <location filename="../../mscore/scoreview.cpp" line="3197"/>
         <source>No measures selected:
 Please select a range of measures to join and try again</source>
-        <translation>Eingin takt vald:
+        <translation>Ongar taktir kosnar:
 Vinarliga vel taktir at sambinda og royn aftur</translation>
     </message>
     <message>
@@ -12421,7 +12421,7 @@ vinarliga vel annað navn:</translation>
     <message>
         <location filename="../../mscore/menus.cpp" line="519"/>
         <source>Noteheads</source>
-        <translation type="unfinished"/>
+        <translation>Nótahøvd</translation>
     </message>
     <message>
         <location filename="../../mscore/menus.cpp" line="550"/>
@@ -12880,7 +12880,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/playpanel.ui" line="892"/>
         <source>Actual tempo in quarter notes per minute</source>
-        <translation type="unfinished"/>
+        <translation>Veruligt tempo í fjóringum um minuttin</translation>
     </message>
     <message>
         <location filename="../../mscore/playpanel.ui" line="929"/>
@@ -13637,12 +13637,12 @@ This will re-evaluate all plugins, picking up any changes that may have occurred
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1392"/>
         <source>Default duration:</source>
-        <translation>Forsett tíðarlongd:</translation>
+        <translation>Forsett tíðarbil:</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1399"/>
         <source>Default duration</source>
-        <translation>Forsett tíðarlongd</translation>
+        <translation>Forsett tíðarbil</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="1421"/>
@@ -13952,7 +13952,7 @@ This will re-evaluate all plugins, picking up any changes that may have occurred
         <location filename="../../mscore/prefsdialog.ui" line="2384"/>
         <location filename="../../mscore/prefsdialog.ui" line="2394"/>
         <source>Advance on release?</source>
-        <translation type="unfinished"/>
+        <translation>Framstig ella slepping?</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="2401"/>
@@ -14684,7 +14684,7 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore&apos;s
         <source>No note or lyrics selected:
 Please select a single note or lyrics and retry operation
 </source>
-        <translation>Eingin nóti ella tekstur valdur:
+        <translation>Eingin nóti ella tekstur kosin:
 Vinarliga vel nóta ella tekst og endurroyn atgerð
 </translation>
     </message>
@@ -14702,7 +14702,7 @@ Vinarliga vel einkultan nóta ella besifringsbass og royn aftur.
         <source>No note selected:
 Please select a single note and retry operation
 </source>
-        <translation>Eingin nóti valdur:
+        <translation>Eingin nóti kosin:
 Vinarliga vel ein nóta og endurroyn atgerð
 </translation>
     </message>
@@ -14711,7 +14711,7 @@ Vinarliga vel ein nóta og endurroyn atgerð
         <source>No note or rest selected:
 Please select a single note or rest and retry operation
 </source>
-        <translation>Eingin nóti ella tøgn vald
+        <translation>Eingin nóti ella tøgn kosin
 Vinarliga vel ein nóta ella tøgn og endurroyn atgerð
 </translation>
     </message>
@@ -15504,7 +15504,7 @@ Ynskir tú at yvirskriva?</translation>
     <message>
         <location filename="../../mscore/selectnotedialog.ui" line="47"/>
         <source>Same notehead:</source>
-        <translation type="unfinished"/>
+        <translation>Sama nótahøvd</translation>
     </message>
     <message>
         <location filename="../../mscore/selectnotedialog.ui" line="54"/>
@@ -15519,7 +15519,7 @@ Ynskir tú at yvirskriva?</translation>
     <message>
         <location filename="../../mscore/selectnotedialog.ui" line="75"/>
         <source>Same duration:</source>
-        <translation type="unfinished"/>
+        <translation>Sama tíðarbil:</translation>
     </message>
     <message>
         <location filename="../../mscore/selectnotedialog.ui" line="82"/>
@@ -15818,7 +15818,7 @@ Ynskir tú at yvirskriva?</translation>
     <message>
         <location filename="../../mscore/stafftext.ui" line="4085"/>
         <source>Select swing ratio:</source>
-        <translation>Vel swing lutfall</translation>
+        <translation>Áset swing lutfall</translation>
     </message>
     <message>
         <location filename="../../mscore/stafftext.ui" line="4095"/>
@@ -17131,7 +17131,7 @@ Ynskir tú at yvirskriva?</translation>
     <message>
         <location filename="../../mscore/tremolobar.ui" line="107"/>
         <source>Release(Up)</source>
-        <translation>Sleppa (Upp)</translation>
+        <translation>Slepping (Upp)</translation>
     </message>
     <message>
         <location filename="../../mscore/tremolobar.ui" line="126"/>
@@ -17146,7 +17146,7 @@ Ynskir tú at yvirskriva?</translation>
     <message>
         <location filename="../../mscore/tremolobar.ui" line="193"/>
         <source>Release(Down)</source>
-        <translation>Sleppa (niður)</translation>
+        <translation>Slepping (Niður)</translation>
     </message>
 </context>
 <context>
@@ -17164,7 +17164,7 @@ Ynskir tú at yvirskriva?</translation>
     <message>
         <location filename="../../mscore/tupletdialog.ui" line="45"/>
         <source>Ratio:</source>
-        <translation type="unfinished"/>
+        <translation>Lutfall:</translation>
     </message>
     <message>
         <location filename="../../mscore/tupletdialog.ui" line="71"/>
@@ -17340,7 +17340,7 @@ miseydnað: </translation>
         <location filename="../../thirdparty/xmlstream/xmlstream.cpp" line="1587"/>
         <location filename="../../thirdparty/xmlstream/xmlstream.cpp" line="1599"/>
         <source>Illegal namespace declaration.</source>
-        <translation>Ólógligt navnamillumrúm fráboðan.</translation>
+        <translation>Ólógligt navnarúm.</translation>
     </message>
     <message>
         <location filename="../../thirdparty/xmlstream/xmlstream.cpp" line="1632"/>
@@ -17883,7 +17883,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="273"/>
         <source>Enter durations with a single click or keypress</source>
-        <translation type="unfinished"/>
+        <translation>Skráset tíðarbil við einstøkum klikki ella lykli</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="283"/>
@@ -17893,7 +17893,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="284"/>
         <source>Perform the piece at a fixed tempo indicated by a metronome beat</source>
-        <translation type="unfinished"/>
+        <translation>Spæl stykkið við føstum tempo sum verður spælt av metronomi</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="294"/>
@@ -17903,7 +17903,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="295"/>
         <source>Perform the piece while tapping a key or pedal to set the tempo</source>
-        <translation type="unfinished"/>
+        <translation>Spæl stykkið og nýt knappaborðið ella pedal fyri tempo</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="305"/>
@@ -19122,7 +19122,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1319"/>
         <source>Note duration: Double whole</source>
-        <translation>Nóta tíðarbil: Dupul heil</translation>
+        <translation>Nóta tíðarbil: Dupult heilt</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1320"/>
@@ -19138,7 +19138,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1330"/>
         <source>Note duration: Whole</source>
-        <translation>Nóta tíðarbil: Heil</translation>
+        <translation>Nóta tíðarbil: Heilt</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1331"/>
@@ -19154,7 +19154,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1341"/>
         <source>Note duration: Half</source>
-        <translation>Nóta tíðarbil: Hálvur</translation>
+        <translation>Nóta tíðarbil: Hálvt</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1342"/>
@@ -19170,7 +19170,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1352"/>
         <source>Note duration: Quarter</source>
-        <translation>Nóta tíðarbil: kvart</translation>
+        <translation>Nóta tíðarbil: Kvart</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1353"/>
@@ -19202,7 +19202,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1374"/>
         <source>Note duration: 16th</source>
-        <translation>Nóta longd: 16prt</translation>
+        <translation>Nóta longd: 16nd</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1375"/>
@@ -19218,7 +19218,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1385"/>
         <source>Note duration: 32nd</source>
-        <translation>Nóta longd: 32prt</translation>
+        <translation>Nóta longd: 32nd</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1386"/>
@@ -19250,7 +19250,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1407"/>
         <source>Note duration: 128th</source>
-        <translation>nóta longd: 128prt</translation>
+        <translation>nóta longd: 128nd</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1408"/>
@@ -19261,22 +19261,22 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1417"/>
         <source>Increase Active Duration</source>
-        <translation>Veks um virkna tíðarbil</translation>
+        <translation>Long Virkna Tíðarbilið</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1418"/>
         <source>Increase active duration</source>
-        <translation>Veks um virkna tíðarbil</translation>
+        <translation>Long virkna tíðarbilið</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1424"/>
         <source>Decrease Active Duration</source>
-        <translation>minka virkna tíðarbil</translation>
+        <translation>Stytt Virkna Tíðarbilið</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1425"/>
         <source>Decrease active duration</source>
-        <translation>Minka um virkna tíðarbil</translation>
+        <translation>Stytt virkna tíðarbilið</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1431"/>
@@ -19301,7 +19301,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1443"/>
         <source>Note duration: Double augmentation dot</source>
-        <translation>Nóta tíðarbil: dupul økingar prikkur</translation>
+        <translation>Nóta tíðarbil: Dupultur økingar prikkur</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1444"/>
@@ -19316,7 +19316,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1454"/>
         <source>Note duration: Triple augmentation dot</source>
-        <translation type="unfinished"/>
+        <translation>Nóta tíðarbil: Trídupultur økingar prikkur</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1455"/>
@@ -19332,7 +19332,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1465"/>
         <source>Note duration: Tie</source>
-        <translation>Nóta tíðarbil: bindibogi</translation>
+        <translation>Nóta tíðarbil: Bindibogi</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1474"/>
@@ -19665,7 +19665,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1826"/>
         <source>Toggle &apos;File Operations&apos; toolbar</source>
-        <translation type="unfinished"/>
+        <translation>Skift &quot;fílu atgerðar&quot; amboðsbjálka</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1854"/>
@@ -19781,12 +19781,12 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1891"/>
         <source>Tempo Marking</source>
-        <translation>Tempo merki</translation>
+        <translation>Tempo merking</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1892"/>
         <source>Add tempo marking</source>
-        <translation>Legg tempo merki afturat</translation>
+        <translation>Set inn tempo merking</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1902"/>
@@ -20377,12 +20377,12 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2439"/>
         <source>Mirror Notehead</source>
-        <translation type="unfinished"/>
+        <translation>Spegla Nótahøvd</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2440"/>
         <source>Mirror notehead</source>
-        <translation type="unfinished"/>
+        <translation>Spegla Nótahøvd</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2450"/>
@@ -20462,7 +20462,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2517"/>
         <source>Double Duration</source>
-        <translation>Dupult tíðarbil</translation>
+        <translation>Dupult Tíðarbil</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2518"/>
@@ -20472,7 +20472,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2528"/>
         <source>Half Duration</source>
-        <translation>Hálvt tíðarbil</translation>
+        <translation>Hálvt Tíðarbil</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2529"/>
@@ -20482,22 +20482,22 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2539"/>
         <source>Increase Duration Dotted</source>
-        <translation type="unfinished"/>
+        <translation>Long Tíðarbil við Prikki</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2540"/>
         <source>Increase duration dotted</source>
-        <translation type="unfinished"/>
+        <translation>Long tíðarbil við prikki</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2550"/>
         <source>Decrease Duration Dotted</source>
-        <translation type="unfinished"/>
+        <translation>Stytt Prikka Tíðarbil</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2551"/>
         <source>Decrease duration dotted</source>
-        <translation type="unfinished"/>
+        <translation>Stytt prikka tíðarbil</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2561"/>
@@ -21022,7 +21022,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2997"/>
         <source>Note duration: Double whole (TAB)</source>
-        <translation>Nóta tíðarbil: Dupul heilur (TAB)</translation>
+        <translation>Nóta tíðarbil: Dupult heilt (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3007"/>
@@ -21032,7 +21032,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3008"/>
         <source>Note duration: Whole (TAB)</source>
-        <translation>Nóta tíðarbil: heilur (TAB)</translation>
+        <translation>Nóta tíðarbil: heilt (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3018"/>
@@ -21042,7 +21042,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3019"/>
         <source>Note duration: Half (TAB)</source>
-        <translation>Nóta tíðarbil: Hálvur (TAB)</translation>
+        <translation>Nóta tíðarbil: Hálvt (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3029"/>
@@ -21072,7 +21072,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3052"/>
         <source>Note duration: 16th (TAB)</source>
-        <translation>Nóta tíðarbil: 16prt (TAB)</translation>
+        <translation>Nóta tíðarbil: 16nd (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3062"/>
@@ -21082,7 +21082,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3063"/>
         <source>Note duration: 32nd (TAB)</source>
-        <translation>Nóta tíðarbil: 32prt (TAB)</translation>
+        <translation>Nóta tíðarbil: 32nd (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3073"/>
@@ -21092,7 +21092,7 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3074"/>
         <source>Note duration: 64th (TAB)</source>
-        <translation>Nóta tíðarbil: 64prt (TAB)</translation>
+        <translation>Nóta tíðarbil: 64nd (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3084"/>
@@ -21102,27 +21102,27 @@ miseydnað: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3085"/>
         <source>Note duration: 128th (TAB)</source>
-        <translation>Nóta tíðarbil: 128prt (TAB)</translation>
+        <translation>Nóta tíðarbil: 128nd (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3095"/>
         <source>Increase Active Duration (TAB)</source>
-        <translation>Veks um virkið tíðarbil (TAB)</translation>
+        <translation>Long Virkna Tíðarbilið (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3096"/>
         <source>Increase active duration (TAB)</source>
-        <translation>Veks um virkna tíðarbil (TAB)</translation>
+        <translation>Long virkna tíðarbilið (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3102"/>
         <source>Decrease Active Duration (TAB)</source>
-        <translation>Minka um virkið tíðarbil (TAB)</translation>
+        <translation>Stytt Virkna Tíðarbilið (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3103"/>
         <source>Decrease active duration (TAB)</source>
-        <translation>Minka virkna tíðarbil (TAB)</translation>
+        <translation>Stytt virkna tíðarbilið (TAB)</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3109"/>
@@ -23697,7 +23697,7 @@ Takt er ikki tóm</translation>
     <message>
         <location filename="../../libmscore/element.cpp" line="151"/>
         <source>Notehead</source>
-        <translation type="unfinished"/>
+        <translation>Nótahøvd</translation>
     </message>
     <message>
         <location filename="../../libmscore/element.cpp" line="152"/>
@@ -23732,7 +23732,7 @@ Takt er ikki tóm</translation>
     <message>
         <location filename="../../libmscore/element.cpp" line="158"/>
         <source>Tab Duration Symbol</source>
-        <translation>Tab tíðarbil symbol</translation>
+        <translation>Tab Tíðarbils Symbol</translation>
     </message>
     <message>
         <location filename="../../libmscore/element.cpp" line="159"/>
index e831b78..0e558fd 100644 (file)
     <message>
         <location filename="../../mscore/editdrumset.ui" line="176"/>
         <source>Noteheads group:</source>
-        <translation>Groupe de têtes de notes :</translation>
+        <translation>Groupe de têtes de notes:</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="186"/>
@@ -16577,7 +16577,7 @@ Voulez-vous le remplacer ?</translation>
     <message>
         <location filename="../../mscore/timedialog.ui" line="154"/>
         <source>Text:</source>
-        <translation>Texte :</translation>
+        <translation>Texte:</translation>
     </message>
     <message>
         <location filename="../../mscore/timedialog.ui" line="273"/>
@@ -16638,7 +16638,7 @@ Voulez-vous le remplacer ?</translation>
     <message>
         <location filename="../../mscore/timesigproperties.ui" line="223"/>
         <source>Text:</source>
-        <translation>Texte :</translation>
+        <translation>Texte:</translation>
     </message>
 </context>
 <context>
@@ -17309,7 +17309,7 @@ Voulez-vous le remplacer ?</translation>
     <message>
         <location filename="../../mscore/voltaproperties.ui" line="33"/>
         <source>Text:</source>
-        <translation>Texte :</translation>
+        <translation>Texte:</translation>
     </message>
     <message>
         <location filename="../../mscore/voltaproperties.ui" line="43"/>
index 7f1657b..a1abcff 100644 (file)
@@ -9,7 +9,7 @@
     <message>
         <location filename="../../mscore/aboutbox.ui" line="130"/>
         <source>Copy revision number</source>
-        <translation>Àireamh lèirmheas an lethbhric</translation>
+        <translation>Dèan lethbhreac dhen àireamh lèirmheis</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../../mscore/articulation.ui" line="86"/>
         <source>Chord Automatic</source>
-        <translation>Còrd fèin-obrachail</translation>
+        <translation>A-rèir a’ chùird</translation>
     </message>
     <message>
         <location filename="../../mscore/articulation.ui" line="91"/>
@@ -2801,7 +2801,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2733"/>
         <source>Standard TAB clef</source>
-        <translation>Iuchair TAB stannnardach</translation>
+        <translation>Iuchair TAB stannardach</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2740"/>
@@ -3268,7 +3268,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4997"/>
         <source>Stem distance:</source>
-        <translation>Astar an earbaill:</translation>
+        <translation>Astar nan earball:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5007"/>
@@ -3281,7 +3281,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5017"/>
         <source>Articulation distance:</source>
-        <translation>Astar an altachaidh:</translation>
+        <translation>Astar nan altachaidhean:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5037"/>
@@ -3291,7 +3291,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5073"/>
         <source>Articulation size:</source>
-        <translation>Meud an altachaidh:</translation>
+        <translation>Meud nan altachaidhean:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5151"/>
@@ -3408,7 +3408,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5572"/>
         <source>Chord Symbols, Fretboard Diagrams</source>
-        <translation>Samhlaidhean cùird, diagraman bùird-cheapan</translation>
+        <translation>Cùird, bùird-cheapan</translation>
     </message>
 </context>
 <context>
@@ -6032,7 +6032,7 @@ space unit</extracomment>
         <location filename="../../mscore/inspector/inspector_note.ui" line="669"/>
         <location filename="../../mscore/inspector/inspector_note.ui" line="672"/>
         <source>Fix to line</source>
-        <translation>Glais ris an loidhne</translation>
+        <translation>Glais ri loidhne</translation>
     </message>
 </context>
 <context>
@@ -9139,7 +9139,7 @@ a shàbhaladh mus dùin thu e?</translation>
         <location filename="../../mscore/file.cpp" line="289"/>
         <location filename="../../mscore/file.cpp" line="2329"/>
         <source>All Supported Files</source>
-        <translation>A h-uile faidhle ris an cuirear taic</translation>
+        <translation>Gach faidhle ris an cuirear taic</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="291"/>
@@ -10967,7 +10967,7 @@ A bheil thu airson a shàbhaladh mus dùin thu e?</translation>
         <location filename="../../mscore/resourceManager.cpp" line="130"/>
         <location filename="../../mscore/resourceManager.cpp" line="205"/>
         <source>Update</source>
-        <translation>Ùraich</translation>
+        <translation>Ùrachadh</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="114"/>
@@ -14350,7 +14350,7 @@ Ma chuireas tu gleus air an fhoillidheachd, dh’fhaoidte gun cuidich seo le sio
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="3333"/>
         <source>Import</source>
-        <translation>Ion-phortaich</translation>
+        <translation>Ion-phortadh</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="3339"/>
@@ -14485,7 +14485,7 @@ Ma chuireas tu gleus air an fhoillidheachd, dh’fhaoidte gun cuidich seo le sio
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="3583"/>
         <source>Export</source>
-        <translation>Às-phortaich</translation>
+        <translation>Às-phortadh</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="3602"/>
@@ -16104,7 +16104,7 @@ A bheil thu airson sgrìobhadh thairis air?</translation>
     <message>
         <location filename="../../mscore/textproperties.ui" line="302"/>
         <source>Size follows &apos;Staff space&apos; setting</source>
-        <translation>Tha am meud a-rèir na roghainn “Eadra-loidhne na clèithe”</translation>
+        <translation>Meud a-rèir na roghainn “Eadra-loidhne na clèithe”</translation>
     </message>
     <message>
         <location filename="../../mscore/textproperties.ui" line="319"/>
@@ -20244,12 +20244,12 @@ a sgrìobhadh: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2288"/>
         <source>Edit Element</source>
-        <translation>Deasaich eileamaid</translation>
+        <translation>Deasaich an eileamaid</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2289"/>
         <source>Edit element</source>
-        <translation>Deasaich eileamaid</translation>
+        <translation>Deasaich an eileamaid</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2295"/>
index 02b9482..7e3b0e4 100644 (file)
@@ -89,7 +89,7 @@
     <message>
         <location filename="../../mscore/albummanager.ui" line="17"/>
         <source>Album Manager</source>
-        <translation>アルバム マネージャ</translation>
+        <translation>アルバム マネージャ</translation>
     </message>
     <message>
         <location filename="../../mscore/albummanager.ui" line="28"/>
     <message>
         <location filename="../../mscore/breaksdialog.ui" line="24"/>
         <source>Break systems every X measures</source>
-        <translation>譜表の折り返し を X小節ごとに付ける</translation>
+        <translation>譜表の折り返しを x小節ごとに付ける</translation>
     </message>
     <message>
         <location filename="../../mscore/breaksdialog.ui" line="27"/>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="315"/>
         <source>The gain reduction ratio used when the signal level exceeds the threshold.</source>
-        <translation>信号レベルがしきい値を超えたときに使用されるゲイン低減率</translation>
+        <translation>信号レベルが一定の値を超えたときに使用されるゲイン低減率</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="356"/>
@@ -3721,7 +3721,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/inspector/inspector_ambitus.ui" line="138"/>
         <source>XCircle</source>
-        <translation>x サークル符頭</translation>
+        <translation>xサークル符頭</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_ambitus.ui" line="143"/>
@@ -4436,12 +4436,12 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/inspector/inspector_beam.ui" line="112"/>
         <source>Grow right:</source>
-        <translation>右側の旗の位置:</translation>
+        <translation>右旗の位置:</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_beam.ui" line="125"/>
         <source>Grow left:</source>
-        <translation>左側の旗の位置:</translation>
+        <translation>左旗の位置:</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_beam.ui" line="138"/>
@@ -7008,7 +7008,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/instrwizard.ui" line="25"/>
         <source>Instrument Genre Filter</source>
-        <translation>楽器ジャンルフィルタ</translation>
+        <translation>楽器ジャンルフィルタ</translation>
     </message>
     <message>
         <location filename="../../mscore/instrwizard.ui" line="32"/>
@@ -7132,7 +7132,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/instrwidget.ui" line="42"/>
         <source>Instrument Genre Filter</source>
-        <translation>楽器ジャンルフィルタ</translation>
+        <translation>楽器ジャンルフィルタ</translation>
     </message>
     <message>
         <location filename="../../mscore/instrwidget.ui" line="55"/>
@@ -7702,7 +7702,7 @@ pickup measure</source>
 You only need to do this once.
 
 Would you like to locate %2 now?</source>
-        <translation>MuseScoreはMP3を書き出すために無料のLAMEエンコーダを使用します。
+        <translation>MuseScore はMP3を書き出すために無料の LAMEエンコーダ を使用します。
 別途 %1 を取得しエンコーダーの場所を手動で指定 (詳細はハンドブックを確認して下さい)しなければなりません。
 この操作は初回のみで次回以降は不要です。
 
@@ -8170,8 +8170,8 @@ Support MuseScore with your %3donation%4.
 
 Copyright &amp;copy; 1999-2018 Werner Schweer and Others.
 Published under the GNU General Public License.</source>
-        <translation>新バージョンや他の情報を得るには %1www.musescore.org%2  にアクセスしてください。
-MuseScoreはあなたの %3寄付%4 で支援することができます。
+        <translation>æ\96°ã\81\97ã\81\84ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\82\84ä»\96ã\81®æ\83\85å ±ã\82\92å¾\97ã\82\8bã\81«ã\81¯ %1www.musescore.org%2  ã\81«ã\82¢ã\82¯ã\82»ã\82¹ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82
+MuseScore はあなたの %3寄付%4 で支援することができます。
 
 Copyright &amp;copy; 1999-2018 Werner Schweer and Others.
 Published under the GNU General Public License.</translation>
@@ -8641,7 +8641,7 @@ failed: </source>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="228"/>
         <source>One or more installed extensions have updates available in Help / Resource Manager...</source>
-        <translation>ã\82¢ã\83\83ã\83\97ã\83\87ã\83¼ã\83\88å\8f¯è\83½ã\81«ã\81ªã\81£ã\81\9fæ\8b¡å¼µæ©\9fè\83½ã\81\8cã\81«ã\81\82ã\82\8aã\81¾ã\81\99ã\80\82 ã\83\98ã\83«ã\83\97ï¼\8fã\83ªã\82½ã\83¼ã\82¹ã\83\9eã\83\8dã\83¼ã\82¸ã\83£ を確認してください。</translation>
+        <translation>ã\82¢ã\83\83ã\83\97ã\83\87ã\83¼ã\83\88å\8f¯è\83½ã\81ªæ\8b¡å¼µæ©\9fè\83½ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\80\82 ã\83\98ã\83«ã\83\97ï¼\8fã\83ªã\82½ã\83¼ã\82¹ã\83\9eã\83\8dã\83¼ã\82¸ã\83£ã\83¼ を確認してください。</translation>
     </message>
 </context>
 <context>
@@ -9023,7 +9023,7 @@ failed: </source>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="469"/>
         <source>Sorry, MuseScore couldn&apos;t upload the audio file. Error %1</source>
-        <translation>申し訳ありませんが、MuseScoreはこのオーディオファイルをアップロードできませんでした。Error %1</translation>
+        <translation>申し訳ありませんが、このオーディオファイルをアップロードできませんでした。Error %1</translation>
     </message>
     <message>
         <location filename="../../mscore/loginmanager.cpp" line="572"/>
@@ -9744,7 +9744,7 @@ Do you want to replace it?
     <message>
         <location filename="../../mscore/menus.cpp" line="1292"/>
         <source>&amp;Measures</source>
-        <translation>小節(&amp;M)</translation>
+        <translation>小節</translation>
     </message>
     <message>
         <location filename="../../mscore/menus.cpp" line="1299"/>
@@ -9771,12 +9771,12 @@ Please select a measure and try again</source>
     <message>
         <location filename="../../mscore/musescore.cpp" line="510"/>
         <source>Please wait, unpacking extension...</source>
-        <translation>お待ちください、拡張機能を開いています。。</translation>
+        <translation>拡張機能を開いています…</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="583"/>
         <source>Please wait, loading soundfonts...</source>
-        <translation>ã\81\8aå¾\85ã\81¡ã\81\8fã\81 ã\81\95ã\81\84ã\80\81ã\82µã\82¦ã\83³ã\83\89ã\83\95ã\82©ã\83³ã\83\88ã\82\92読ã\81¿è¾¼ã\82\93ã\81§ã\81\84ã\81¾ã\81\99ã\80\82ã\80\82</translation>
+        <translation>ã\82µã\82¦ã\83³ã\83\89ã\83\95ã\82©ã\83³ã\83\88ã\82\92読ã\81¿è¾¼ã\82\93ã\81§ã\81\84ã\81¾ã\81\99â\80¦</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="733"/>
@@ -9881,7 +9881,7 @@ Please select a measure and try again</source>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1072"/>
         <source>&amp;Voices</source>
-        <translation>声部(&amp;V)</translation>
+        <translation>声部</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1087"/>
@@ -10610,7 +10610,7 @@ connection enabled</source>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="199"/>
         <source>MuseScore Plugin Creator</source>
-        <translation>MuseScore プラグイン クリエイタ</translation>
+        <translation>MuseScore プラグイン クリエイタ</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="245"/>
@@ -11009,7 +11009,8 @@ Save before closing?</source>
         <location filename="../../mscore/resourceManager.cpp" line="339"/>
         <source>Unable to download, save and verify the package.
 Check your internet connection.</source>
-        <translation>パッケージをダウンロード、保存、検証することができません - インターネット接続を確かめてください</translation>
+        <translation>パッケージをダウンロード、保存、検証することができません。
+インターネット接続を確かめてください。</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="133"/>
@@ -11603,7 +11604,7 @@ Please select a measure and try again</source>
     <message>
         <location filename="../../mscore/selectionwindow.cpp" line="39"/>
         <source>Selection filter</source>
-        <translation>選択フィルタ</translation>
+        <translation>選択フィルタ</translation>
     </message>
     <message>
         <location filename="../../mscore/selectionwindow.cpp" line="40"/>
@@ -11616,7 +11617,7 @@ Please select a measure and try again</source>
     <message>
         <location filename="../../mscore/selectionwindow.cpp" line="60"/>
         <source>Selection Filter</source>
-        <translation>選択フィルタ</translation>
+        <translation>選択フィルタ</translation>
     </message>
 </context>
 <context>
@@ -12972,7 +12973,7 @@ failed: </source>
     <message>
         <location filename="../../mscore/pluginCreator.ui" line="171"/>
         <source>Close Plugin Creator</source>
-        <translation>プラグイン クリエイタを閉じる</translation>
+        <translation>ã\83\97ã\83©ã\82°ã\82¤ã\83³ ã\82¯ã\83ªã\82¨ã\82¤ã\82¿ã\83¼ã\82\92é\96\89ã\81\98ã\82\8b</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.ui" line="179"/>
@@ -12995,7 +12996,7 @@ failed: </source>
     <message>
         <location filename="../../mscore/pluginManager.ui" line="17"/>
         <source>Plugin Manager</source>
-        <translation>プラグイン マネージャ</translation>
+        <translation>プラグイン マネージャ</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginManager.ui" line="44"/>
@@ -13062,7 +13063,7 @@ This will re-evaluate all plugins, picking up any changes that may have occurred
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="96"/>
         <source>Preferences Tab Manager</source>
-        <translation>環境設定タブ マネージャ</translation>
+        <translation>環境設定タブマネージャー</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="103"/>
@@ -14683,12 +14684,12 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore&apos;s
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="4197"/>
         <source>Check for new version of MuseScore</source>
-        <translation>新バージョンのチェック</translation>
+        <translation>æ\96°ã\81\97ã\81\84ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\81®ã\83\81ã\82§ã\83\83ã\82¯</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="4204"/>
         <source>Check for new version of MuseScore extensions</source>
-        <translation>新しいバージョンのMuseScore拡張機能を確認する</translation>
+        <translation>MuseScore拡張機能の新しいバージョンをチェック</translation>
     </message>
 </context>
 <context>
@@ -15248,17 +15249,17 @@ 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>読ã\81¿å\8f\96ã\82\8aå°\82ç\94¨ã\81®ã\82¹ã\83\88ã\83¼ã\83¬ã\83¼ã\82¸ä¸\8aã\81«ã\81¯æ\8b¡å¼µå­\90をインポートすることができません: %1</translation>
+        <translation>読ã\81¿å\8f\96ã\82\8aå°\82ç\94¨ã\81®ã\82¹ã\83\88ã\83¬ã\83¼ã\82¸ä¸\8aã\81«ã\81¯æ\8b¡å¼µæ©\9fè\83½をインポートすることができません: %1</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="410"/>
         <source>Cannot import extension: storage %1 is full</source>
-        <translation>拡張機能をインポートできません。ストレージ %1 は十分な空き容量がありません。</translation>
+        <translation>拡張機能をインポートできません: ストレージ %1 に十分な空き容量がありません。</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="440"/>
         <source>Corrupted extension: no metadata.json</source>
-        <translation>拡張機能が破損しています: metadata.jsonがありません。</translation>
+        <translation>拡張機能が破損しています: metadata.json がありません。</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="445"/>
@@ -15273,7 +15274,7 @@ Do you want to overwrite it?</source>
     <message>
         <location filename="../../mscore/musescore.cpp" line="465"/>
         <source>Corrupted extension: corrupted metadata.json</source>
-        <translation>拡張機能が破損しています: metadata.jsonが破損しています。</translation>
+        <translation>拡張機能が破損しています: metadata.json が破損しています。</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="484"/>
@@ -15335,12 +15336,12 @@ Do you want to overwrite it?</source>
     <message>
         <location filename="../../mscore/resourceManager.ui" line="24"/>
         <source>Extensions</source>
-        <translation>拡張機能:</translation>
+        <translation>拡張機能</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.ui" line="60"/>
         <source>Extension</source>
-        <translation>拡張</translation>
+        <translation>拡張機能</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.ui" line="65"/>
@@ -18975,12 +18976,12 @@ failed: </source>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1165"/>
         <source>Append One Measure</source>
-        <translation>1小節追加</translation>
+        <translation>小節追加</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1166"/>
         <source>Append one measure</source>
-        <translation>1小節追加</translation>
+        <translation>小節追加</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1172"/>
@@ -18995,12 +18996,12 @@ failed: </source>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1179"/>
         <source>Insert One Measure</source>
-        <translation>1小節挿入</translation>
+        <translation>小節挿入</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1180"/>
         <source>Insert one measure</source>
-        <translation>1小節挿入</translation>
+        <translation>小節挿入</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1188"/>
@@ -19684,12 +19685,12 @@ failed: </source>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1780"/>
         <source>Selection Filter</source>
-        <translation>選択フィルタ</translation>
+        <translation>選択フィルタ</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1781"/>
         <source>Toggle &apos;Selection Filter&apos;</source>
-        <translation>選択フィルタ 切替</translation>
+        <translation>選択フィルタ 切替</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="1826"/>
@@ -20776,22 +20777,22 @@ failed: </source>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2757"/>
         <source>Plugin Creator...</source>
-        <translation>プラグイン クリエイタ...</translation>
+        <translation>プラグイン クリエイタ...</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2758"/>
         <source>Plugin creator</source>
-        <translation>プラグイン クリエイタ</translation>
+        <translation>プラグイン クリエイタ</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2767"/>
         <source>Plugin Manager...</source>
-        <translation>プラグイン マネージャ...</translation>
+        <translation>プラグイン マネージャ...</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2768"/>
         <source>Plugin manager</source>
-        <translation>プラグイン マネージャ</translation>
+        <translation>プラグイン マネージャ</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2777"/>
@@ -20806,12 +20807,12 @@ failed: </source>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2784"/>
         <source>Resource Manager...</source>
-        <translation>リソース マネージャ...</translation>
+        <translation>リソース マネージャ...</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2785"/>
         <source>Resource manager</source>
-        <translation>リソース マネージャ</translation>
+        <translation>リソース マネージャ</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2795"/>
@@ -23904,7 +23905,7 @@ Measure is not empty</source>
     <message>
         <location filename="../../mscore/preferences.cpp" line="195"/>
         <source>Extensions</source>
-        <translation>拡張機能:</translation>
+        <translation>拡張機能</translation>
     </message>
 </context>
 <context>
index dce74d1..32d1ac9 100644 (file)
@@ -8637,12 +8637,12 @@ openen mislukt:</translation>
     <message>
         <location filename="../../mscore/updatechecker.cpp" line="227"/>
         <source>Extension Updates Available</source>
-        <translation>Nieuwe versie van uitbreidingen beschikbaar</translation>
+        <translation>Nieuwe versies van uitbreidingen beschikbaar</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>Een of meerdere uitbreidingen kunnen bijgewerkt worden naar een nieuwe versie. Ga naar Help → Beheer databronnen…</translation>
+        <translation>Een of meerdere geïnstalleerde uitbreidingen kunnen bijgewerkt worden naar een nieuwere versie. Ga naar Help → Beheer databronnen…</translation>
     </message>
 </context>
 <context>
@@ -9777,7 +9777,7 @@ selecteer eerst een maat en probeer het dan opnieuw</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="583"/>
         <source>Please wait, loading soundfonts...</source>
-        <translation>Even geduld, laden soundfonts...</translation>
+        <translation>Even geduld, soundfonts worden geladen...</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="733"/>
@@ -11001,18 +11001,18 @@ Opslaan voor sluiten?</translation>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="335"/>
         <source>Extensions Installation Failed</source>
-        <translation>Installeren uitbreiding mislukt</translation>
+        <translation>Het installeren van de uitbreiding is mislukt</translation>
     </message>
     <message>
         <location filename="../../mscore/resourceManager.cpp" line="337"/>
         <source>Unable to save the extension file on disk</source>
-        <translation>Kan het uitbreidingsbestand niet opslaan op de schijf</translation>
+        <translation>Kan het uitbreidingsbestand niet opslaan op de harde schijf</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>Downloaden, opslaan en verifiëren van het pakket mislukt.
+        <translation>Het downloaden, opslaan en verifiëren van het pakket is mislukt.
 Controleer uw internetverbinding.</translation>
     </message>
     <message>
@@ -15250,7 +15250,7 @@ Wil je dit overschrijven?</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="405"/>
         <source>Cannot import extension on read-only storage: %1</source>
-        <translation>Kan uitbreiding niet importeren in alleen-lezen opslagruimte: %1</translation>
+        <translation>Kan de uitbreiding niet importeren in de alleen-lezen opslagruimte: %1</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="410"/>
index ebc35a0..60453d5 100644 (file)
@@ -9322,23 +9322,23 @@ antes de fechar?</translation>
     <message>
         <location filename="../../mscore/file.cpp" line="1352"/>
         <source>Load Plugin</source>
-        <translation>Carregar Plugin</translation>
+        <translation>Carregar Extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="1353"/>
         <source>MuseScore Plugin</source>
-        <translation>Plugin MuseScore</translation>
+        <translation>Extensão MuseScore</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="1356"/>
         <location filename="../../mscore/file.cpp" line="1406"/>
         <source>Save Plugin</source>
-        <translation>Salvar Plugin</translation>
+        <translation>Salvar Extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="1357"/>
         <source>MuseScore Plugin File</source>
-        <translation>Arquivo de Plugin MuseScore</translation>
+        <translation>Arquivo de Extensão do MuseScore</translation>
     </message>
     <message>
         <location filename="../../mscore/file.cpp" line="1435"/>
@@ -9933,7 +9933,7 @@ Por favor, selecione um compasso e tente novamente</translation>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1308"/>
         <source>&amp;Plugins</source>
-        <translation>&amp;Plugins</translation>
+        <translation>&amp;Extensões</translation>
     </message>
     <message>
         <location filename="../../mscore/musescore.cpp" line="1325"/>
@@ -10348,7 +10348,7 @@ com a Internet habilitada</translation>
     <message>
         <location filename="../../effects/noeffect/noeffect.cpp" line="41"/>
         <source>No Plugin</source>
-        <translation>Sem Plugins</translation>
+        <translation>Sem Extensões</translation>
     </message>
 </context>
 <context>
@@ -10616,7 +10616,7 @@ com a Internet habilitada</translation>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="199"/>
         <source>MuseScore Plugin Creator</source>
-        <translation>Criador de plugin do MuseScore</translation>
+        <translation>Criador da Extensão do MuseScore</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="245"/>
@@ -10631,8 +10631,8 @@ com a Internet habilitada</translation>
         <location filename="../../mscore/pluginCreator.cpp" line="492"/>
         <source>Plugin &quot;%1&quot; has changes.
 Save before closing?</source>
-        <translation>O plugin &quot;%1&quot; foi alterado.
-Salvá-lo antes de fechar?</translation>
+        <translation>A extensão &quot;%1&quot; foi alterada.
+Salvá-la antes de fechar?</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="295"/>
@@ -10651,7 +10651,7 @@ Salvá-lo antes de fechar?</translation>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="316"/>
         <source>Plugin Details:</source>
-        <translation>Detalhes do Plugin:</translation>
+        <translation>Detalhes da Extensão:</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="317"/>
@@ -10676,8 +10676,7 @@ Salvá-lo antes de fechar?</translation>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="455"/>
         <source>Save Plugin</source>
-        <translation>Salvar Plugin
-</translation>
+        <translation>Salvar Extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.cpp" line="455"/>
@@ -10705,7 +10704,7 @@ Salvá-lo antes de fechar?</translation>
     <message>
         <location filename="../../mscore/pluginManager.cpp" line="208"/>
         <source>Plugins reloaded.</source>
-        <translation>Plugins recarregados.</translation>
+        <translation>Extensões recarregadas.</translation>
     </message>
 </context>
 <context>
@@ -10936,7 +10935,7 @@ Salvá-lo antes de fechar?</translation>
     <message>
         <location filename="../../mscore/preferences.cpp" line="1803"/>
         <source>Choose Plugin Folder</source>
-        <translation>Escolha a Pasta de Plugins</translation>
+        <translation>Escolha a Pasta de Extensões</translation>
     </message>
     <message>
         <location filename="../../mscore/preferences.cpp" line="1819"/>
@@ -12981,7 +12980,7 @@ falhou: </translation>
     <message>
         <location filename="../../mscore/pluginCreator.ui" line="171"/>
         <source>Close Plugin Creator</source>
-        <translation>Fechar Criador de plugin</translation>
+        <translation>Fechar Criador de Extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.ui" line="179"/>
@@ -12991,7 +12990,7 @@ falhou: </translation>
     <message>
         <location filename="../../mscore/pluginCreator.ui" line="182"/>
         <source>Reload current plugin source</source>
-        <translation>Recarregue o fonte do plugin atual</translation>
+        <translation>Recarregue o fonte da extensão atual</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginCreator.ui" line="187"/>
@@ -13004,7 +13003,7 @@ falhou: </translation>
     <message>
         <location filename="../../mscore/pluginManager.ui" line="17"/>
         <source>Plugin Manager</source>
-        <translation>Gerenciador de plugins</translation>
+        <translation>Gerenciador de Extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginManager.ui" line="44"/>
@@ -13040,13 +13039,13 @@ falhou: </translation>
         <location filename="../../mscore/pluginManager.ui" line="126"/>
         <source>Reload all plugins.
 This will re-evaluate all plugins, picking up any changes that may have occurred.</source>
-        <translation>Recarregar plugins.
-Isto vai reavaliar todos plugins, atualizando qualquer modificação que tenha ocorrido.</translation>
+        <translation>Recarregar extensões.
+Isto vai reavaliar todas as extensões, atualizando qualquer modificação que tenha ocorrido.</translation>
     </message>
     <message>
         <location filename="../../mscore/pluginManager.ui" line="130"/>
         <source>Reload Plugins</source>
-        <translation>Recarregar Plugins</translation>
+        <translation>Recarregar Extensões</translation>
     </message>
 </context>
 <context>
@@ -13248,7 +13247,7 @@ Isto vai reavaliar todos plugins, atualizando qualquer modificação que tenha o
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="452"/>
         <source>Plugins:</source>
-        <translation>Plugins:</translation>
+        <translation>Extensões:</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="465"/>
@@ -13263,12 +13262,12 @@ Isto vai reavaliar todos plugins, atualizando qualquer modificação que tenha o
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="475"/>
         <source>Plugin folder</source>
-        <translation>Pasta de plugin</translation>
+        <translation>Pasta de Extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="478"/>
         <source>Insert path to plugin folder</source>
-        <translation>Insira o caminho para a pasta de plugin</translation>
+        <translation>Insira o caminho para a pasta de extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="485"/>
@@ -13284,12 +13283,12 @@ Isto vai reavaliar todos plugins, atualizando qualquer modificação que tenha o
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="498"/>
         <source>Choose plugin folder</source>
-        <translation>Escolha pasta de plugin</translation>
+        <translation>Escolha pasta de extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="501"/>
         <source>Opens a folder dialog for selecting the plugin folder</source>
-        <translation>Abre uma caixa de diálogo de pastas para selecionar pasta de plugin</translation>
+        <translation>Abre uma caixa de diálogo de pastas para selecionar pasta de extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/prefsdialog.ui" line="515"/>
@@ -20788,22 +20787,22 @@ falhou: </translation>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2757"/>
         <source>Plugin Creator...</source>
-        <translation>Criador de plugin...</translation>
+        <translation>Criador de extensão...</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2758"/>
         <source>Plugin creator</source>
-        <translation>Criador de plugin</translation>
+        <translation>Criador de extensão</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2767"/>
         <source>Plugin Manager...</source>
-        <translation>Gerenciador de plugins...</translation>
+        <translation>Gerenciador de Extensões...</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2768"/>
         <source>Plugin manager</source>
-        <translation>Gerenciador de plugins</translation>
+        <translation>Gerenciador de extensões</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="2777"/>
@@ -24193,7 +24192,7 @@ O compasso não está vazio</translation>
     <message>
         <location filename="../../mscore/preferences.cpp" line="193"/>
         <source>Plugins</source>
-        <translation>Plugins</translation>
+        <translation>Extensões</translation>
     </message>
 </context>
 <context>
index da56f7b..c19ab29 100644 (file)
@@ -46,7 +46,7 @@
     <message>
         <location filename="../../aeolus/aeolus_gui.ui" line="63"/>
         <source>Delay</source>
-        <translation>延迟</translation>
+        <translation>Delay</translation>
     </message>
     <message>
         <location filename="../../aeolus/aeolus_gui.ui" line="70"/>
@@ -81,7 +81,7 @@
     <message>
         <location filename="../../aeolus/aeolus_gui.ui" line="361"/>
         <source>Position</source>
-        <translation>布局</translation>
+        <translation>Position</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../../mscore/albummanager.ui" line="181"/>
         <source>Store relative paths</source>
-        <translation type="unfinished"/>
+        <translation>存储相对路径</translation>
     </message>
     <message>
         <location filename="../../mscore/albummanager.ui" line="197"/>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="202"/>
         <source>Release time (ms)</source>
-        <translation>释放时间(ms)</translation>
+        <translation>释放时间 (ms)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="205"/>
         <source>The release time in milliseconds.</source>
-        <translation>以毫秒(ms)计算释放的时间</translation>
+        <translation>以毫秒(ms)计算释放的时间</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="312"/>
         <source>Ratio (1:n)</source>
-        <translation>比率(1:N)</translation>
+        <translation>比率(1:N)</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="315"/>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="438"/>
         <source>Controls the final gain after compression, in dB.</source>
-        <translation>控制补偿输入信号的增益(dB)。</translation>
+        <translation>控制补偿输入信号的增益 (dB)。</translation>
     </message>
     <message>
         <location filename="../../effects/compressor/compressor_gui.ui" line="473"/>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="108"/>
         <source>Enter a name to enable pitch editing</source>
-        <translation type="unfinished"/>
+        <translation>输入名字以启用音高编辑</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="176"/>
         <source>Noteheads group:</source>
-        <translation type="unfinished"/>
+        <translation>符头组:</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="186"/>
         <source>Edit noteheads</source>
-        <translation type="unfinished"/>
+        <translation>编辑符头</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="218"/>
         <source>Double Whole note</source>
-        <translation type="unfinished"/>
+        <translation>二全音符</translation>
     </message>
     <message>
         <location filename="../../mscore/editdrumset.ui" line="225"/>
     <message>
         <location filename="../../mscore/editpitch.ui" line="54"/>
         <source>Octave 9</source>
-        <translation type="unfinished"/>
+        <translation>第9个八度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="59"/>
         <source>Octave 8</source>
-        <translation>第8个8度</translation>
+        <translation>第8个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="64"/>
         <source>Octave 7</source>
-        <translation>第7个8度</translation>
+        <translation>第7个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="69"/>
         <source>Octave 6</source>
-        <translation>第6个8度</translation>
+        <translation>第6个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="74"/>
         <source>Octave 5</source>
-        <translation>第5个8度</translation>
+        <translation>第5个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="79"/>
         <source>Octave 4</source>
-        <translation>第4个8度</translation>
+        <translation>第4个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="84"/>
         <source>Octave 3</source>
-        <translation>第3个8度</translation>
+        <translation>第3个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="89"/>
         <source>Octave 2</source>
-        <translation>第2个8度</translation>
+        <translation>第2个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="94"/>
         <source>Octave 1</source>
-        <translation>第1个8度</translation>
+        <translation>第1个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="99"/>
         <source>Octave 0</source>
-        <translation>第0个8度</translation>
+        <translation>第0个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="104"/>
         <source>Octave -1</source>
-        <translation>第-1个8度</translation>
+        <translation>第-1个度</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="109"/>
     <message>
         <location filename="../../mscore/editpitch.ui" line="179"/>
         <source>C♯ 9</source>
-        <translation>C♯ 9
-</translation>
+        <translation>C♯ 9</translation>
     </message>
     <message>
         <location filename="../../mscore/editpitch.ui" line="184"/>
         <location filename="../../mscore/editstafftype.ui" line="431"/>
         <location filename="../../mscore/editstafftype.ui" line="722"/>
         <source>pt</source>
-        <translation>bang</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../../mscore/editstafftype.ui" line="451"/>
@@ -2333,7 +2332,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="211"/>
         <source>Display note values across measure boundaries (EXPERIMENTAL, early music only!)</source>
-        <translation type="unfinished"/>
+        <translation>显示横跨不同小节的音符(实验性特性,仅限于早期音乐!)</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="218"/>
@@ -2609,7 +2608,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="1634"/>
         <source>Spacing (1=tight):</source>
-        <translation>间距(1=紧密):</translation>
+        <translation>间距(1=紧密):</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="1662"/>
@@ -2685,7 +2684,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2211"/>
         <source>Show repeat barline tips (&quot;winged&quot; repeats)</source>
-        <translation type="unfinished"/>
+        <translation>显示反复小节线的提示 (&quot;winged&quot; 反复)</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2218"/>
@@ -2832,7 +2831,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2830"/>
         <source>Hook length:</source>
-        <translation type="unfinished"/>
+        <translation>线条长度:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2878"/>
@@ -2848,7 +2847,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2907"/>
         <source>Beam distance (in beam thickness units):</source>
-        <translation>符杠间距 (符杠粗度单位):</translation>
+        <translation>符杠间距(符杠粗度单位):</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="2937"/>
@@ -2915,7 +2914,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="3327"/>
         <source>Hairpins</source>
-        <translation>音量变化记号</translation>
+        <translation>渐变符号</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="3369"/>
@@ -2964,7 +2963,7 @@ space unit</extracomment>
         <location filename="../../mscore/editstyle.ui" line="3566"/>
         <location filename="../../mscore/editstyle.ui" line="3777"/>
         <source>Hook height:</source>
-        <translation type="unfinished"/>
+        <translation>线条高度:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="3601"/>
@@ -3082,7 +3081,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4272"/>
         <source>German</source>
-        <translation>å¾·å\9b½ç\9a\84</translation>
+        <translation>å¾·å¼\8f</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4279"/>
@@ -3092,7 +3091,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4282"/>
         <source>Full German</source>
-        <translation type="unfinished"/>
+        <translation>全德式</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4289"/>
@@ -3112,7 +3111,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4302"/>
         <source>French</source>
-        <translation>æ³\95å\9b½ç\9a\84</translation>
+        <translation>æ³\95å¼\8f</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4324"/>
@@ -3208,7 +3207,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4821"/>
         <source>pt</source>
-        <translation>bang</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4837"/>
@@ -3269,7 +3268,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="4997"/>
         <source>Stem distance:</source>
-        <translation type="unfinished"/>
+        <translation>符干距离:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5007"/>
@@ -3287,7 +3286,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5037"/>
         <source>Notehead distance:</source>
-        <translation type="unfinished"/>
+        <translation>符头距离:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5073"/>
@@ -3318,7 +3317,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5182"/>
         <source>Naturals in Key Signatures</source>
-        <translation type="unfinished"/>
+        <translation>调号的还原号</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5188"/>
@@ -3354,12 +3353,12 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5254"/>
         <source>Vertical distance from stem:</source>
-        <translation type="unfinished"/>
+        <translation>符干垂直间距:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5264"/>
         <source>Vertical distance from notehead:</source>
-        <translation type="unfinished"/>
+        <translation>符头垂直间距:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5274"/>
@@ -3374,22 +3373,22 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5344"/>
         <source>Distance before the stem of the first note:</source>
-        <translation type="unfinished"/>
+        <translation>第一个音符符干前的间距:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5354"/>
         <source>Distance before the head of the first note:</source>
-        <translation type="unfinished"/>
+        <translation>第一个音符符头前的间距:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5364"/>
         <source>Distance after the stem of the last note:</source>
-        <translation type="unfinished"/>
+        <translation>最后一个音符符干后的间距:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5374"/>
         <source>Distance after the head of the last note:</source>
-        <translation type="unfinished"/>
+        <translation>最后一个音符符头后的间距:</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5512"/>
@@ -3399,17 +3398,17 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5562"/>
         <source>Hairpins, Volta, Ottava</source>
-        <translation type="unfinished"/>
+        <translation>渐变符号、括号和八度记号</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5567"/>
         <source>Pedal, Trill</source>
-        <translation type="unfinished"/>
+        <translation>踏板线和颤音线</translation>
     </message>
     <message>
         <location filename="../../mscore/editstyle.ui" line="5572"/>
         <source>Chord Symbols, Fretboard Diagrams</source>
-        <translation>和弦符号ï¼\8cå\93\81æ ¼å\9b¾</translation>
+        <translation>和弦符号å\92\8cå\93\81æ ¼å\9b¾</translation>
     </message>
 </context>
 <context>
@@ -3521,7 +3520,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/fretdprops.ui" line="14"/>
         <source>Fretboard Diagram Properties</source>
-        <translation type="unfinished"/>
+        <translation>品格图属性</translation>
     </message>
     <message>
         <location filename="../../mscore/fretdprops.ui" line="31"/>
@@ -3539,7 +3538,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/glissandoprop.ui" line="14"/>
         <source>Glissando Properties</source>
-        <translation type="unfinished"/>
+        <translation>滑音属性</translation>
     </message>
     <message>
         <location filename="../../mscore/glissandoprop.ui" line="34"/>
@@ -3595,7 +3594,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/importmidi/importmidi_panel.ui" line="281"/>
         <source>Cancel non-applied MIDI import operations</source>
-        <translation type="unfinished"/>
+        <translation>取消未完成的MIDI导入操作</translation>
     </message>
     <message>
         <location filename="../../mscore/importmidi/importmidi_panel.ui" line="284"/>
@@ -3658,18 +3657,18 @@ space unit</extracomment>
         <location filename="../../mscore/inspector/inspector_accidental.ui" line="110"/>
         <location filename="../../mscore/inspector/inspector_accidental.ui" line="113"/>
         <source>Small</source>
-        <translation>缩小的</translation>
+        <translation>Small</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_accidental.ui" line="139"/>
         <source>Reset &apos;Has bracket&apos; value</source>
-        <translation type="unfinished"/>
+        <translation>重置 &apos;Has bracket&apos; 值</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_accidental.ui" line="162"/>
         <location filename="../../mscore/inspector/inspector_accidental.ui" line="165"/>
         <source>Has bracket</source>
-        <translation type="unfinished"/>
+        <translation>Has bracket</translation>
     </message>
 </context>
 <context>
@@ -4024,7 +4023,7 @@ space unit</extracomment>
         <location filename="../../mscore/inspector/inspector_ambitus.ui" line="449"/>
         <location filename="../../mscore/inspector/inspector_ambitus.ui" line="731"/>
         <source>Octave</source>
-        <translation>8度</translation>
+        <translation>度</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_ambitus.ui" line="467"/>
@@ -5199,7 +5198,7 @@ space unit</extracomment>
     <message>
         <location filename="../../mscore/inspector/inspector_hairpin.ui" line="47"/>
         <source>Hairpin</source>
-        <translation>音量记号</translation>
+        <translation>渐变记号</translation>
     </message>
     <message>
         <location filename="../../mscore/inspector/inspector_hairpin.ui" line="84"/>
@@ -7363,7 +7362,7 @@ space unit</extracomment>
         <location filename="../../mscore/lineproperties.ui" line="140"/>
         <location filename="../../mscore/lineproperties.ui" line="255"/>
         <source>Hook:</source>
-        <translation type="unfinished"/>
+        <translation>符尾:</translation>
     </message>
     <message>
         <location filename="../../mscore/lineproperties.ui" line="147"/>
@@ -21414,12 +21413,12 @@ failed: </source>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3338"/>
         <source>Add Brackets to Element</source>
-        <translation type="unfinished"/>
+        <translation>对元素添加括号</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3339"/>
         <source>Add brackets to element</source>
-        <translation type="unfinished"/>
+        <translation>对元素添加括号</translation>
     </message>
     <message>
         <location filename="../../mscore/shortcut.cpp" line="3349"/>
diff --git a/vtest/chord-layout-17-ref.png b/vtest/chord-layout-17-ref.png
new file mode 100644 (file)
index 0000000..27a6755
Binary files /dev/null and b/vtest/chord-layout-17-ref.png differ
diff --git a/vtest/chord-layout-17.mscz b/vtest/chord-layout-17.mscz
new file mode 100644 (file)
index 0000000..2cfb621
Binary files /dev/null and b/vtest/chord-layout-17.mscz differ
index 52e01ff..aa90a7a 100755 (executable)
--- a/vtest/gen
+++ b/vtest/gen
@@ -35,7 +35,8 @@ else
        frametext ottava slurs-1 slurs-2 slurs-3 slurs-4 hairpins-1 pedal-1 line-1 line-2 line-3 line-4 line-5 gliss-1 gliss-2\
        chord-layout-1 chord-layout-2 chord-layout-3 chord-layout-4 chord-layout-5\
        chord-layout-6 chord-layout-7 chord-layout-8 chord-layout-9 chord-layout-10\
-       chord-layout-11 chord-layout-12 chord-layout-13 chord-layout-14 chord-layout-15 chord-layout-16 cross-1 cross-2\
+       chord-layout-11 chord-layout-12 chord-layout-13 chord-layout-14 chord-layout-15 chord-layout-16 chord-layout-17\
+       cross-1 cross-2\
        accidental-1 accidental-2 accidental-3 accidental-4 accidental-5 accidental-mirror\
        accidental-6 accidental-7 accidental-8 accidental-9 accidental-10\
        tie-1 tie-2 tie-3 grace-1 grace-2 grace-3 grace-4 tuplets-1 tuplets-2 breath-1\
index 85e3786..9e9c8c3 100644 (file)
@@ -15,7 +15,8 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  frametext,ottava,slurs-1,slurs-2,slurs-3,slurs-4,hairpins-1,pedal-1,line-1,line-2,line-3,line-4,line-5,gliss-1,gliss-2, ^
  chord-layout-1,chord-layout-2,chord-layout-3,chord-layout-4,chord-layout-5, ^
  chord-layout-6,chord-layout-7,chord-layout-8,chord-layout-9,chord-layout-10, ^
- chord-layout-11,chord-layout-12,chord-layout-13,chord-layout-14,chord-layout-15,chord-layout-16,cross-1,cross-2, ^
+ chord-layout-11,chord-layout-12,chord-layout-13,chord-layout-14,chord-layout-15,chord-layout-16,chord-layout-17, ^
+ cross-1,cross-2, ^
  accidental-1,accidental-2,accidental-3,accidental-4,accidental-5, accidental-mirror ^
  accidental-6,accidental-7,accidental-8,accidental-9,accidental-10, ^
  tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4,tuplets-1,tuplets-2,breath-1, ^
index 46f474c..b85d82b 100644 (file)
@@ -47,8 +47,8 @@ Zerberus::Zerberus()
             initialized = true;
             Voice::init();
             }
-      for (int i = 0; i < MAX_VOICES; ++i)
-            freeVoices.push(new Voice(this));
+      
+      freeVoices.init(this);
       for (int i = 0; i < MAX_CHANNEL; ++i)
             _channel[i] = new Channel(this, i);
       busy = true;      // no sf loaded yet
index 2be8257..f493033 100644 (file)
 #include <atomic>
 // #include <mutex>
 #include <list>
+#include <memory>
+#include <queue>
 
 #include "synthesizer/synthesizer.h"
 #include "synthesizer/event.h"
 #include "voice.h"
 
+
 class Channel;
 class ZInstrument;
 enum class Trigger : char;
@@ -35,32 +38,33 @@ static const int MAX_TRIGGER = 512;
 //---------------------------------------------------------
 
 class VoiceFifo {
-      Voice* buffer[MAX_VOICES];
-      std::atomic<int> n;
-      int writeIdx = 0;       // index of next slot to write
-      int readIdx  = 0;       // index of slot to read
+      std::queue<Voice*> buffer;
+      std::vector< std::unique_ptr<Voice> > voices;
 
    public:
       VoiceFifo() {
-            n = 0;
+            voices.resize(MAX_VOICES);
             }
-      ~VoiceFifo() {
-            for (Voice* v : buffer)
-                  delete v;
+
+      void init(Zerberus* z) {
+            for (int i = 0; i < MAX_VOICES; ++i) {
+                  voices.push_back(std::unique_ptr<Voice>(new Voice(z)));
+                  buffer.push(voices.back().get());
+                  }
             }
+
       void push(Voice* v) {
-            buffer[writeIdx++] = v;
-            writeIdx %= MAX_VOICES;
-            ++n;
+            buffer.push(v);
             }
-      Voice* pop()  {
-            Q_ASSERT(n != 0);
-            --n;
-            Voice* v = buffer[readIdx++];
-            readIdx %= MAX_VOICES;
+    
+      Voice* pop() {
+            Q_ASSERT(!buffer.empty());
+            Voice* v = buffer.front();
+            buffer.pop();
             return v;
             }
-      bool empty() const { return n == 0; }
+
+      bool empty() const { return buffer.empty(); }
       };
 
 //---------------------------------------------------------