diff -urN /usr/ports/audio/denemo/Makefile audio/denemo/Makefile
--- /usr/ports/audio/denemo/Makefile	2012-06-01 14:15:59.000000000 +0900
+++ audio/denemo/Makefile	2012-06-28 05:33:06.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	denemo
-PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTVERSION=	0.9.4
 CATEGORIES=	audio
 MASTER_SITES=	GNU
 
@@ -15,53 +14,53 @@
 COMMENT=	Graphical score editor
 
 BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS=	aubio.3:${PORTSDIR}/audio/aubio \
-		fluidsynth.1:${PORTSDIR}/audio/fluidsynth \
-		jack.0:${PORTSDIR}/audio/jack \
-		guile.21:${PORTSDIR}/lang/guile \
-		fftw3:${PORTSDIR}/math/fftw3 \
-		smf.0:${PORTSDIR}/audio/libsmf
+LIB_DEPENDS=	aubio:${PORTSDIR}/audio/aubio \
+		fluidsynth:${PORTSDIR}/audio/fluidsynth \
+		jack:${PORTSDIR}/audio/jack \
+		smf:${PORTSDIR}/audio/libsmf \
+		sndfile:${PORTSDIR}/audio/libsndfile \
+		evview:${PORTSDIR}/graphics/evince \
+		guile:${PORTSDIR}/lang/guile \
+		fftw3:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 
-OPTIONS+=	LILYPOND "Install LilyPond (Printing)" off
+LICENSE=	GPLv3
+
+OPTIONS_DEFINE=	LILYPOND DOCS EXAMPLES
+LILYPOND_DESC=	Install LilyPond (Printing)
 
 USE_GNOME=	gtk20 gtksourceview2 librsvg2 libxml2
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-jack \
+		--disable-portmidi \
 		--sysconfdir=${PREFIX}/etc
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	${LOCALBASE}/lib/portaudio2/libportaudio.so \
+		-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
 
-.if defined(WITH_LILYPOND)
+.if ${PORT_OPTIONS:MLILYPOND}
 RUN_DEPENDS+=	lilypond:${PORTSDIR}/print/lilypond
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.else
-USE_GETTEXT=		yes
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|m4 doc actions|m4 actions| ; \
-		 s|examples templates|templates|' \
-		 -e "/\/examples/d"  ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/ltmain.sh
+	@${REINPLACE_CMD} -e \
+		's|evince-view-2.30|evince-view-2.32|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|doc|| ; \
+		 /\/examples/d' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${LN} -sf ${DOCSDIR}/manual ${DATADIR}/manual
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -74,9 +73,9 @@
 	@${MKDIR} ${DOCSDIR}/manual/images
 	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/manual/images
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.denemo ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/audio/denemo/distinfo audio/denemo/distinfo
--- /usr/ports/audio/denemo/distinfo	2011-11-01 23:42:16.000000000 +0900
+++ audio/denemo/distinfo	2012-06-28 04:34:24.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (denemo-0.9.2.tar.gz) = 4853b831495a732d4dc2cd1dc0ad8c7a9bfc5bd87386e7cf387554bcdbb0deda
-SIZE (denemo-0.9.2.tar.gz) = 12305392
+SHA256 (denemo-0.9.4.tar.gz) = 911cab852151b1d42b39a4047910fe1abd594e2f628bea941d97f0ce53c6954a
+SIZE (denemo-0.9.4.tar.gz) = 12471795
diff -urN /usr/ports/audio/denemo/files/patch-src__jackmidi.c audio/denemo/files/patch-src__jackmidi.c
--- /usr/ports/audio/denemo/files/patch-src__jackmidi.c	2011-06-04 00:51:40.000000000 +0900
+++ audio/denemo/files/patch-src__jackmidi.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- src/jackmidi.c.orig	2011-04-27 19:59:45.083923000 +0200
-+++ src/jackmidi.c	2011-05-07 10:44:07.000000000 +0200
-@@ -7,6 +7,7 @@
- #include <math.h>
- #include <string.h>
- #include <assert.h>
-+#include <sys/time.h>
- #include "exportmidi.h"
- #include "jackmidi.h"
- #include "pitchentry.h"
diff -urN /usr/ports/audio/denemo/pkg-plist audio/denemo/pkg-plist
--- /usr/ports/audio/denemo/pkg-plist	2011-11-01 23:42:16.000000000 +0900
+++ audio/denemo/pkg-plist	2012-06-28 05:29:59.000000000 +0900
@@ -1,4 +1,5 @@
 bin/denemo
+bin/denemo_file_update.sh
 %%ETCDIR%%/denemo.conf
 share/applications/denemo.desktop
 %%DATADIR%%/actions/AllCommands.commands
@@ -66,6 +67,8 @@
 %%DATADIR%%/actions/bitmaps/RepeatOpen.png
 %%DATADIR%%/actions/bitmaps/RepeatStart.png
 %%DATADIR%%/actions/bitmaps/SecondTimeBar.png
+%%DATADIR%%/actions/bitmaps/Speaker_Icon.svg
+%%DATADIR%%/actions/bitmaps/Speaker_Icon_Mute.svg
 %%DATADIR%%/actions/bitmaps/StartBeam.png
 %%DATADIR%%/actions/bitmaps/StartDownStems.png
 %%DATADIR%%/actions/bitmaps/StartTupletNumbering.png
@@ -607,12 +610,12 @@
 %%DATADIR%%/actions/bitmaps/z.svg
 %%DATADIR%%/actions/bitmaps/zero.svg
 %%DATADIR%%/actions/block.l
-%%DATADIR%%/actions/denemo.scm
 %%DATADIR%%/actions/denemo-modules/abstractionmovement.scm
 %%DATADIR%%/actions/denemo-modules/ans.scm
 %%DATADIR%%/actions/denemo-modules/commandlist.scm
 %%DATADIR%%/actions/denemo-modules/deprecated.scm
 %%DATADIR%%/actions/denemo-modules/directives.scm
+%%DATADIR%%/actions/denemo-modules/fonts.scm
 %%DATADIR%%/actions/denemo-modules/helpsystem.scm
 %%DATADIR%%/actions/denemo-modules/moveandsearch.scm
 %%DATADIR%%/actions/denemo-modules/notationmagick.scm
@@ -620,6 +623,7 @@
 %%DATADIR%%/actions/denemo-modules/scheme.scm
 %%DATADIR%%/actions/denemo-modules/selection.scm
 %%DATADIR%%/actions/denemo-modules/types.scm
+%%DATADIR%%/actions/denemo.scm
 %%DATADIR%%/actions/editscripts/D.C.AlFine.scm
 %%DATADIR%%/actions/editscripts/LHFinger.scm
 %%DATADIR%%/actions/editscripts/Mute.scm
@@ -629,6 +633,9 @@
 %%DATADIR%%/actions/incl.l
 %%DATADIR%%/actions/init.denemo
 %%DATADIR%%/actions/lalr.scm
+%%DATADIR%%/actions/lilypond/accordion-shifts.ily
+%%DATADIR%%/actions/lilypond/book-titling.ily
+%%DATADIR%%/actions/lilypond/simplified-book-titling.ily
 %%DATADIR%%/actions/lyimport-lexer.scm
 %%DATADIR%%/actions/lyimport-parser.scm
 %%DATADIR%%/actions/lyimport-todenemo.scm
@@ -690,20 +697,27 @@
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/Import/Import-Lilypond
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/Import/Import-Midi
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/Import/Import-MusicXml
+%%DATADIR%%/actions/menus/MainMenu/FileMenu/OpenMenu/OpenAudio
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/OpenMenu/OpenMyDefaultTemplate
+%%DATADIR%%/actions/menus/MainMenu/FileMenu/OpenMenu/OpenSourceDialog
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/Preview4Bars
+%%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintAccompanistsScore
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintBassPartWithoutFigures
+%%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintPartWithTitlePage
+%%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintThreeReduced
+%%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintTwoReduced
 %%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintWithAmbitus
-%%DATADIR%%/actions/menus/MainMenu/FileMenu/PrintMenu/PrintAccompanistsScore
 %%DATADIR%%/actions/menus/MainMenu/HelpMenu/IRC
 %%DATADIR%%/actions/menus/MainMenu/HelpMenu/Tutorial
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/AngryDelete
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/CheckPitches
+%%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/ChordsForBar
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/ChordsOverBass
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/FiguredBassFilterOn
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/FootPedalConductor
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/MidiAdvanceOnEdit
 %%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/MidiFilterOff
+%%DATADIR%%/actions/menus/MainMenu/InputMenu/MIDI/ToggleCheckChords
 %%DATADIR%%/actions/menus/MainMenu/MoreMenu/LoadDefaultComposerNumberkeys
 %%DATADIR%%/actions/menus/MainMenu/MoreMenu/LoadSelectDurationComposerNumberkeys
 %%DATADIR%%/actions/menus/MainMenu/MoreMenu/NoOp
@@ -733,6 +747,7 @@
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Cursor/MoveToMovementEnd
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Cursor/ToggleCursorHighlight
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Cursor/init.scm
+%%DATADIR%%/actions/menus/MainMenu/NavigationMenu/DenemoLink
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek/CheckForIncompleteMeasures
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek/FindEditPoint
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek/FindNextLowerNote
@@ -741,6 +756,9 @@
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek/GoToMeasureEnd
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek/MoveToPreviousEmptyMeasure
 %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek/NextHigher
+%%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/Audio/AudioPlay
+%%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/Audio/CloseSourceAudioFile
+%%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/Audio/SynchronizeAudio
 %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/ConvertMidiForBass
 %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/DenemoPlayCursorToEnd
 %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/PitchShift
@@ -800,12 +818,16 @@
 %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/Slurs/ToggleBeginPhrasingSlur
 %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/Slurs/ToggleEndPhrasingSlur
 %%DATADIR%%/actions/menus/ObjectMenu/ClefMenu/ClefChooser
+%%DATADIR%%/actions/menus/ObjectMenu/ClefMenu/HideClef
+%%DATADIR%%/actions/menus/ObjectMenu/ClefMenu/SetDisplayClef
+%%DATADIR%%/actions/menus/ObjectMenu/Directives/AllowLineBreak
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/AutoAccidentals
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/ChooseBarline
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/ClosingBarline
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/DoubleBarline
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/ForceBarline
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/HalfBarline
+%%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/NoBarline
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/RepeatEnd
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/RepeatEndStart
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Barlines/RepeatStart
@@ -814,6 +836,7 @@
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/BeatChange
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/BreathMark
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/CadenzaOn
+%%DATADIR%%/actions/menus/ObjectMenu/Directives/CriticalComment
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/DynamicsDialog
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/EndVolta
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/FinishCadenza
@@ -853,6 +876,7 @@
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Print Transpositions/OpenOctaveUp
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/RehearsalMark
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/SetBarNumber
+%%DATADIR%%/actions/menus/ObjectMenu/Directives/ShiftNext
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/SmallFontEnd
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/SmallFontStart
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Staff/HideNotes
@@ -864,6 +888,9 @@
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/Tuning/SetTuningStaff
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/TypesettingOff
 %%DATADIR%%/actions/menus/ObjectMenu/Directives/TypesettingOn
+%%DATADIR%%/actions/menus/ObjectMenu/Key/FlattenKeysig
+%%DATADIR%%/actions/menus/ObjectMenu/Key/HideKeysig
+%%DATADIR%%/actions/menus/ObjectMenu/Key/SharpenKeysig
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/AddDuplicateMeasure
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/Anacrusis
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/CheckTupletsInMeasure
@@ -882,6 +909,7 @@
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/CaptureScore/InsertCaptureMeasure
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/CreateIntro
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/EvenOutStaffLengths
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/HideBarlines
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/HideMovement
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/MovementPageBreak
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/MvntComment
@@ -902,9 +930,14 @@
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/ReBar
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/SetMovementTempo
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/SwitchMensuralBarlines
-%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementPiece
-%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementSubtitle
-%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementTitle
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Book Titles/Chapter
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Book Titles/Piece
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Book Titles/Section
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Book Titles/TitledPiece
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Book Titles/init.scm
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Simple Titles/MovementPiece
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Simple Titles/MovementSubtitle
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Simple Titles/MovementTitle
 %%DATADIR%%/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertReversedStringAsBinaryRhythm
 %%DATADIR%%/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertReversedStringAsReversedBinaryRhythm
 %%DATADIR%%/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString/NotationMagick-InsertStringAsBinaryRhythm
@@ -923,6 +956,7 @@
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/Beam1234
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/DeleteBeamingDirective
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/EndBeam
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/NoBeam
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/StartBeam
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/ChangeDuration/ChangeBreve
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/ChangeDuration/ChangeLonga
@@ -932,17 +966,32 @@
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/DuplicateChord
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Breve
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Longa
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur0
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur1
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur2
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur3
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur4
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur5
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur6
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/Slur7
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/SlurBreve
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/SlurLonga
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs/init.scm
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/AddDotSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/CautionaryAccidental
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/ChangeEnharmonicDown
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/ChangeEnharmonicUp
-%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/CautionaryAccidental
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/MoveNoteToCursor
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/ReminderAccidental
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/RemoveDotSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/SuggestFlat
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/SuggestNatural
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote/SuggestSharp
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/FingeringsDoublestroke
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/GraceNotes/GraceAfter
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/GraceNotes/GraceNoteSwitcher
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/GraceNotes/InsertTwoGraceNotesBeamed
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/GraceNotes/MakeGrace
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/GraceNotes/UnGraceAfter
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/InsertNote/InsertDuration/InsertBreve
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/InsertNote/InsertDuration/InsertLonga
@@ -950,13 +999,57 @@
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/JoinChords
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/JoinChordsToMergedChord
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/AccentSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ArpeggioSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/DownbowSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/FermataSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/FlageoletSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/HarmonicSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/LheelSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/LtoeSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/MarcatoSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/PortatoSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/RheelSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/RtoeSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/SignumcongruentiaeSelectionSwitcher
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/StaccatissimoSelectionSwitcher
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/StaccatoSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/StoppedSelectionSwitcher
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/TenutoSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ThumbSelectionSwitcher
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleAccent
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleArpeggio
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleDownBow
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleFermata
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleFlageolet
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleHarmonic
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleLheel
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleLongFermata
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleLtoe
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleMarcato
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/TogglePortato
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleRheel
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleRtoe
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleShortFermata
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleSignumcongruentiae
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleStaccatissimo
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleStaccato
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleStopped
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleTenuto
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleThumb
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleUpBow
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/ToggleVeryLongFermata
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Articulations/UpBowSelectionSwitcher
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/FiguredBass/PlaceFiguredBassBelow
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/ToggleCoda
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/ToggleMordent
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/TogglePrall
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/TogglePrallPrall
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/ToggleReverseTurn
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/ToggleSegno
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/ToggleTrill
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/ToggleUpPrall
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/Trill+Above
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/Trill+Below
-%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Ornaments/Upprall
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Strings/Fingerings/Finger0
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Strings/Fingerings/Finger1
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/Strings/Fingerings/Finger2
@@ -984,6 +1077,7 @@
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/TextMarks/Tempo Indications/Andante
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/TextMarks/Tempo Indications/Largo
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/TextMarks/Tempo Indications/Presto
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadControl/NeoMensuralNotehead
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes/NormalSizeNotehead
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes/SmallNotehead
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes/TinyNotehead
@@ -996,6 +1090,8 @@
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Percussion/Ride
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Percussion/RideBell
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Percussion/TimbalesStyle
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/ReplaceChord
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry/DisplaceRestHorizontally
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry/EnterRest
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry/InsertBreveRest
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry/InsertLongaRest
@@ -1020,9 +1116,6 @@
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/DesignateVoice
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/StartDownStems
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/StartUpStems
-%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StaffChange/ChangeStaffBack
-%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StaffChange/ChangeStaffDown
-%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StaffChange/ChangeStaffUp
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/TiedNotes/InsertTiedNoteDuration
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/ShiftDown
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/ShiftRealDialogDown
@@ -1047,31 +1140,45 @@
 %%DATADIR%%/actions/menus/ObjectMenu/Score/DeactivateTimeSignatureStencil
 %%DATADIR%%/actions/menus/ObjectMenu/Score/DenemoBar
 %%DATADIR%%/actions/menus/ObjectMenu/Score/EditProlog
+%%DATADIR%%/actions/menus/ObjectMenu/Score/LilyPondInclude
 %%DATADIR%%/actions/menus/ObjectMenu/Score/NormalBeamEndings
+%%DATADIR%%/actions/menus/ObjectMenu/Score/PointAndClick
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/HideEmptyStaffs
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/LimitInterSystemSpace
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/PaperSize
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/ScoreIndent
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/LimitInterSystemSpace
 %%DATADIR%%/actions/menus/ObjectMenu/Score/ReduceSystemSpacing
-%%DATADIR%%/actions/menus/ObjectMenu/Score/ScoreComment
+%%DATADIR%%/actions/menus/ObjectMenu/Score/RefreshDynamicDirectives
 %%DATADIR%%/actions/menus/ObjectMenu/Score/ScoreBlockProlog
+%%DATADIR%%/actions/menus/ObjectMenu/Score/ScoreComment
+%%DATADIR%%/actions/menus/ObjectMenu/Score/ScoreProlog
 %%DATADIR%%/actions/menus/ObjectMenu/Score/SetFontSize
 %%DATADIR%%/actions/menus/ObjectMenu/Score/SetThumbnail
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreArranger
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreBreakbefore
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreComposer
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreCopyright
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreDedication
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreInstrument
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreMeter
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreOpus
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScorePiece
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScorePoet
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreSubsubtitle
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreSubtitle
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreTagline
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreTitle
-%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/TitlePage
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/BookArranger
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/BookComposer
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/BookCopyright
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/BookDate
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/BookPoet
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/BookTitle
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/Epilog/CriticalCommentary
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/Epilog/CriticalCommentaryIntro
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/TocTitle
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/init.scm
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/ScoreTagline
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreArranger
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreBreakbefore
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreComposer
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreCopyright
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreDedication
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreInstrument
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreMeter
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreOpus
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScorePiece
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScorePoet
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreSubsubtitle
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreSubtitle
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles/ScoreTitle
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/TaglineLink
 %%DATADIR%%/actions/menus/ObjectMenu/Score/TransposeOctaveUp
 %%DATADIR%%/actions/menus/ObjectMenu/Score/TransposeScorePrint
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Ambitus
@@ -1080,8 +1187,9 @@
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/CaptureScore/InsertCaptureMeasureForStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/ChangeStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/CheckTiesInStaff
-%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/InstrumentName
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/CreateCuesForStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/FixSlursInStaff
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/InstrumentName
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/NonPrintingStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Numbering/BarNumbers
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Ossia/CreateOssiaStaff
@@ -1093,7 +1201,6 @@
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/ShortInstrumentName
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/SimplifyTies
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/SmallerStaff
-%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffAlias
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffComment
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffGroupings/ChoirStaffEnd
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffGroupings/ChoirStaffStart
@@ -1104,13 +1211,21 @@
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffGroupings/GroupStaffStart
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffGroupings/PianoStaffEnd
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffGroupings/PianoStaffStart
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffMultiMeasureRests
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffOctaveUp
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/TabStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/TinyStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/TinyStaffAllMovements
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/TransposeStaffPrint
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/CreateParts
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/CreatePartsFromTop
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/MergeRests
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/NewVoice
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/NoteColumnShift
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/SetCurrentStaffAsVoice
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/SetCurrentVoiceAsStaff
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/ShiftOff
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/ShiftOn
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/VoicePreset1
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/VoicePreset2
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/VoicePreset3
@@ -1118,6 +1233,8 @@
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/VoicePresetAutomatic
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices/VoicesDoublestroke
 %%DATADIR%%/actions/menus/ObjectMenu/TimeSig/ChooseTimeSignature
+%%DATADIR%%/actions/menus/ObjectMenu/TimeSig/HideTimesig
+%%DATADIR%%/actions/menus/ObjectMenu/TimeSig/SingleDigitTimeSig
 %%DATADIR%%/actions/multilex.scm
 %%DATADIR%%/actions/musicgames/ReadingNoteNames.denemo
 %%DATADIR%%/actions/mxml2ly2denemo/import_nwctext.scm
@@ -1270,14 +1387,6 @@
 %%DATADIR%%/soundfonts/A320U-license.txt
 %%DATADIR%%/soundfonts/A320U.sf2
 %%DATADIR%%/templates/Accordion/accordion.denemo
-%%DATADIR%%/templates/band/Makefile
-%%DATADIR%%/templates/band/Makefile.in
-%%DATADIR%%/templates/chamber/Makefile
-%%DATADIR%%/templates/chamber/Makefile.in
-%%DATADIR%%/templates/choral/Makefile
-%%DATADIR%%/templates/choral/Makefile.in
-%%DATADIR%%/templates/jazz/Makefile
-%%DATADIR%%/templates/jazz/Makefile.in
 %%DATADIR%%/templates/Early Music/BreveLonga.denemo
 %%DATADIR%%/templates/Makefile
 %%DATADIR%%/templates/Makefile.am
@@ -1290,173 +1399,21 @@
 %%DATADIR%%/templates/choral/TTBB.denemo
 %%DATADIR%%/templates/drummap.denemo
 %%DATADIR%%/templates/jazz/JazzCombo.denemo
-share/pixmaps/denemo.png
-%%NLS%%share/locale/cs/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/de/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/es/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/it/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/denemo.mo
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.lilypond
-%%PORTDOCS%%%%DOCSDIR%%/GOALS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/manual/denemo-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4fo2denemo.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4for2abc.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4for2abcps.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4for2ly.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4for2new-page1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4for2new-page2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/4for2touchedly.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/Changeclefdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/accent.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/acciaccatura.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/accidentals.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/addvc2currentstaff.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/appoggiatura.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/arpeggio.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/articulations.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/bandtemplate.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/blank.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/caution.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/changeinitialclef.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/choraltemplate1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/chord.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/churchtemplate2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/clefmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/coda.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/copy.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/cut.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/denemomain.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/displaymenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/downbow.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/downmordent.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/downprall.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/draft.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/educationtemplate3.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/expressions.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/fermata.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/fig1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/fig2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/fig3.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/filemenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/flageolet.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/generaltemplate4.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/glissando.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/gotobegin.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/gotoend.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/grace.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/home.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/important.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/initalkeydialog.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/keymenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/lheel.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/lineprall.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/longfermata.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/lpmode.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/ltoe.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/main.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/marcato.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/mark1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/mordent.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/navigationmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/new.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/next.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/note-page1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/note.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/open.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/orchestraltemplate5.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/othermenu1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/paste.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/playbackcontrols.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/playbackmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/playmidi.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/polyphony.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/portato.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/prall.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/pralldown.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/prallmordent.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/prallprall.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/prallup.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/prev.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/print.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/redo.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/rests.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/reverseturn.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/rheel.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/rtoe.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/save.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/scorewizard.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/secondending.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/segno.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/selectingkey.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/setpreferences.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/settimesigniture.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/shortfermata.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/signumcongruentime.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/simplemelody.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/simplerepeat.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/staccatissimo.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/staccato.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/stacctissiimo.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/staffmenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/stopmidi.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/stopped.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tablituretemplate6.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tenuto.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/thumb.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/timemenu.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tip.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/toc-blank.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/toc-minus.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/toc-plus.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tremolo1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tremolo2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tremolo3.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/trill.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/tupletmarkers.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/turn.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/undo.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/up.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/upbeat.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/upbow.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/upmordent.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/upprall.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/varcoda.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/verylongfermata.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/images/warning.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AbbreviatedNotes.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CautionaryAccidental.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Cues.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ForcingBreaks.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GraceLilyPondBugWorkaround.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HandelFiguredBassExercises.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/InstrumentNames.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LeadSheet.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Metronome.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MultiMeasureRests.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Ossia.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/PrintScoreAndParts.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RaggedBottom.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RehearsalMarks.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ReminderAccidental.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SeveralVerses.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SuggestedAccidental.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemperamentShiftingPlayback.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TextPosition.denemo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Upbeat.denemo
 share/fonts/truetype/denemo/Denemo.ttf
 share/fonts/truetype/denemo/emmentaler.ttf
 share/fonts/truetype/denemo/feta.ttf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+share/locale/cs/LC_MESSAGES/denemo.mo
+share/locale/de/LC_MESSAGES/denemo.mo
+share/locale/es/LC_MESSAGES/denemo.mo
+share/locale/fr/LC_MESSAGES/denemo.mo
+share/locale/it/LC_MESSAGES/denemo.mo
+share/locale/ja/LC_MESSAGES/denemo.mo
+share/locale/pl/LC_MESSAGES/denemo.mo
+share/locale/sv/LC_MESSAGES/denemo.mo
+share/pixmaps/denemo.png
+@dirrm share/fonts/truetype/denemo
+@dirrmtry share/fonts/truetype
+@dirrmtry share/fonts
 @dirrm %%DATADIR%%/templates/jazz
 @dirrm %%DATADIR%%/templates/choral
 @dirrm %%DATADIR%%/templates/chamber
@@ -1469,27 +1426,30 @@
 @dirrm %%DATADIR%%/actions/mxml2ly2denemo
 @dirrm %%DATADIR%%/actions/musicgames
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/TimeSig
-@dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/CaptureScore
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Voices
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffGroupings
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/PrintEffects
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Playback
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Ossia
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Numbering
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/CaptureScore
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu
-@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Simple Titles
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles/Epilog
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles/Book Titles
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Tuplets
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/TiedNotes
-@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StaffChange
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Slurs
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/SelectDuration
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Percussion
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadControl
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/TextMarks/Tempo Indications
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/TextMarks/Dynamic Markings
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Markings/TextMarks
@@ -1503,6 +1463,7 @@
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/InsertNote
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/GraceNotes
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditNote
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration/Slurs
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditDuration
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Directives
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/ChangeDuration
@@ -1511,13 +1472,16 @@
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotationMagick/SingleRandomNote
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotationMagick/GenerateRhythmFromString
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotationMagick
-@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Simple Titles
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles/Book Titles
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Print Layout
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/NoteHeadStyles
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/CaptureScore
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/Repeats
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Key
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Directives/Tuning
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Directives/Staff
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Directives/Print Transpositions
@@ -1527,8 +1491,6 @@
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Directives
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/ClefMenu
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/Slurs
-@dirrmtry %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/Markings/TextMarks
-@dirrmtry %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/Markings
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/Directives
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/ChangePrintDuration
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/AddBelowTop
@@ -1537,6 +1499,7 @@
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu
 @dirrm %%DATADIR%%/actions/menus/MainMenu/ViewMenu/Zoom
 @dirrm %%DATADIR%%/actions/menus/MainMenu/ViewMenu
+@dirrm %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/Audio
 @dirrm %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu
 @dirrm %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Seek
 @dirrm %%DATADIR%%/actions/menus/MainMenu/NavigationMenu/Cursor
@@ -1561,13 +1524,11 @@
 @dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu
 @dirrm %%DATADIR%%/actions/menus/MainMenu
 @dirrm %%DATADIR%%/actions/menus
+@dirrm %%DATADIR%%/actions/lilypond
 @dirrm %%DATADIR%%/actions/editscripts
 @dirrm %%DATADIR%%/actions/denemo-modules
 @dirrm %%DATADIR%%/actions/bitmaps
 @dirrm %%DATADIR%%/actions
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrm share/fonts/truetype/denemo
-@dirrm share/fonts/truetype
-@dirrm share/fonts
-@dirrm etc/denemo
+@dirrm %%ETCDIR%%